[Conf] Add DWL support in the default configuration

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index 27db68f71712c3316408ad917240f4f7a5c812c4..17d76aed9d57a1c2b08dee417f95ed09ddf7f138 100644 (file)
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -126,7 +126,7 @@ rbl {
             }
         }
 
-       nixspam {
+        nixspam {
             symbol = "RBL_NIXSPAM";
             rbl = "ix.dnsbl.manitu.net";
             ipv6 = true;
@@ -146,6 +146,23 @@ rbl {
             from = false;
             ignore_whitelists = true;
         }
+
+        dnswl_dwl {
+          symbol = "DWL_DNSWL";
+          rbl = "dwl.dnswl.org";
+          dkim = true;
+          dkim_domainonly = false;
+          dkim_match_from = true;
+          unknown = false;
+
+          returncodes {
+              DWL_DNSWL_NONE = "127.0.%d+.0";
+              DWL_DNSWL_LOW = "127.0.%d+.1";
+              DWL_DNSWL_MED = "127.0.%d+.2";
+              DWL_DNSWL_HI = "127.0.%d+.3";
+              DWL_DNSWL_BLOCKED = "127.0.0.255";
+          }
+        }
     }
 
     .include(try=true,priority=5) "${DBDIR}/dynamic/rbl.conf"

diff --git a/conf/scores.d/rbl_group.conf b/conf/scores.d/rbl_group.conf
index bc9bb6b0edea8c64af2eb8d1711cefc7721d9c8d..f40d94e7f9af52c6994d91769011d0486add05fe 100644 (file)
--- a/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@ -16,6 +16,7 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 symbols = {
+
     "DNSWL_BLOCKED" {
         weight = 0.0;
         description = "Resolver blocked due to excessive queries";
@@ -41,6 +42,31 @@ symbols = {
         description = "Sender listed at https://www.dnswl.org, high trust";
     }
 
+    "DNSWL_DWL_BLOCKED" {
+        weight = 0.0;
+        description = "Resolver blocked due to excessive queries (dwl)";
+    }
+    "DWL_DNSWL" {
+        weight = 0.0;
+        description = "Unrecognised result from https://www.dnswl.org (dwl)";
+    }
+    "DWL_DNSWL_NONE" {
+        weight = 0.0;
+        description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, no trust";
+    }
+    "DWL_DNSWL_LOW" {
+        weight = -1;
+        description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, low trust";
+    }
+    "DWL_DNSWL_MED" {
+        weight = -2;
+        description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, medium trust";
+    }
+    "DWL_DNSWL_HI" {
+        weight = -3.5;
+        description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, high trust";
+    }
+
     "RBL_SPAMHAUS" {
         weight = 0.0;
         description = "Unrecognised result from Spamhaus ZEN";