From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Sat, 27 Jan 2024 09:05:40 +0000 (+0000)
Subject: [Feature] Add extraction type for `from` maps
X-Git-Tag: 3.8.2~20^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6b1f319e218555610ada97755c97a8a8d32f436f;p=rspamd.git

[Feature] Add extraction type for `from` maps

Attribute name: `extract_from`. Possible values:

* `default` - try smtp, if not exists try mime
* `mime` - check mime only
* `smtp` - check smtp only
* `both` - try to match both
---

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index 53b273227..191a87273 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -887,12 +887,36 @@ local function multimap_callback(task, rule)
       end
     end,
     from = function()
-      if task:has_from('smtp') then
-        local from = task:get_from('smtp')
-        match_addr(rule, from)
-      elseif task:has_from('mime') then
+      local extract_from = rule.extract_from or 'default'
+
+      if extract_from == 'mime' then
         local from = task:get_from('mime')
-        match_addr(rule, from)
+        if from then
+          match_addr(rule, from)
+        end
+      elseif extract_from == 'smtp' then
+        local from = task:get_from('smtp')
+        if from then
+          match_addr(rule, from)
+        end
+      elseif extract_from == 'both' then
+        local from = task:get_from('smtp')
+        if from then
+          match_addr(rule, from)
+        end
+        from = task:get_from('mime')
+        if from then
+          match_addr(rule, from)
+        end
+      else
+        -- Default algorithm
+        if task:has_from('smtp') then
+          local from = task:get_from('smtp')
+          match_addr(rule, from)
+        elseif task:has_from('mime') then
+          local from = task:get_from('mime')
+          match_addr(rule, from)
+        end
       end
     end,
     helo = function()