From 4881f617a50695441900e234e4c21c5f69152a2a Mon Sep 17 00:00:00 2001 From: andryyy Date: Sat, 23 May 2020 12:20:57 +0200 Subject: [PATCH] [Rspamd] Changes to WHITELISTED_FWD_HOST composite handling --- data/conf/rspamd/local.d/composites.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/conf/rspamd/local.d/composites.conf b/data/conf/rspamd/local.d/composites.conf index 23169df9..d3b7fe12 100644 --- a/data/conf/rspamd/local.d/composites.conf +++ b/data/conf/rspamd/local.d/composites.conf @@ -37,14 +37,14 @@ FORGED_W_BAD_POLICY { RBL_EXCLUDE_FWD_HOST { expression = "-WHITELISTED_FWD_HOST & ^g:rbl" } -POLICIES_EXCLUDE_FWD_HOST { - expression = "-WHITELISTED_FWD_HOST & ^g:policies" +SPF_DMARC_EXCLUDE_FWD_HOST { + expression = "-WHITELISTED_FWD_HOST & (^R_SPF_PERMFAIL | ^R_SPF_SOFTFAIL | ^R_SPF_FAIL | ^DMARC_POLICY_REJECT | ^DMARC_POLICY_QUARANTINE | ^DMARC_POLICY_SOFTFAIL)" } HFILTER_EXCLUDE_FWD_HOST { expression = "-WHITELISTED_FWD_HOST & ^g:hfilter" } -STATISTICS_EXCLUDE_FWD_HOST { - expression = "-WHITELISTED_FWD_HOST & ^g:statistics" +NEURAL_EXCLUDE_FWD_HOST { + expression = "-WHITELISTED_FWD_HOST & ^g:neural" } UPSTREAM_CHECKS_EXCLUDE_FWD_HOST { expression = "(-SIEVE_HOST | -WHITELISTED_FWD_HOST) & (^UNITEDINTERNET_SPAM | ^SPAM_FLAG | ^KLMS_SPAM | ^AOL_SPAM | ^MICROSOFT_SPAM)"