Mirrors/rspamd
1
0
Fork 0
mirror of https://github.com/rspamd/rspamd.git synced 2024-09-13 23:56:50 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Feature] Be more error-prone in squeezed rules

Browse Source
This commit is contained in:
Vsevolod Stakhov 2018-05-15 12:44:46 +01:00
parent 7f5ca7ae3d
commit 90dca8a51b
1 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
lualib/lua_squeeze_rules.lua
View File

@ -32,50 +32,58 @@ local function gen_lua_squeeze_function(order)
local symbols_disabled = task:cache_get('squeezed_disable')
for _,data in ipairs(squeezed_rules[order]) do
if not symbols_disabled or not symbols_disabled[data[2]] then
local ret = {data[1](task)}
local function real_call()
return {data[1](task)}
end
if #ret ~= 0 then
local first = ret[1]
local sym = data[2]
-- Function has returned something, so it is rule, not a plugin
if type(first) == 'boolean' then
if first then
table.remove(ret, 1)
local status, ret = pcall(real_call)
local second = ret[1]
if type(second) == 'number' then
if not status then
logger.errx(task, 'error in squeezed rule %s: %s', data[2], ret)
else
if #ret ~= 0 then
local first = ret[1]
local sym = data[2]
-- Function has returned something, so it is rule, not a plugin
if type(first) == 'boolean' then
if first then
table.remove(ret, 1)
if second ~= 0 then
local second = ret[1]
if type(second) == 'number' then
table.remove(ret, 1)
if second ~= 0 then
if type(ret[1]) == 'table' then
task:insert_result(sym, second, ret[1])
else
task:insert_result(sym, second, ret)
end
end
else
if type(ret[1]) == 'table' then
task:insert_result(sym, second, ret[1])
task:insert_result(sym, 1.0, ret[1])
else
task:insert_result(sym, second, ret)
task:insert_result(sym, 1.0, ret)
end
end
else
end
elseif type(first) == 'number' then
table.remove(ret, 1)
if first ~= 0 then
if type(ret[1]) == 'table' then
task:insert_result(sym, 1.0, ret[1])
task:insert_result(sym, first, ret[1])
else
task:insert_result(sym, 1.0, ret)
task:insert_result(sym, first, ret)
end
end
end
elseif type(first) == 'number' then
table.remove(ret, 1)
if first ~= 0 then
if type(ret[1]) == 'table' then
task:insert_result(sym, first, ret[1])
else
task:insert_result(sym, first, ret)
end
end
else
if type(ret[1]) == 'table' then
task:insert_result(sym, 1.0, ret[1])
else
task:insert_result(sym, 1.0, ret)
if type(ret[1]) == 'table' then
task:insert_result(sym, 1.0, ret[1])
else
task:insert_result(sym, 1.0, ret)
end
end
end
end