]> source.dussan.org Git - rspamd.git/commitdiff
[Fix] Fix rcpt_mime and from_mime in user settings
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Wed, 6 Mar 2019 17:43:54 +0000 (17:43 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Wed, 6 Mar 2019 17:43:54 +0000 (17:43 +0000)
src/plugins/lua/settings.lua

index 4e7afbf8426e445a7706787f3caa3bbb54e1cf79..972375b32233a31758aefafe3aabd167035f583c 100644 (file)
@@ -584,6 +584,19 @@ local function process_settings_table(tbl)
         out['rcpt'] = check_table(elt['rcpt'], rcpt)
       end
     end
+    if elt['from_mime'] then
+      local from_mime = process_addr(elt['from_mime'])
+
+      if from_mime then
+        out['from_mime'] = check_table(elt['from_mime'], from_mime)
+      end
+    end
+    if elt['rcpt_mime'] then
+      local rcpt_mime = process_addr(elt['rcpt_mime'])
+      if rcpt_mime then
+        out['rcpt_mime'] = check_table(elt['rcpt_mime'], rcpt_mime)
+      end
+    end
     if elt['user'] then
       local user = process_addr(elt['user'])
       if user then
@@ -608,10 +621,7 @@ local function process_settings_table(tbl)
     if elt['request_header'] then
       local rho = {}
       for k, v in pairs(elt['request_header']) do
-        local re = rspamd_regexp.get_cached(v)
-        if not re then
-          re = rspamd_regexp.create_cached(v)
-        end
+        local re = rspamd_regexp.create(v)
         if re then
           rho[k] = re
         end