From: Andrew Lewis <nerf@judo.za.org>
Date: Mon, 22 Aug 2016 09:38:33 +0000 (+0200)
Subject: [Minor] Composite: Don't penalise for SPF/DKIM failure when DMARC passed
X-Git-Tag: 1.3.4~9^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9616bee5ff2d76206e55b81852d0e2ae7aa1e3db;p=rspamd.git

[Minor] Composite: Don't penalise for SPF/DKIM failure when DMARC passed
---

diff --git a/conf/composites.conf b/conf/composites.conf
index 5ed69df39..d6d845fe9 100644
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -26,6 +26,9 @@ composite "FORGED_SENDER_FORWARDING" {
 composite "SPF_FAIL_FORWARDING" {
     expression = "g:forwarding & (R_SPF_SOFTFAIL | R_SPF_FAIL)";
 }
+composite "DMARC_POLICY_ALLOW_WITH_FAILURES" {
+    expression = "DMARC_POLICY_ALLOW & (R_SPF_SOFTFAIL | R_SPF_FAIL | R_DKIM_REJECT)";
+}
 composite "FORGED_RECIPIENTS_FORWARDING" {
     expression = "FORGED_RECIPIENTS & g:forwarding";
 }
diff --git a/conf/metrics.conf b/conf/metrics.conf
index 781034048..44600b5bc 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -997,6 +997,10 @@ metric {
             weight = -0.5;
             description = "DMARC permit policy";
         }
+        symbol "DMARC_POLICY_ALLOW_WITH_FAILURES" {
+            weight = -0.5;
+            description = "DMARC permit policy with DKIM/SPF failure";
+        }
         symbol "DMARC_POLICY_REJECT" {
             weight = 2.0;
             description = "DMARC reject policy";