commit 00af0f5: [Fix] Fix rcpt_mime and from_mime in user settings
Vsevolod Stakhov
vsevolod at highsecure.ru
Wed Mar 6 17:49:05 UTC 2019
Author: Vsevolod Stakhov
Date: 2019-03-06 17:43:54 +0000
URL: https://github.com/rspamd/rspamd/commit/00af0f5212cc7903011d9593271223404ff34edf (HEAD -> master)
[Fix] Fix rcpt_mime and from_mime in user settings
---
src/plugins/lua/settings.lua | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/plugins/lua/settings.lua b/src/plugins/lua/settings.lua
index 4e7afbf84..972375b32 100644
--- a/src/plugins/lua/settings.lua
+++ b/src/plugins/lua/settings.lua
@@ -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
More information about the Commits
mailing list