Update RBL configuration with new selectors

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index 7d6bea622321124c882aca35b48e424606596bb3..310b21d20216cf1a9309b41af9c05fed0c9bae6e 100644 (file)
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -214,9 +214,13 @@ rbl {
       emails_delimiter = ".";
       hash_format = "base32";
       hash_len = 32;
+      hash = "blake2";
       rbl = "email.rspamd.com";
       checks = ['emails', 'replyto'];
-      hash = "blake2";
+      selector = {
+        from_smtp = "from('smtp'):addr.lower_utf8";
+        from_mime = "from('mime'):addr.lower_utf8";
+      }
       returncodes = {
         RSPAMD_EMAILBL = "127.0.0.2";
       }
@@ -229,6 +233,10 @@ rbl {
       exclude_users = false;
       rbl = "ebl.msbl.org";
       checks = ['emails', 'replyto'];
+      selector = {
+        from_smtp = "from('smtp'):addr.lower_utf8";
+        from_mime = "from('mime'):addr.lower_utf8";
+      }
       emails_domainonly = false;
       hash = "sha1";
       returncodes = {
@@ -251,7 +259,8 @@ rbl {
       exclude_users = false;
       url_full_hostname = true; # According to SURBL rules
       selector = {
-        mid = 'header(Message-Id).regexp("@([^\.]+\.[^>]+)").last';
+        from_smtp = "from('smtp'):domain";
+        from_mime = "from('mime'):domain";
       }
 
       returnbits = {
@@ -290,7 +299,8 @@ rbl {
       emails_domainonly = true;
       exclude_users = false;
       selector = {
-        mid = 'header(Message-Id).regexp("@([^\.]+\.[^>]+)").last';
+        from_smtp = "from('smtp'):domain";
+        from_mime = "from('mime'):domain";
       }
 
       returnbits {
@@ -305,6 +315,10 @@ rbl {
       ignore_defaults = true;
       rbl = "uribl.rspamd.com";
       checks = ['emails', 'dkim', 'urls'];
+      selector = {
+        from_smtp = "from('smtp'):domain";
+        from_mime = "from('mime'):domain";
+      }
       emails_domainonly = true;
       hash = 'blake2';
       hash_len = 32;
@@ -326,7 +340,8 @@ rbl {
       emails_domainonly = true;
       exclude_users = false;
       selector = {
-        mid = 'header(Message-Id).regexp("@([^\.]+\.[^>]+)").last';
+        from_smtp = "from('smtp'):domain";
+        from_mime = "from('mime'):domain";
       }
 
       returncodes = {
@@ -376,6 +391,10 @@ rbl {
       rbl = "uribl.spameatingmonkey.net";
       no_ip = true;
       checks = ['emails', 'dkim', 'urls'];
+      selector = {
+        from_smtp = "from('smtp'):domain";
+        from_mime = "from('mime'):domain";
+      }
       emails_domainonly = true;
       returnbits {
         SEM_URIBL = 2;
@@ -387,6 +406,10 @@ rbl {
       rbl = "fresh15.spameatingmonkey.net";
       no_ip = true;
       checks = ['emails', 'dkim', 'urls'];
+      selector = {
+        from_smtp = "from('smtp'):domain";
+        from_mime = "from('mime'):domain";
+      }
       emails_domainonly = true;
       returnbits {
         SEM_URIBL_FRESH15 = 2;