From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 12 Aug 2016 10:20:41 +0000 (+0100)
Subject: [Fix] Fix multimap content filters
X-Git-Tag: 1.3.3~22
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=888dee57cfcd029a07ac0ebac29bd2e7347ecc00;p=rspamd.git

[Fix] Fix multimap content filters
---

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index e40cb01cc..92fbe9e4c 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -197,7 +197,7 @@ local function apply_filename_filter(filter, fn, r)
   return fn
 end
 
-local function apply_content_filter(filter, r)
+local function apply_content_filter(task, filter, r)
   if filter == 'body' then
     return {task:get_rawbody()}
   elseif filter == 'full' then
@@ -347,7 +347,7 @@ local function multimap_callback(task, rule)
     local function rule_callback(result)
       if result then
         local res,symbol,score = parse_ret(result)
-        if symbol then
+        if symbol and r['symbols_set'] then
           if not r['symbols_set'][symbol] then
             rspamd_logger.infox(task, 'symbol %s is not registered for map %s, ' ..
               'replace it with just %s',
@@ -417,7 +417,7 @@ local function multimap_callback(task, rule)
     local data = {}
 
     if r['filter'] then
-      data = apply_content_filter(r['filter'], r)
+      data = apply_content_filter(task, r['filter'], r)
     else
       data = {task:get_content()}
     end