]> source.dussan.org Git - rspamd.git/commitdiff
[Conf] Register new Spamhaus codes
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Fri, 11 Oct 2019 08:13:05 +0000 (09:13 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Fri, 11 Oct 2019 08:13:05 +0000 (09:13 +0100)
Issue: #3074
Closes: #3074
conf/modules.d/rbl.conf
conf/scores.d/rbl_group.conf
conf/scores.d/surbl_group.conf

index caaee4b970ca2335fd6d008401167cf9c473c4fb..56f92b429cb4a8e2aad91e3d2bda2062bf8db7f8 100644 (file)
@@ -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";
       }
     }
 
index c86dba8675d5d362d7f95989f9644a2bd092ca28..690d0ee17f58141227f59fcbc4fc724d9cfa88c3 100644 (file)
@@ -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;
index 93befa0856dd11bd49bf87d69f0c77f0d2975fe8..b4e5b6bbf568590b6ee1e13d216a052b78103170 100644 (file)
@@ -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";