[Rspamd] Add symbol HAM_TRAP or SPAM_TRAP for trap aliases

2020-10-29 20:29:14 +01:00
parent c586ddd5db
commit d94b5e43ea
2 changed files with 26 additions and 9 deletions
--- a/data/conf/rspamd/lua/rspamd.local.lua
+++ b/data/conf/rspamd/lua/rspamd.local.lua
@@ -113,9 +113,9 @@ rspamd_config:register_symbol({
    for _,fr in ipairs(from) do
      local fr_split = rspamd_str_split(fr['addr'], '@')
      if #fr_split == 2 then
-        if fr_split[1] == 'postmaster' then
+        if fr_split[1] == 'postmaster' and task:get_user() then
          -- no whitelist, keep signatures
-          task:insert_result(true, 'POSTMASTER_FROM', -2500.0, from_ip_string)
+          task:insert_result(true, 'POSTMASTER_FROM', -2500.0)
          return
        end
      end