From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 22 Oct 2020 12:12:33 +0000 (+0100)
Subject: [Fix] Multimap: Fix flags usage
X-Git-Tag: 2.7~212
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0cc9932cfed4c2854d329b42d688674ba3a0bd51;p=rspamd.git

[Fix] Multimap: Fix flags usage

Issue: #3526
---

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index c253c660e..109f974cd 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -1276,11 +1276,21 @@ if opts and type(opts) == 'table' then
       rule.description = rule.description or 'multimap symbol'
       rule.group = rule.group or N
 
+      local tmp_flags
+      tmp_flags = rule.flags
+
+      if rule.type == 'received' and rule.flags then
+        -- XXX: hack to allow received flags/nflags
+        -- See issue #3526 on GH
+        rule.flags = nil
+      end
+
       -- XXX: for combined maps we use trace, so flags must include one_shot to avoid scores multiplication
       if rule.combined and not rule.flags then
         rule.flags = 'one_shot'
       end
       rspamd_config:set_metric_symbol(rule)
+      rule.flags = tmp_flags
     end
   end, fun.filter(function(r) return not r['prefilter'] end, rules))