From 586992618cb4be56e3c5f66589724755efd3596a Mon Sep 17 00:00:00 2001 From: andryyy Date: Thu, 19 Nov 2020 09:44:04 +0100 Subject: [PATCH] [Rspamd] Revert previous commit; Do not punish DMARC alignment when p=none --- data/conf/rspamd/local.d/composites.conf | 3 +-- data/conf/rspamd/local.d/policies_group.conf | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/data/conf/rspamd/local.d/composites.conf b/data/conf/rspamd/local.d/composites.conf index c149eb67..e2f6f9d3 100644 --- a/data/conf/rspamd/local.d/composites.conf +++ b/data/conf/rspamd/local.d/composites.conf @@ -12,9 +12,8 @@ SOGO_CONTACT_EXCLUDE { expression = "(-WHITELISTED_FWD_HOST | -g+:policies) & ^SOGO_CONTACT & !DMARC_POLICY_ALLOW"; } # Spoofed header from and broken policy (excluding sieve host, rspamd host, whitelisted senders, authenticated senders and forward hosts) -# DMARC_POLICY_SOFTFAIL indicates a "none" policy, which we don't want to punish SPOOFED_UNAUTH { - expression = "!MAILCOW_AUTH & !MAILCOW_WHITE & !RSPAMD_HOST & !SIEVE_HOST & MAILCOW_DOMAIN_HEADER_FROM & !WHITELISTED_FWD_HOST & -g+:policies & !DMARC_POLICY_SOFTFAIL"; + expression = "!MAILCOW_AUTH & !MAILCOW_WHITE & !RSPAMD_HOST & !SIEVE_HOST & MAILCOW_DOMAIN_HEADER_FROM & !WHITELISTED_FWD_HOST & -g+:policies"; score = 50.0; } # Only apply to inbound unauthed and not whitelisted diff --git a/data/conf/rspamd/local.d/policies_group.conf b/data/conf/rspamd/local.d/policies_group.conf index 0e37e083..8799db1c 100644 --- a/data/conf/rspamd/local.d/policies_group.conf +++ b/data/conf/rspamd/local.d/policies_group.conf @@ -18,6 +18,6 @@ symbols = { weight = 8.0; } "DMARC_POLICY_SOFTFAIL" { - weight = 1.0; + weight = 0.0; } }