From: Frederik Bosch <f.bosch@genkgo.nl>
Date: Wed, 12 Oct 2022 08:44:12 +0000 (+0200)
Subject: Protect against bounce spam
X-Git-Tag: 3.4~41^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92c051189755705cff095e6cce7bc6a6e35a0353;p=thirdparty%2Frspamd.git

Protect against bounce spam
---

diff --git a/conf/composites.conf b/conf/composites.conf
index cd03d5fdd4..543d7c46a7 100644
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -53,7 +53,17 @@ composites {
     expression = "R_DKIM_NA & R_SPF_NA & DMARC_NA & ARC_NA";
     score = 1.0;
     policy = "remove_weight";
-    description = "Authenticating message via SPF/DKIM/DMARC/ARC not possible";
+    description = "Authenticating message via SPF/DKIM/DMARC/ARC not available";
+  }
+  AUTH_NA_OR_FAIL {
+    expression = "!AUTH_NA & (R_DKIM_NA | R_DKIM_TEMPFAIL | R_DKIM_PERMFAIL) & (R_SPF_NA | R_SPF_DNSFAIL) & DMARC_NA & (ARC_NA | ARC_DNSFAIL)";
+    score = 1.0;
+    policy = "remove_weight";
+    description = "Authenticating message via SPF/DKIM/DMARC/ARC not available or failed";
+  }
+  BOUNCE_NO_AUTH {
+    expression = "(AUTH_NA | AUTH_NA_OR_FAIL) & (BOUNCE | SUBJ_BOUNCE_WORDS)";
+    score = 1.0;
   }
   DKIM_MIXED {
     expression = "-R_DKIM_ALLOW & (R_DKIM_TEMPFAIL | R_DKIM_PERMFAIL | R_DKIM_REJECT)"