浏览代码

[Fix] Fix various modules in case of empty message

tags/1.7.1
Andrew Lewis 6 年前
父节点
当前提交
4915488566

+ 3
- 1
src/plugins/lua/asn.lua 查看文件

@@ -108,12 +108,14 @@ if configure_asn_module() then
type = 'prefilter,nostat',
callback = asn_check,
priority = 5,
flags = 'empty',
})
if options['symbol'] then
rspamd_config:register_symbol({
name = options['symbol'],
parent = id,
type = 'virtual'
type = 'virtual',
flags = 'empty',
})
end
else

+ 2
- 1
src/plugins/lua/clickhouse.lua 查看文件

@@ -678,7 +678,8 @@ if opts then
name = 'CLICKHOUSE_COLLECT',
type = 'idempotent',
callback = clickhouse_collect,
priority = 10
priority = 10,
flags = 'empty',
})
rspamd_config:register_finish_script(function(task)
if nrows > 0 then

+ 2
- 1
src/plugins/lua/elastic.lua 查看文件

@@ -414,7 +414,8 @@ if redis_params and opts then
name = 'ELASTIC_COLLECT',
type = 'idempotent',
callback = elastic_collect,
priority = 10
priority = 10,
flags = 'empty',
})

rspamd_config:add_on_load(function(cfg, ev_base,worker)

+ 2
- 0
src/plugins/lua/force_actions.lua 查看文件

@@ -118,6 +118,7 @@ local function configure_module()
type = 'normal',
name = name,
callback = cb,
flags = 'empty',
})
for _, a in ipairs(atoms) do
rspamd_config:register_dependency(id, a)
@@ -150,6 +151,7 @@ local function configure_module()
end
t.name = 'FORCE_ACTION_' .. name
t.callback = cb
t.flags = 'empty'
local id = rspamd_config:register_symbol(t)
if t.type == 'normal' then
for _, a in ipairs(atoms) do

+ 4
- 2
src/plugins/lua/greylist.lua 查看文件

@@ -424,13 +424,15 @@ if opts then
name = 'GREYLIST_SAVE',
type = 'postfilter',
callback = greylist_set,
priority = 6
priority = 6,
flags = 'empty',
})
rspamd_config:register_symbol({
name = 'GREYLIST_CHECK',
type = 'prefilter',
callback = greylist_check,
priority = 6
priority = 6,
flags = 'empty',
})
end
end

+ 1
- 0
src/plugins/lua/history_redis.lua 查看文件

@@ -232,6 +232,7 @@ if opts then
name = 'HISTORY_SAVE',
type = 'idempotent',
callback = history_save,
flags = 'empty',
priority = 150
})
rspamd_plugins['history'] = {

+ 3
- 1
src/plugins/lua/ip_score.lua 查看文件

@@ -384,12 +384,14 @@ if redis_params then
type = 'postfilter,nostat',
priority = 5,
callback = ip_score_set,
flags = 'empty',
})
rspamd_config:register_symbol({
name = options['symbol'],
callback = ip_score_check,
group = 'reputation',
score = 2.0
score = 2.0,
flags = 'empty',
})
else
rspamd_lua_utils.disable_module(N, "redis")

+ 2
- 1
src/plugins/lua/metadata_exporter.lua 查看文件

@@ -700,6 +700,7 @@ for k, r in pairs(settings.rules) do
name = 'EXPORT_METADATA_' .. k,
type = 'postfilter,idempotent',
callback = gen_exporter(r),
priority = 10
priority = 10,
flags = 'empty',
})
end

+ 2
- 1
src/plugins/lua/milter_headers.lua 查看文件

@@ -530,5 +530,6 @@ rspamd_config:register_symbol({
name = 'MILTER_HEADERS',
type = 'postfilter,idempotent',
callback = milter_headers,
priority = 10
priority = 10,
flags = 'empty',
})

+ 1
- 0
src/plugins/lua/mx_check.lua 查看文件

@@ -281,6 +281,7 @@ if opts then
name = settings.symbol_bad_mx,
type = 'normal',
callback = mx_check,
flags = 'empty',
})
rspamd_config:register_symbol({
name = settings.symbol_no_mx,

+ 4
- 2
src/plugins/lua/settings.lua 查看文件

@@ -716,7 +716,8 @@ if redis_section then
name = 'REDIS_SETTINGS' .. tostring(id),
type = 'prefilter,nostat',
callback = gen_redis_callback(h, id),
priority = 10
priority = 10,
flags = 'empty',
})
end, redis_key_handlers)
end
@@ -736,5 +737,6 @@ rspamd_config:register_symbol({
name = 'SETTINGS_CHECK',
type = 'prefilter,nostat',
callback = check_settings,
priority = 10
priority = 10,
flags = 'empty',
})

正在加载...
取消
保存