From f95bd3e7b631d29a8dfde4eae76e55ce5fb020de Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 18 Oct 2020 09:12:02 +0200 Subject: [PATCH] [Rspamd] Simplify forward host rule and add policy group to exceptions for fwd host --- data/conf/rspamd/local.d/composites.conf | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/data/conf/rspamd/local.d/composites.conf b/data/conf/rspamd/local.d/composites.conf index c1ecf8f3..71314b7f 100644 --- a/data/conf/rspamd/local.d/composites.conf +++ b/data/conf/rspamd/local.d/composites.conf @@ -35,17 +35,8 @@ FORGED_W_BAD_POLICY { expression = "( ~g+:policies | ~R_SPF_NA) & ( ~FROM_NEQ_ENVFROM & ~FORGED_SENDER ) & !WHITELISTED_FWD_HOST" score = 3.0; } -RBL_EXCLUDE_FWD_HOST { - expression = "-WHITELISTED_FWD_HOST & ^g:rbl" -} -SPF_EXCLUDE_FWD_HOST { - expression = "-WHITELISTED_FWD_HOST & (^R_SPF_PERMFAIL | ^R_SPF_SOFTFAIL | ^R_SPF_FAIL)" -} -HFILTER_EXCLUDE_FWD_HOST { - expression = "-WHITELISTED_FWD_HOST & ^g:hfilter" -} -NEURAL_EXCLUDE_FWD_HOST { - expression = "-WHITELISTED_FWD_HOST & ^g:neural" +WL_FWD_HOST { + expression = "-WHITELISTED_FWD_HOST & (^g:rbl | ^g+:policies | ^g:hfilter | ^g:neural)" } UPSTREAM_CHECKS_EXCLUDE_FWD_HOST { expression = "(-SIEVE_HOST | -WHITELISTED_FWD_HOST) & (^UNITEDINTERNET_SPAM | ^SPAM_FLAG | ^KLMS_SPAM | ^AOL_SPAM | ^MICROSOFT_SPAM)"