From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 11 Oct 2019 08:13:05 +0000 (+0100)
Subject: [Conf] Register new Spamhaus codes
X-Git-Tag: 2.0~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e16042d0d4db18d29724f596e735dde321675ed5;p=thirdparty%2Frspamd.git

[Conf] Register new Spamhaus codes

Issue: #3074
Closes: #3074
---

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index caaee4b970..56f92b429c 100644
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -44,6 +44,8 @@ rbl {
             "127.0.0.6", "127.0.0.7"];
         SPAMHAUS_PBL = ["127.0.0.10", "127.0.0.11"];
         SPAMHAUS_DROP = "127.0.0.9";
+        SPAMHAUS_BLOCKED_OPENRESOLVER = "127.255.255.254";
+        SPAMHAUS_BLOCKED= "127.255.255.255";
       }
     }
 
@@ -263,6 +265,9 @@ rbl {
         DBL_ABUSE_BOTNET = "127.0.1.106";
         # error - IP queries prohibited!
         DBL_PROHIBIT = "127.0.1.255";
+        # issue #3074
+        DBL_BLOCKED_OPENRESOLVER = "127.255.255.254";
+        DBL_BLOCKED = "127.255.255.255";
       }
     }
 
diff --git a/conf/scores.d/rbl_group.conf b/conf/scores.d/rbl_group.conf
index c86dba8675..690d0ee17f 100644
--- a/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@ -116,6 +116,16 @@ symbols = {
         description = "From address is listed in ZEN DROP BL";
         groups = ["spamhaus"];
     }
+    "RBL_SPAMHAUS_BLOCKED_OPENRESOLVER" {
+      weight = 0.0;
+      description = "You are querying Spamhaus from an open resolver, please see https://www.spamhaus.org/returnc/pub/";
+      groups = ["spamhaus"];
+    }
+    "RBL_SPAMHAUS_BLOCKED" {
+      weight = 0.0;
+      description = "You are exceeding the query limit, please see https://www.spamhaus.org/returnc/vol/";
+      groups = ["spamhaus"];
+    }
     "RECEIVED_SPAMHAUS_SBL" {
         weight = 1.0;
         description = "Received address is listed in ZEN SBL";
@@ -146,6 +156,16 @@ symbols = {
         groups = ["spamhaus"];
         one_shot = true;
     }
+    "RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER" {
+      weight = 0.0;
+      description = "You are querying Spamhaus from an open resolver, please see https://www.spamhaus.org/returnc/pub/";
+      groups = ["spamhaus"];
+    }
+    "RECEIVED_SPAMHAUS_BLOCKED" {
+      weight = 0.0;
+      description = "You are exceeding the query limit, please see https://www.spamhaus.org/returnc/vol/";
+      groups = ["spamhaus"];
+    }
 
     "RBL_SENDERSCORE" {
         weight = 2.0;
diff --git a/conf/scores.d/surbl_group.conf b/conf/scores.d/surbl_group.conf
index 93befa0856..b4e5b6bbf5 100644
--- a/conf/scores.d/surbl_group.conf
+++ b/conf/scores.d/surbl_group.conf
@@ -150,6 +150,16 @@ symbols = {
         description = "DBL uribl IP queries prohibited!";
         groups = ["spamhaus"];
     }
+    "DBL_BLOCKED_OPENRESOLVER" {
+      weight = 0.0;
+      description = "You are querying Spamhaus from an open resolver, please see https://www.spamhaus.org/returnc/pub/";
+      groups = ["spamhaus"];
+    }
+    "DBL_BLOCKED" {
+      weight = 0.0;
+      description = "You are exceeding the query limit, please see https://www.spamhaus.org/returnc/vol/";
+      groups = ["spamhaus"];
+    }
     "URIBL_MULTI" {
         weight = 0.0;
         description = "uribl.com: unrecognised result";