commit b6d1cf0: also query resolved IPs against Spamhaus ZEN

[heraklit256]

Author: heraklit256
Date: 2018-10-29 21:06:36 +0100
URL: https://github.com/rspamd/rspamd/commit/b6d1cf00f7c64e2e156f17c793c7866f982961b5

also query resolved IPs against Spamhaus ZEN

---
 conf/modules.d/surbl.conf      |  7 +++++--
 conf/scores.d/surbl_group.conf | 20 ++++++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/conf/modules.d/surbl.conf b/conf/modules.d/surbl.conf
index 6973e7bef..f8c046aa9 100644
--- a/conf/modules.d/surbl.conf
+++ b/conf/modules.d/surbl.conf
@@ -87,12 +87,15 @@ EOD;
             }
         }
 
-        "SBL_URIBL" {
-            suffix = "sbl.spamhaus.org";
+        "SPAMHAUS_ZEN_URIBL" {
+            suffix = "zen.spamhaus.org";
             resolve_ip = true;
             ips {
                 URIBL_SBL = "127.0.0.2";
                 URIBL_SBL_CSS = "127.0.0.3";
+                URIBL_XBL = ["127.0.0.4", "127.0.0.5", "127.0.0.6", "127.0.0.7"];
+                URIBL_PBL = ["127.0.0.10", "127.0.0.11"];
+                URIBL_DROP = "127.0.0.9";
             }
         }
 
diff --git a/conf/scores.d/surbl_group.conf b/conf/scores.d/surbl_group.conf
index 9605df5c0..94e6e1c8b 100644
--- a/conf/scores.d/surbl_group.conf
+++ b/conf/scores.d/surbl_group.conf
@@ -146,17 +146,29 @@ symbols = {
         description = "uribl.com grey url";
         one_shot = true;
     }
-    "SBL_URIBL" {
+    "SPAMHAUS_ZEN_URIBL" {
         weight = 0.0;
-        description = "SBL URIBL: Filtered result";
+        description = "Spamhaus ZEN URIBL: Filtered result";
     }
     "URIBL_SBL" {
         weight = 6.5;
-        description = "Spamhaus SBL URIBL";
+        description = "A domain listed in the mail is listed in Spamhaus SBL URIBL";
     }
     "URIBL_SBL_CSS" {
         weight = 6.5;
-        description = "Spamhaus SBL CSS URIBL";
+        description = "A domain listed in the mail is listed in Spamhaus SBL CSS URIBL";
+    }
+    "URIBL_XBL" {
+        weight = 6.5;
+        description = "A domain listed in the mail is listed in Spamhaus XBL URIBL";
+    }
+    "URIBL_PBL" {
+        weight = 0.1;
+        description = "A domain listed in the mail is listed in Spamhaus PBL URIBL";
+    }
+    "URIBL_DROP" {
+        weight = 8.0;
+        description = "A domain listed in the mail is listed in Spamhaus DROP URIBL";
     }
     "RBL_SARBL_BAD" {
         weight = 2.5;