From 615ef47f27101673c3524cbf4151014e45d0d8e4 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sat, 23 May 2020 11:16:33 +0200 Subject: [PATCH] [Rspamd] More excludes for fwd hosts, minor fix to FORGED_W_BAD_POLICY --- data/conf/rspamd/local.d/composites.conf | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/data/conf/rspamd/local.d/composites.conf b/data/conf/rspamd/local.d/composites.conf index f0488e55..23169df9 100644 --- a/data/conf/rspamd/local.d/composites.conf +++ b/data/conf/rspamd/local.d/composites.conf @@ -31,12 +31,21 @@ BAD_WORD_BAD_TLD { score = 10.0; } FORGED_W_BAD_POLICY { - expression = "( ~g+:policies | ~R_SPF_NA) & ( ~FROM_NEQ_ENVFROM & ~FORGED_SENDER )" + 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" } +POLICIES_EXCLUDE_FWD_HOST { + expression = "-WHITELISTED_FWD_HOST & ^g:policies" +} +HFILTER_EXCLUDE_FWD_HOST { + expression = "-WHITELISTED_FWD_HOST & ^g:hfilter" +} +STATISTICS_EXCLUDE_FWD_HOST { + expression = "-WHITELISTED_FWD_HOST & ^g:statistics" +} UPSTREAM_CHECKS_EXCLUDE_FWD_HOST { expression = "(-SIEVE_HOST | -WHITELISTED_FWD_HOST) & (^UNITEDINTERNET_SPAM | ^SPAM_FLAG | ^KLMS_SPAM | ^AOL_SPAM | ^MICROSOFT_SPAM)" }