[Rspamd] Changes to WHITELISTED_FWD_HOST composite handling

This commit is contained in:
andryyy 2020-05-23 12:20:57 +02:00
parent 51846cd875
commit 4881f617a5
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF

View File

@ -37,14 +37,14 @@ FORGED_W_BAD_POLICY {
RBL_EXCLUDE_FWD_HOST { RBL_EXCLUDE_FWD_HOST {
expression = "-WHITELISTED_FWD_HOST & ^g:rbl" expression = "-WHITELISTED_FWD_HOST & ^g:rbl"
} }
POLICIES_EXCLUDE_FWD_HOST { SPF_DMARC_EXCLUDE_FWD_HOST {
expression = "-WHITELISTED_FWD_HOST & ^g:policies" 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 { HFILTER_EXCLUDE_FWD_HOST {
expression = "-WHITELISTED_FWD_HOST & ^g:hfilter" expression = "-WHITELISTED_FWD_HOST & ^g:hfilter"
} }
STATISTICS_EXCLUDE_FWD_HOST { NEURAL_EXCLUDE_FWD_HOST {
expression = "-WHITELISTED_FWD_HOST & ^g:statistics" expression = "-WHITELISTED_FWD_HOST & ^g:neural"
} }
UPSTREAM_CHECKS_EXCLUDE_FWD_HOST { UPSTREAM_CHECKS_EXCLUDE_FWD_HOST {
expression = "(-SIEVE_HOST | -WHITELISTED_FWD_HOST) & (^UNITEDINTERNET_SPAM | ^SPAM_FLAG | ^KLMS_SPAM | ^AOL_SPAM | ^MICROSOFT_SPAM)" expression = "(-SIEVE_HOST | -WHITELISTED_FWD_HOST) & (^UNITEDINTERNET_SPAM | ^SPAM_FLAG | ^KLMS_SPAM | ^AOL_SPAM | ^MICROSOFT_SPAM)"