Add config for spamhaus SBL to uribl

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 4560c3ece1e86b217b0b36305b3dab086fbe60f4..7fca19062f15e91e1c149d911951877998695e8e 100644 (file)
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -827,37 +827,37 @@ metric {
     group {
        name = "surbl";
        symbol {
-           weight = 5.500000;
+           weight = 5.5;
            description = "SURBL: Phishing sites";
            name = "PH_SURBL_MULTI";
        }
        symbol {
-           weight = 5.500000;
+           weight = 5.5;
            description = "SURBL: Malware sites";
            name = "MW_SURBL_MULTI";
        }
        symbol {
-           weight = 5.500000;
+           weight = 5.5;
            description = "SURBL: AbuseButler web sites";
            name = "AB_SURBL_MULTI";
        }
        symbol {
-           weight = 5.500000;
+           weight = 5.5;
            description = "SURBL: SpamCop web sites";
            name = "SC_SURBL_MULTI";
        }
        symbol {
-           weight = 5.500000;
+           weight = 5.5;
            description = "SURBL: jwSpamSpy + Prolocation sites";
            name = "JP_SURBL_MULTI";
        }
        symbol {
-           weight = 5.500000;
+           weight = 5.5;
            description = "SURBL: sa-blacklist web sites ";
            name = "WS_SURBL_MULTI";
        }
        symbol {
-           weight = 4.500000;
+           weight = 4.5;
            description = "rambler.ru uribl";
            name = "RAMBLER_URIBL";
        }
@@ -885,52 +885,52 @@ metric {
        }
 
        symbol {
-           weight = 0.000000;
+           weight = 0;
            description = "DBL uribl unknown symbol (error)";
            name = "DBL";
        }
        symbol {
-           weight = 6.500000;
+           weight = 6.5;
            description = "DBL uribl spam";
            name = "DBL_SPAM";
        }
        symbol {
-           weight = 6.500000;
+           weight = 6.5;
            description = "DBL uribl phishing";
            name = "DBL_PHISH";
        }
        symbol {
-           weight = 6.500000;
+           weight = 6.5;
            description = "DBL uribl malware";
            name = "DBL_MALWARE";
        }
        symbol {
-           weight = 5.500000;
+           weight = 5.5;
            description = "DBL uribl botnet C&C domain";
            name = "DBL_BOTNET";
        }
        symbol {
-           weight = 6.500000;
+           weight = 6.5;
            description = "DBL uribl abused legit spam";
            name = "DBL_ABUSE";
        }
        symbol {
-           weight = 1.500000;
+           weight = 1.5;
            description = "DBL uribl abused spammed redirector domain";
            name = "DBL_ABUSE_REDIR";
        }
        symbol {
-           weight = 7.500000;
+           weight = 7.5;
            description = "DBL uribl abused legit phish";
            name = "DBL_ABUSE_PHISH";
        }
        symbol {
-           weight = 7.500000;
+           weight = 7.5;
            description = "DBL uribl abused legit malware";
            name = "DBL_ABUSE_MALWARE";
        }
        symbol {
-           weight = 5.500000;
+           weight = 5.5;
            description = "DBL uribl abused legit botnet C&C";
            name = "DBL_ABUSE_BOTNET";
        }
@@ -955,11 +955,17 @@ metric {
            name = "URIBL_GREY";
        }
        symbol {
-           weight = 9.500000;
+           weight = 9.5;
            description = "rambler.ru emailbl";
            name = "RAMBLER_EMAILBL";
        }
-    }
+
+       symbol {
+           weight = 6.5;
+           description = "Spamhaus SBL dnsbl";
+           name = "URIBL_SBL";
+       }
+       }
 
     group {
        name = "phishing";

diff --git a/conf/modules.d/surbl.conf b/conf/modules.d/surbl.conf
index f52b50a7476d300a0de64c551ce5e74366755fe0..731c7fa6484422da6661d51cc29d6edc81e045e5 100644 (file)
--- a/conf/modules.d/surbl.conf
+++ b/conf/modules.d/surbl.conf
@@ -31,7 +31,7 @@ surbl {
     rule {
         suffix = "dbl.spamhaus.org";
         symbol = "DBL";
-        options = "noip";
+        no_ip = true;
         ips = {
             # spam domain
             DBL_SPAM = "127.0.1.2";
@@ -55,13 +55,21 @@ surbl {
             DBL_PROHIBIT = "127.0.1.255";
         }
     }
+    rule {
+        suffix = "zen.spamhaus.org";
+        symbol = "ZEN_URIBL";
+        resolve_ip = true;
+        ips {
+            URIBL_SBL = "127.0.0.2";
+        }
+    }
     rule {
         suffix = "uribl.spameatingmonkey.net";
         symbol = "SEM_URIBL_UNKNOWN";
         bits {
             SEM_URIBL = 2;
         }
-        options = "noip";
+        no_ip = true;
     }
     rule {
         suffix = "fresh15.spameatingmonkey.net";
@@ -69,7 +77,7 @@ surbl {
         bits {
             SEM_URIBL_FRESH15 = 2;
         }
-        options = "noip";
+        no_ip = true;
     }
 }
 
@@ -228,4 +236,4 @@ rbl {
         }
 
     }
-}
\ No newline at end of file
+}