[Rspamd] More excludes for fwd hosts, minor fix to FORGED_W_BAD_POLICY

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)"
 }