From 5c07cca529acae330dc80c6066f9dbc11995688a Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Thu, 9 May 2019 11:48:38 +0200
Subject: [PATCH] [Rspamd] Change spoofed mail handling

---
 data/conf/rspamd/local.d/composites.conf | 2 +-
 data/conf/rspamd/local.d/multimap.conf   | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/data/conf/rspamd/local.d/composites.conf b/data/conf/rspamd/local.d/composites.conf
index 46f06743..1139b490 100644
--- a/data/conf/rspamd/local.d/composites.conf
+++ b/data/conf/rspamd/local.d/composites.conf
@@ -17,6 +17,6 @@ SOGO_CONTACT_SPOOFED {
   expression = "(R_SPF_PERMFAIL | R_SPF_SOFTFAIL | R_SPF_FAIL) & ~SOGO_CONTACT";
 }
 SPOOFED_UNAUTH {
-  expression = "UNAUTH_MAILCOW_DOMAIN & !MAILCOW_WHITE & !R_SPF_ALLOW";
+  expression = "!MAILCOW_AUTH & !MAILCOW_WHITE & !R_SPF_ALLOW & !DMARC_POLICY_ALLOW";
   score = 5.0;
 }
diff --git a/data/conf/rspamd/local.d/multimap.conf b/data/conf/rspamd/local.d/multimap.conf
index 6ce56f7a..7752b813 100644
--- a/data/conf/rspamd/local.d/multimap.conf
+++ b/data/conf/rspamd/local.d/multimap.conf
@@ -83,11 +83,3 @@ GLOBAL_RCPT_BL {
   prefilter = true;
   action = "reject";
 }
-
-UNAUTH_MAILCOW_DOMAIN {
-  type = "header";
-  header = "from";
-  filter = "email:domain";
-  nflags = ["authenticated"];
-  map = "redis://DOMAIN_MAP";
-}