Browse Source

[Rspamd] Do not apply SOGO_CONTACT for SPF fails and when sending from whitelisted host

andryyy 6 years ago
parent
commit
3a39937baf
1 changed files with 7 additions and 1 deletions
  1. 7 1
      data/conf/rspamd/local.d/composites.conf

+ 7 - 1
data/conf/rspamd/local.d/composites.conf

@@ -1,5 +1,5 @@
 MX_IMPLICIT {
 MX_IMPLICIT {
-  expression = "MX_GOOD and MX_MISSING";
+  expression = "MX_GOOD & MX_MISSING";
   score = -0.01;
   score = -0.01;
 }
 }
 VIRUS_FOUND {
 VIRUS_FOUND {
@@ -10,3 +10,9 @@ SPF_FAIL_NO_DKIM {
   expression = "R_SPF_FAIL & R_DKIM_NA & !MAILCOW_WHITE";
   expression = "R_SPF_FAIL & R_DKIM_NA & !MAILCOW_WHITE";
   score = 10;
   score = 10;
 }
 }
+SOGO_CONTACT_EXCLUDE_FWD_HOST {
+  expression = "WHITELISTED_FWD_HOST & ~SOGO_CONTACT";
+}
+SOGO_CONTACT_SPOOFED {
+  expression = "(R_SPF_PERMFAIL | R_SPF_SOFTFAIL) & ~SOGO_CONTACT";
+}