From 8da54e5194bdbbb4eaf4d8baa05257cd8fc966cb Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Tue, 29 Jan 2019 12:11:10 +0100
Subject: [PATCH] [Rspamd] Split global wl from to mime-from and smtp-from

---
 ...ist.map => global_mime_from_blacklist.map} |  0
 ...ist.map => global_mime_from_whitelist.map} |  0
 .../custom/global_smtp_from_blacklist.map     |  1 +
 .../custom/global_smtp_from_whitelist.map     |  1 +
 data/conf/rspamd/local.d/multimap.conf        | 26 ++++++++++++++++---
 5 files changed, 24 insertions(+), 4 deletions(-)
 rename data/conf/rspamd/custom/{global_from_blacklist.map => global_mime_from_blacklist.map} (100%)
 rename data/conf/rspamd/custom/{global_from_whitelist.map => global_mime_from_whitelist.map} (100%)
 create mode 100644 data/conf/rspamd/custom/global_smtp_from_blacklist.map
 create mode 100644 data/conf/rspamd/custom/global_smtp_from_whitelist.map

diff --git a/data/conf/rspamd/custom/global_from_blacklist.map b/data/conf/rspamd/custom/global_mime_from_blacklist.map
similarity index 100%
rename from data/conf/rspamd/custom/global_from_blacklist.map
rename to data/conf/rspamd/custom/global_mime_from_blacklist.map
diff --git a/data/conf/rspamd/custom/global_from_whitelist.map b/data/conf/rspamd/custom/global_mime_from_whitelist.map
similarity index 100%
rename from data/conf/rspamd/custom/global_from_whitelist.map
rename to data/conf/rspamd/custom/global_mime_from_whitelist.map
diff --git a/data/conf/rspamd/custom/global_smtp_from_blacklist.map b/data/conf/rspamd/custom/global_smtp_from_blacklist.map
new file mode 100644
index 00000000..3c872889
--- /dev/null
+++ b/data/conf/rspamd/custom/global_smtp_from_blacklist.map
@@ -0,0 +1 @@
+# /.+example\.com/i
diff --git a/data/conf/rspamd/custom/global_smtp_from_whitelist.map b/data/conf/rspamd/custom/global_smtp_from_whitelist.map
new file mode 100644
index 00000000..3c872889
--- /dev/null
+++ b/data/conf/rspamd/custom/global_smtp_from_whitelist.map
@@ -0,0 +1 @@
+# /.+example\.com/i
diff --git a/data/conf/rspamd/local.d/multimap.conf b/data/conf/rspamd/local.d/multimap.conf
index 47eca4ff..7752b813 100644
--- a/data/conf/rspamd/local.d/multimap.conf
+++ b/data/conf/rspamd/local.d/multimap.conf
@@ -34,17 +34,35 @@ LOCAL_BL_ASN {
   symbols_set = ["LOCAL_BL_ASN"];
 }
 
-GLOBAL_FROM_WL {
+GLOBAL_SMTP_FROM_WL {
   type = "from";
-  map = "$LOCAL_CONFDIR/custom/global_from_whitelist.map";
+  map = "$LOCAL_CONFDIR/custom/global_smtp_from_whitelist.map";
   regexp = true;
   prefilter = true;
   action = "accept";
 }
 
-GLOBAL_FROM_BL {
+GLOBAL_SMTP_FROM_BL {
   type = "from";
-  map = "$LOCAL_CONFDIR/custom/global_from_blacklist.map";
+  map = "$LOCAL_CONFDIR/custom/global_smtp_from_blacklist.map";
+  regexp = true;
+  prefilter = true;
+  action = "reject";
+}
+
+GLOBAL_MIME_FROM_WL {
+  type = "header";
+  header = "from";
+  map = "$LOCAL_CONFDIR/custom/global_mime_from_whitelist.map";
+  regexp = true;
+  prefilter = true;
+  action = "accept";
+}
+
+GLOBAL_MIME_FROM_BL {
+  type = "header";
+  header = "from";
+  map = "$LOCAL_CONFDIR/custom/global_mime_from_blacklist.map";
   regexp = true;
   prefilter = true;
   action = "reject";