Browse Source

Fix work with lua 5.2 eventually.

tags/0.6.0
Vsevolod Stakhov 10 years ago
parent
commit
8dc300fc2c
4 changed files with 8 additions and 6 deletions
  1. 2
    2
      CMakeLists.txt
  2. 3
    1
      src/lua/lua_common.h
  3. 1
    1
      src/plugins/lua/multimap.lua
  4. 2
    2
      src/plugins/lua/phishing.lua

+ 2
- 2
CMakeLists.txt View File

@@ -453,9 +453,9 @@ ENDIF(NOT LOCALSTATES_PREFIX)
# Now find libraries and headers

# Find lua libraries
FindLua(5 1)
FindLua(5 2)
IF(NOT LUA_FOUND)
FindLua(5 2)
FindLua(5 1)
ENDIF(NOT LUA_FOUND)

IF(NOT LUA_FOUND)

+ 3
- 1
src/lua/lua_common.h View File

@@ -23,7 +23,9 @@
static inline void
luaL_register (lua_State *L, const gchar *name, const struct luaL_reg *methods)
{
lua_newtable (L);
if (name != NULL) {
lua_newtable (L);
}
luaL_setfuncs (L, methods, 0);
if (name != NULL) {
lua_pushvalue (L, -1);

+ 1
- 1
src/plugins/lua/multimap.lua View File

@@ -14,7 +14,7 @@ function split(str, delim, maxNb)
local pat = "(.-)" .. delim .. "()"
local nb = 0
local lastPos
for part, pos in string.gfind(str, pat) do
for part, pos in string.gmatch(str, pat) do
nb = nb + 1
result[nb] = part
lastPos = pos

+ 2
- 2
src/plugins/lua/phishing.lua View File

@@ -14,7 +14,7 @@ function phishing_cb (task)
local found = false
local purl = url:get_phished()
if table.maxn(strict_domains) > 0 then
local _,_,tld = string.find(purl:get_host(), '([a-zA-Z0-9%-]+\.[a-zA-Z0-9%-]+)$')
local _,_,tld = string.find(purl:get_host(), '([a-zA-Z0-9%-]+%.[a-zA-Z0-9%-]+)$')
if tld then
for _,rule in ipairs(strict_domains) do
if rule['map']:get_key(tld) then
@@ -26,7 +26,7 @@ function phishing_cb (task)
end
if not found then
if domains then
local _,_,tld = string.find(purl:get_host(), '([a-zA-Z0-9%-]+\.[a-zA-Z0-9%-]+)$')
local _,_,tld = string.find(purl:get_host(), '([a-zA-Z0-9%-]+%.[a-zA-Z0-9%-]+)$')
if tld then
if domains:get_key(tld) then
task:insert_result(symbol, 1, purl:get_host())

Loading…
Cancel
Save