Merge pull request #3 from analogic/master

Changing Spamhaus defaults to not assume errors as positives

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: [ push ]
+on: [ push, pull_request ]
 
 env:
   CI: true

Changes.md

@@ -1,3 +1,7 @@
+## 1.0.5 - 2022-08-29
+
+- fix #2 change Spamhaus defaults to not assume errors as positives
+- warn instead of debug when result do not validate
 
 ## 1.0.4 - 2022-07-23
 
@@ -7,6 +11,3 @@
 ## 1.0.3 - 2022-07-23
 
 - Import from Haraka
-
-
-[1.0.4]: https://github.com/haraka/haraka-plugin-uribl/releases/tag/1.0.4

config/uribl.ini

@@ -3,7 +3,8 @@
 [main]
 
 [dbl.spamhaus.org]
-validate=^(?!127\.0\.1\.255)127\.
+validate=^(?!127\.0\.1\.255|127\.255\.255\.)127\.
+; excluding errors, see https://www.spamhaus.org/faq/section/Spamhaus%20DBL#291
 rdns=1
 helo=1
 envfrom=1

index.js

@@ -247,7 +247,7 @@ exports.do_lookups = function (connection, next, hosts, type) {
       if (plugin.cfg[query[1]] && plugin.cfg[query[1]].validate) {
         const re = new RegExp(plugin.cfg[query[1]].validate);
         if (!re.test(addrs[0])) {
-          connection.logdebug(plugin, `ignoring result (${addrs[0]}) for: ${lookup} as it did not match validation rule`);
+          connection.logwarn(plugin, `ignoring result (${addrs[0]}) for: ${lookup} as it did not match validation rule`);
           skip = true;
         }
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "haraka-plugin-uribl",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Haraka plugin that checks domains in emails against URI blacklists",
   "main": "index.js",
   "scripts": {