dnsbl, dnswl, backscatterer -> dns-list

haraka · Apr 11, 2024 · e76f9a1 · e76f9a1
1 parent 9e03658
commit e76f9a1
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 618 deletions.
diff --git a/config/dnsbl.ini b/config/dnsbl.ini
diff --git a/config/plugins b/config/plugins
@@ -23,8 +23,8 @@
 # geoip
 # asn
 # fcrdns
-# block mails from known bad hosts (see config/dnsbl.zones for the DNS zones queried)
-dnsbl
+# block & allow lists (see config/dns-list.ini)
+dns-list
 
 # HELO
 #early_talker

diff --git a/docs/plugins/dnsbl.md → docs/deprecated/dnsbl.md b/docs/plugins/dnsbl.md → docs/deprecated/dnsbl.md
diff --git a/docs/plugins/dnswl.md → docs/deprecated/dnswl.md b/docs/plugins/dnswl.md → docs/deprecated/dnswl.md
diff --git a/package.json b/package.json
@@ -53,6 +53,7 @@
     "haraka-plugin-asn": "^2.0.2",
     "haraka-plugin-auth-ldap": "^1.1.0",
     "haraka-plugin-dcc": "^1.0.2",
+    "haraka-plugin-dns-list": "^1.1.0",
     "haraka-plugin-elasticsearch": "^8.0.2",
     "haraka-plugin-fcrdns": "^1.1.0",
     "haraka-plugin-graph": "^1.0.5",

diff --git a/plugins.js b/plugins.js
@@ -343,6 +343,7 @@ plugins.load_plugins = override => {
 }
 
 plugins.deprecated = {
+    'backscatterer'       : 'dns-list',
     'connect.asn'         : 'asn',
     'connect.fcrdns'      : 'fcrdns',
     'connect.geoip'       : 'geoip',
@@ -352,6 +353,9 @@ plugins.deprecated = {
     'data.noreceived'     : 'headers',
     'data.rfc5322_header_checks': 'headers',
     'data.headers'        : 'headers',
+    'data.uribl'          : 'uribl',
+    'dnsbl'               : 'dns-list',
+    'dnswl'               : 'dns-list',
     'log.syslog'          : 'syslog',
     'mail_from.access'    : 'access',
     'mail_from.blocklist' : 'access',

diff --git a/plugins/backscatterer.js b/plugins/backscatterer.js
diff --git a/plugins/data.uribl.js b/plugins/data.uribl.js
diff --git a/plugins/dnsbl.js b/plugins/dnsbl.js
diff --git a/plugins/dnswl.js b/plugins/dnswl.js