[Feature] Support multi flag in regexp and glob maps

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index 909260681f0abb8422735ecec49fab7ed6c0fa57..34bb69d26edca53bfe7af1bbadd0a3c832d913a0 100644 (file)
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -438,8 +438,17 @@ local function multimap_callback(task, rule)
     end
 
     if ret then
-      callback(ret)
+      if type(ret) == 'table' then
+        for _,elt in ipairs(ret) do
+          callback(elt)
+        end
+
+        ret = true
+      else
+        callback(ret)
+      end
     end
+
     return ret
   end
 
@@ -980,17 +989,33 @@ local function add_multimap_rule(key, newrule)
           end
         else
           if newrule['regexp'] then
-            newrule['hash'] = rspamd_config:add_map ({
-              url = newrule['map'],
-              description = newrule['description'],
-              type = 'regexp'
-            })
+            if newrule['multi'] then
+              newrule['hash'] = rspamd_config:add_map ({
+                url = newrule['map'],
+                description = newrule['description'],
+                type = 'regexp_multi'
+              })
+            else
+              newrule['hash'] = rspamd_config:add_map ({
+                url = newrule['map'],
+                description = newrule['description'],
+                type = 'regexp'
+              })
+            end
           elseif newrule['glob'] then
-            newrule['hash'] = rspamd_config:add_map ({
-              url = newrule['map'],
-              description = newrule['description'],
-              type = 'glob'
-            })
+            if newrule['multi'] then
+              newrule['hash'] = rspamd_config:add_map ({
+                url = newrule['map'],
+                description = newrule['description'],
+                type = 'glob_multi'
+              })
+            else
+              newrule['hash'] = rspamd_config:add_map ({
+                url = newrule['map'],
+                description = newrule['description'],
+                type = 'glob'
+              })
+            end
           else
             newrule['hash'] = rspamd_config:add_map ({
               url = newrule['map'],