diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-04-19 21:27:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-19 21:27:11 +0100 |
| commit | 509109df4cc67f053955a5b9db86226a64e6a257 (patch) | |
| tree | f875660851e3114cde06adf9b2fb8f3b9f4068ae | |
| parent | 7f2cdca0bba88179d8a5cb0b621eb263964525a2 (diff) | |
| parent | 1b2b501ceb111303062e9a5f247d01cd85e87c1c (diff) | |
| download | rspamd-509109df4cc67f053955a5b9db86226a64e6a257.tar.gz rspamd-509109df4cc67f053955a5b9db86226a64e6a257.zip | |
Merge pull request #3342 from chkpnt/dschung/fix-reject-mail-message
[Fix] Do not flag pre-result of virus scanners as least if action is reject
| -rw-r--r-- | lualib/lua_scanners/common.lua | 6 | ||||
| -rw-r--r-- | src/lua/lua_task.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lualib/lua_scanners/common.lua b/lualib/lua_scanners/common.lua index f286d963a..5c298b46f 100644 --- a/lualib/lua_scanners/common.lua +++ b/lualib/lua_scanners/common.lua @@ -68,6 +68,7 @@ local function yield_result(task, rule, vname, dyn_weight, is_fail) local symbol local threat_table = {} local threat_info + local flags -- This should be more generic if not is_fail then @@ -112,11 +113,14 @@ local function yield_result(task, rule, vname, dyn_weight, is_fail) if rule.action and is_fail ~= 'fail' and not all_whitelisted then threat_table = table.concat(threat_table, '; ') + if rule.action ~= 'reject' then + flags = 'least' + end task:set_pre_result(rule.action, lua_util.template(rule.message or 'Rejected', { SCANNER = rule.name, VIRUS = threat_table, - }), rule.name, nil, nil, 'least') + }), rule.name, nil, nil, flags) end end diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c index f36e51824..b891d7d99 100644 --- a/src/lua/lua_task.c +++ b/src/lua/lua_task.c @@ -176,7 +176,7 @@ LUA_FUNCTION_DEF (task, adjust_result); * - module: string * - score: number * - priority: integer - * - flags: flags sring + * - flags: flags string * - result: named result if needed * * @param {rspamd_action or string} action a numeric or string action value |