From: Andrew Lewis <nerf@judo.za.org>
Date: Wed, 14 Dec 2016 08:41:04 +0000 (+0200)
Subject: [Feature] Support setting SMTP message in multimap
X-Git-Tag: 1.5.0~587^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1260%2Fhead;p=thirdparty%2Frspamd.git

[Feature] Support setting SMTP message in multimap
---

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index 6412e92400..9947fb9175 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -442,7 +442,14 @@ local function multimap_callback(task, rule)
         end
 
         if pre_filter then
-          task:set_pre_result(r['action'], 'Matched map: ' .. r['symbol'])
+          if r['message_func'] then
+            r['message'] = r.message_func(task, r['symbol'], opt)
+          end
+          if r['message'] then
+            task:set_pre_result(r['action'], r['message'])
+          else
+            task:set_pre_result(r['action'], 'Matched map: ' .. r['symbol'])
+          end
         end
       end
     end
@@ -617,6 +624,9 @@ end
 
 local function add_multimap_rule(key, newrule)
   local ret = false
+  if newrule['message_func'] then
+    newrule['message_func'] = assert(load(newrule['message_func']))()
+  end
   if newrule['url'] and not newrule['map'] then
     newrule['map'] = newrule['url']
   end