From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 14 May 2018 13:00:49 +0000 (+0100)
Subject: [Conf] Add MSBL proposed return codes
X-Git-Tag: 1.7.5~32
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f7817011cd0fa1d593ffae453f3802f51a1d977e;p=rspamd.git

[Conf] Add MSBL proposed return codes
---

diff --git a/conf/modules.d/emails.conf b/conf/modules.d/emails.conf
index accdd4d2d..74a67cf46 100644
--- a/conf/modules.d/emails.conf
+++ b/conf/modules.d/emails.conf
@@ -22,13 +22,25 @@ emails {
             dnsbl = "email.rspamd.com";
             check_replyto = true;
             hash = "blake2";
+            returncodes = {
+              RSPAMD_EMAILBL = "127.0.0.2";
+            }
         }
         MSBL_EBL {
             dnsbl = "ebl.msbl.org";
             domain_only = false;
             check_replyto = true;
             hash = "sha1";
-            expect_ip = "127.0.0.2";
+            returncodes = {
+              MSBL_EBL = [
+                "127.0.0.2",
+                "127.0.0.3"
+              ];
+              MSBL_EBL_GREY = [
+                "127.0.1.2",
+                "127.0.1.3"
+              ];
+            }
         }
     }
     .include(try=true,priority=5) "${DBDIR}/dynamic/emails.conf"
diff --git a/conf/scores.d/surbl_group.conf b/conf/scores.d/surbl_group.conf
index 839c68e61..9605df5c0 100644
--- a/conf/scores.d/surbl_group.conf
+++ b/conf/scores.d/surbl_group.conf
@@ -57,6 +57,12 @@ symbols = {
         one_shot = true;
     }
 
+    "MSBL_EBL_GREY" {
+        weight = 0.5; # TODO: test it
+        description = "MSBL emailbl grey list";
+        one_shot = true;
+    }
+
     "SEM_URIBL_UNKNOWN" {
         weight = 0.0;
         description = "Spameatingmonkey uribl: unknown result";