From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 26 Oct 2015 09:23:31 +0000 (+0000)
Subject: Allow to add symbols from settings
X-Git-Tag: 1.0.7~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a576bfdff4356ee578978ee2988dca6f759cd28;p=thirdparty%2Frspamd.git

Allow to add symbols from settings
---

diff --git a/src/plugins/lua/settings.lua b/src/plugins/lua/settings.lua
index 8c464431da..0003d0b64b 100644
--- a/src/plugins/lua/settings.lua
+++ b/src/plugins/lua/settings.lua
@@ -200,10 +200,10 @@ local function check_settings(task)
 
     if res then
       if rule['whitelist'] then
-        return {whitelist = true}
-      else
-        return rule['apply']
+        rule['apply'] = {whitelist = true}
       end
+
+      return rule
     end
 
     return nil
@@ -246,7 +246,15 @@ local function check_settings(task)
         if rule then
           rspamd_logger.infox(task, "<%1> apply settings according to rule %2",
             task:get_message_id(), name)
-          task:set_settings(rule)
+          if rule['apply'] then
+            task:set_settings(rule)
+          end
+          if rule['symbols'] then
+            -- Add symbols, specified in the settings
+            each(function(val)
+              task:insert_result(val, 1.0)
+            end, rule['symbols'])
+          end
         end
       end
     end