Merge pull request #70 from eneq123/master

DNSWL support (via RBL) added

2 files changed, 23 insertions, 2 deletions

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 3d23fe606..ba6669ff4 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -322,6 +322,12 @@ metric {
         description = "One received header with 'bad' patterns inside";
         name = "ONCE_RECEIVED_STRICT";
     }
+
+    symbol { name = "RCVD_IN_DNSWL"; weight = 0.0; description = "Sender listed at http://www.dnswl.org"; }
+    symbol { name = "RCVD_IN_DNSWL_LOW"; weight = -0.1; description = "Sender listed at http://www.dnswl.org, low trust"; }
+    symbol { name = "RCVD_IN_DNSWL_MED"; weight = -1.0; description = "Sender listed at http://www.dnswl.org, medium trust"; }
+    symbol { name = "RCVD_IN_DNSWL_HI"; weight = -5.0; description = "Sender listed at http://www.dnswl.org, high trust"; }
+
     symbol { name = "RBL_SPAMHAUS"; weight = 0.0; description = "From address is listed in zen"; }
     symbol { name = "RBL_SPAMHAUS_SBL"; weight = 2.0; description = "From address is listed in zen sbl"; }
     symbol { name = "RBL_SPAMHAUS_CSS"; weight = 2.0; description = "From address is listed in zen css"; }
diff --git a/conf/modules.conf b/conf/modules.conf
index 4ad8fc88c..e01575803 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -83,8 +83,7 @@ surbl {
     }
 }
 rbl {
-
-    rbls {
+ rbls {
 	
 	spamhaus {
 		symbol = "RBL_SPAMHAUS";
@@ -145,6 +144,21 @@ rbl {
             RBL_SEM = "127.0.0.2";
         }
     }
+
+    dnswl {
+        symbol = "RCVD_IN_DNSWL";
+        rbl = "list.dnswl.org";
+        ipv4 = true;
+        ipv6 = false;
+        received = false;
+        unknown = true;
+        returncodes {
+            RCVD_IN_DNSWL_LOW = "127.0.*.1";
+            RCVD_IN_DNSWL_MED = "127.0.*.2";
+            RCVD_IN_DNSWL_HI  = "127.0.*.3";
+        }
+    }
+
  }
 }
 
@@ -195,6 +209,7 @@ ratelimit {
     limit = "to_ip_from:20:0.01666666667";
     limit = "bounce_to:10:0.000555556";
     limit = "bounce_to_ip:5:0.000277778";
+    limit = "user:20:0.01666666667";
     whitelisted_rcpts = "postmaster,mailer-daemon";
     max_rcpt = 5;
 }