From: Gregor Dschung <gregor@chkpnt.de>
Date: Sun, 19 Apr 2020 08:33:17 +0000 (+0200)
Subject: [Fix] Do not flag pre-result of virus scanners as least if action is reject
X-Git-Tag: 2.6~512^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3342%2Fhead;p=thirdparty%2Frspamd.git

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

fixes #3279
---

diff --git a/lualib/lua_scanners/common.lua b/lualib/lua_scanners/common.lua
index f286d963aa..5c298b46f4 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 f36e51824c..b891d7d99a 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