]> source.dussan.org Git - rspamd.git/commitdiff
Allow to add symbols from settings
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 26 Oct 2015 09:23:31 +0000 (09:23 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 26 Oct 2015 09:23:31 +0000 (09:23 +0000)
src/plugins/lua/settings.lua

index 8c464431da4cc859009259f57134ec4c16944438..0003d0b64b3f5f7c61088edae5e9df843d08f407 100644 (file)
@@ -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