Merge pull request #4 from rspamd/master

Merge rspamd/rspamd into heraklit256/rspamd

5 files changed, 31 insertions, 14 deletions

diff --git a/conf/composites.conf b/conf/composites.conf
index a07b7020f..2b4c57072 100644
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -83,9 +83,18 @@ composites {
     }
     RCVD_UNAUTH_PBL {
         expression = "RECEIVED_PBL & -RCVD_VIA_SMTP_AUTH";
-        description = "Relayed through ZEN PBL IP without sufficient authentication";
+        description = "Relayed through ZEN PBL IP without sufficient authentication (possible indicating an open relay)";
         score = 2.0;
-        policy = "leave";
+    }
+    RCVD_DKIM_ARC_DNSWL_MED {
+        expression = "(R_DKIM_ALLOW | ARC_ALLOW ) & RCVD_IN_DNSWL_MED";
+        description = "Sufficiently DKIM/ARC signed and received from IP with medium trust at DNSWL";
+        score = -1.5;
+    }
+    RCVD_DKIM_ARC_DNSWL_HI {
+        expression = "(R_DKIM_ALLOW | ARC_ALLOW ) & RCVD_IN_DNSWL_HI";
+        description = "Sufficiently DKIM/ARC signed and received from IP with high trust at DNSWL";
+        score = -3.5;
     }
 
     .include(try=true; priority=1; duplicate=merge) "$LOCAL_CONFDIR/local.d/composites.conf"
diff --git a/conf/modules.d/phishing.conf b/conf/modules.d/phishing.conf
index dd77832a8..649793deb 100644
--- a/conf/modules.d/phishing.conf
+++ b/conf/modules.d/phishing.conf
@@ -21,7 +21,6 @@ phishing {
     openphish_map = "https://www.openphish.com/feed.txt";
     # Disabled by default
     phishtank_enabled = false;
-    phishtank_map = "https://maps.rspamd.com/phishtank/online-valid.json.zst";
 
     # Make exclusions for known redirectors
     redirector_domains = [
diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index f3373c2ae..bdd70a02f 100644
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -35,7 +35,7 @@ rbl {
             }
         }
 
-        spamhaus_xbl {
+        spamhaus_received {
             symbol = "RECEIVED_SPAMHAUS";
             rbl = "zen.spamhaus.org";
             ipv6 = true;
@@ -125,6 +125,12 @@ rbl {
                 RBL_VIRUSFREE_BOTNET = "127.0.0.2";
             }
         }
+
+	nixspam {
+            symbol = "RBL_NIXSPAM";
+            rbl = "ix.dnsbl.manitu.net";
+            ipv6 = true;
+        }
     }
 
     .include(try=true,priority=5) "${DBDIR}/dynamic/rbl.conf"
diff --git a/conf/modules.d/whitelist.conf b/conf/modules.d/whitelist.conf
index 96c9ed02e..0b19002c8 100644
--- a/conf/modules.d/whitelist.conf
+++ b/conf/modules.d/whitelist.conf
@@ -18,7 +18,6 @@ whitelist {
         "WHITELIST_SPF" = {
             valid_spf = true;
             domains = [
-                #"https://maps.rspamd.com/rspamd/spf_whitelist.inc.zst", # Missing now
                 "${DBDIR}/spf_whitelist.inc.local",
                 "fallback+file://${CONFDIR}/spf_whitelist.inc"
             ];
@@ -29,7 +28,6 @@ whitelist {
         "WHITELIST_DKIM" = {
             valid_dkim = true;
             domains = [
-                #"https://maps.rspamd.com/rspamd/dkim_whitelist.inc.zst", # Missing now
                 "${DBDIR}/dkim_whitelist.inc.local",
                 "fallback+file://${CONFDIR}/dkim_whitelist.inc"
             ];
diff --git a/conf/scores.d/rbl_group.conf b/conf/scores.d/rbl_group.conf
index 6c48cf3bb..96238adf9 100644
--- a/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@ -29,15 +29,15 @@ symbols = {
         description = "Sender listed at https://www.dnswl.org, no trust";
     }
     "RCVD_IN_DNSWL_LOW" {
-        weight = 0.0;
+        weight = -0.1;
         description = "Sender listed at https://www.dnswl.org, low trust";
     }
     "RCVD_IN_DNSWL_MED" {
-        weight = 0.0;
+        weight = -0.2;
         description = "Sender listed at https://www.dnswl.org, medium trust";
     }
     "RCVD_IN_DNSWL_HI" {
-        weight = 0.0;
+        weight = -0.5;
         description = "Sender listed at https://www.dnswl.org, high trust";
     }
 
@@ -67,7 +67,7 @@ symbols = {
     }
     "RBL_SPAMHAUS_DROP" {
         weight = 7.0;
-        description = "From address is listed in ZEN DROP bl";
+        description = "From address is listed in ZEN DROP BL";
     }
     "RECEIVED_SPAMHAUS_SBL" {
         weight = 1.0;
@@ -91,7 +91,7 @@ symbols = {
     }
     "RECEIVED_SPAMHAUS_DROP" {
         weight = 6.0;
-        description = "Received address is listed in ZEN DROP bl";
+        description = "Received address is listed in ZEN DROP BL";
         one_shot = true;
     }
 
@@ -142,16 +142,21 @@ symbols = {
 
     "RBL_SEM" {
         weight = 1.0;
-        description = "Address is listed in Spameatingmonkey RBL";
+        description = "From address is listed in Spameatingmonkey RBL";
     }
 
     "RBL_SEM_IPV6" {
         weight = 1.0;
-        description = "Address is listed in Spameatingmonkey RBL (ipv6)";
+        description = "From address is listed in Spameatingmonkey RBL (IPv6)";
     }
 
     "RBL_VIRUSFREE_BOTNET" {
         weight = 2.0;
-        description = "Source IP is listed in virusfree.cz BL";
+        description = "From address is listed in virusfree.cz BL";
+    }
+
+    "RBL_NIXSPAM" {
+        weight = 4.0;
+        description = "From address is listed in NiX Spam (http://www.dnsbl.manitu.net/)";
     }
 }