diff options
| author | kamilsztuke <71436027+kamilsztuke@users.noreply.github.com> | 2022-04-06 21:04:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-06 21:04:39 +0200 |
| commit | e603bdcd744c98eb9ac67eede396ba59f939748e (patch) | |
| tree | 0b6e8686d7310bc4e747bf7b5dc49afab6abbdb4 | |
| parent | 8dad76f0a46f4fea09deb7a91375815fe87b2862 (diff) | |
| parent | 75aab1cffb51a32011bb68200137bc97f1ae80e6 (diff) | |
| download | rspamd-e603bdcd744c98eb9ac67eede396ba59f939748e.tar.gz rspamd-e603bdcd744c98eb9ac67eede396ba59f939748e.zip | |
Merge branch 'rspamd:master' into fix-typo-in-config-documentation
| -rw-r--r-- | src/plugins/lua/reputation.lua | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/plugins/lua/reputation.lua b/src/plugins/lua/reputation.lua index 8d9b6535b..192c8ce3f 100644 --- a/src/plugins/lua/reputation.lua +++ b/src/plugins/lua/reputation.lua @@ -199,6 +199,8 @@ local function dkim_reputation_filter(task, rule) -- `rep_accepted` and `rep_rejected` could be negative local rep_accepted_abs = math.abs(rep_accepted or 0) local rep_rejected_abs = math.abs(rep_rejected or 0) + lua_util.debugm(N, task, "dkim reputation accepted: %s, dkim reputation rejected: %s", + rep_accepted_abs, rep_rejected_abs) if rep_accepted_abs > 0 or rep_rejected_abs > 0 then if rep_accepted_abs > rep_rejected_abs then add_symbol_score(task, rule, -(rep_accepted_abs - rep_rejected_abs)) @@ -242,7 +244,12 @@ local function dkim_reputation_postfilter(task, rule) accept_adjustment and type(cfg.max_accept_adjustment) == 'number' then local final_adjustment = cfg.max_accept_adjustment * rspamd_util.tanh(tonumber(accept_adjustment) or 0) - task:adjust_result('R_DKIM_ALLOW', sym_accepted.score * final_adjustment) + lua_util.debugm(N, task, "adjust DKIM_ALLOW: " .. + "cfg.max_accept_adjustment=%s accept_adjustment=%s final_adjustment=%s sym_accepted.score=%s", + cfg.max_accept_adjustment, accept_adjustment, final_adjustment, + sym_accepted.score) + + task:adjust_result('R_DKIM_ALLOW', sym_accepted.score + final_adjustment) end local sym_rejected = (task:get_symbol('R_DKIM_REJECT') or E)[1] @@ -252,7 +259,13 @@ local function dkim_reputation_postfilter(task, rule) reject_adjustment and type(cfg.max_reject_adjustment) == 'number' then local final_adjustment = cfg.max_reject_adjustment * rspamd_util.tanh(tonumber(reject_adjustment) or 0) - task:adjust_result('R_DKIM_REJECT', sym_rejected.score * final_adjustment) + lua_util.debugm(N, task, "adjust DKIM_REJECT: " .. + "cfg.max_reject_adjustment=%s reject_adjustment=%s final_adjustment=%s sym_rejected.score=%s", + cfg.max_reject_adjustment, reject_adjustment, final_adjustment, + sym_rejected.score) + if final_adjustment < 0 then + task:adjust_result('R_DKIM_REJECT', sym_rejected.score - final_adjustment) + end end end |