From: Peter Müller <peter.mueller@link38.eu>
Date: Thu, 17 May 2018 17:11:36 +0000 (+0200)
Subject: add more Spamhaus RBL results to received IPs
X-Git-Tag: 1.7.6~123^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=291afeea369985518dcf63238471d83121bf64ef;p=rspamd.git

add more Spamhaus RBL results to received IPs
---

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index e92587f8d..8a5b2dab8 100644
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -43,8 +43,12 @@ rbl {
             from = false;
             ignore_whitelists = true;
             returncodes {
+                RECEIVED_SPAMHAUS_SBL = "127.0.0.2";
+                RECEIVED_SPAMHAUS_CSS = "127.0.0.3";
                 RECEIVED_SPAMHAUS_XBL = ["127.0.0.4", "127.0.0.5",
                     "127.0.0.6", "127.0.0.7"];
+                RECEIVED_SPAMHAUS_PBL = ["127.0.0.10", "127.0.0.11"];
+                RECEIVED_SPAMHAUS_DROP = "127.0.0.9";
             }
         }
 
diff --git a/conf/scores.d/rbl_group.conf b/conf/scores.d/rbl_group.conf
index 8703afd3d..8bee1b4b5 100644
--- a/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@ -69,11 +69,31 @@ symbols = {
         weight = 7.0;
         description = "From address is listed in zen drop bl";
     }
+    "RECEIVED_SPAMHAUS_SBL" {
+        weight = 1.0;
+        description = "Received address is listed in zen sbl";
+        one_shot = true;
+    }
+    "RECEIVED_SPAMHAUS_CSS" {
+        weight = 1.0;
+        description = "Received address is listed in zen css";
+        one_shot = true;
+    }
     "RECEIVED_SPAMHAUS_XBL" {
         weight = 3.0;
         description = "Received address is listed in zen xbl";
         one_shot = true;
     }
+    "RECEIVED_SPAMHAUS_PBL" {
+        weight = 0.0;
+        description = "Received address is listed in pbl (ISP list)";
+        one_shot = true;
+    }
+    "RECEIVED_SPAMHAUS_DROP" {
+        weight = 6.0;
+        description = "Received address is listed in zen drop bl";
+        one_shot = true;
+    }
 
     "RBL_SENDERSCORE" {
         weight = 2.0;
@@ -129,4 +149,4 @@ symbols = {
         weight = 1.0;
         description = "Address is listed in Spameatingmonkey RBL (ipv6)";
     }
-}
\ No newline at end of file
+}