Browse Source

[Fix] Do not flag pre-result of virus scanners as least if action is reject

fixes #3279
tags/2.6
Gregor Dschung 4 years ago
parent
commit
1b2b501ceb
2 changed files with 6 additions and 2 deletions
  1. 5
    1
      lualib/lua_scanners/common.lua
  2. 1
    1
      src/lua/lua_task.c

+ 5
- 1
lualib/lua_scanners/common.lua View File

@@ -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


+ 1
- 1
src/lua/lua_task.c View File

@@ -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

Loading…
Cancel
Save