haraka-plugin-karma 2.1.7 → 2.1.8

package/CHANGELOG.md

@@ -4,6 +4,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ### Unreleased
 
+### [2.1.8] - 2025-10-27
+
+- fix: use optional chaining in should_we_skip, fixes #63
+- reduce ASN details saved to results store
+- config: update plugin names
+
 ### [2.1.7] - 2025-01-31
 
 - replace utils.in_array with [].includes
@@ -141,3 +147,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 [2.1.4]: https://github.com/haraka/haraka-plugin-karma/releases/tag/v2.1.4
 [2.1.5]: https://github.com/haraka/haraka-plugin-karma/releases/tag/v2.1.5
 [2.1.6]: https://github.com/haraka/haraka-plugin-karma/releases/tag/v2.1.6
+[2.1.7]: https://github.com/haraka/haraka-plugin-karma/releases/tag/v2.1.7
+[2.1.8]: https://github.com/haraka/haraka-plugin-karma/releases/tag/v2.1.8

package/config/karma.ini

@@ -57,7 +57,7 @@ hooks=unrecognized_command,data,data_post,queue,queue_outbound
 ; karma captures and scores deny requests from other plugins, permitting finer
 ; control over connection handling. For plugins that should be able to reject
 ; the connection, add their name to the plugin list:
-plugins=send_email, tls, access, helo.checks, data.headers, rspamd, spamassassin, clamd, attachment, limit
+plugins=send_email, tls, access, helo.checks, headers, rspamd, spamassassin, clamd, attachment, limit
 
 ; hooks whose DENY rejections should be not be captured.
 hooks=rcpt, queue, queue_outbound
@@ -227,16 +227,16 @@ early_talker                     = -3
 104 = access    | pass | equals | rcpt_to.access.whitelist    | 8
 
 ; Scores for specific DNSBLs
-111 = dnsbl       | fail | equals | b.barracudacentral.org  | -7 | DNS Blacklist | Disinfect your host/network
-112 = dnsbl       | fail | equals | truncate.gbudb.net      | -5 | DNS Blacklist | Disinfect your host/network
-113 = dnsbl       | fail | equals | psbl.surriel.com        | -6 | DNS Blacklist | Disinfect your host/network
-114 = dnsbl       | fail | equals | bl.spamcop.net          | -3 | DNS Blacklist | Disinfect your host/network
-115 = dnsbl       | fail | equals | dnsbl-1.uceprotect.net  | -3 | DNS Blacklist | Disinfect your host/network
-116 = dnsbl       | fail | equals | zen.spamhaus.org        | -5 | DNS Blacklist | Disinfect your host/network
-117 = dnsbl       | fail | equals | xbl.spamhaus.org        | -6 | DNS Blacklist | Disinfect your host/network
-118 = dnsbl       | fail | equals | cbl.abuseat.org         | -5 | DNS Blacklist | Disinfect your host/network
-119 = dnsbl       | fail | equals | dnsbl.justspam.org      | -1 | DNS Blacklist | Disinfect your host/network
-120 = dnsbl       | fail | equals | dnsbl.sorbs.net         | -2 | DNS Blacklist | Clean up DNSBL listing
+111 = dns-list    | fail | equals | b.barracudacentral.org  | -7 | DNS Blacklist | Disinfect your host/network
+112 = dns-list    | fail | equals | truncate.gbudb.net      | -5 | DNS Blacklist | Disinfect your host/network
+113 = dns-list    | fail | equals | psbl.surriel.com        | -6 | DNS Blacklist | Disinfect your host/network
+114 = dns-list    | fail | equals | bl.spamcop.net          | -3 | DNS Blacklist | Disinfect your host/network
+115 = dns-list    | fail | equals | dnsbl-1.uceprotect.net  | -3 | DNS Blacklist | Disinfect your host/network
+116 = dns-list    | fail | equals | zen.spamhaus.org        | -5 | DNS Blacklist | Disinfect your host/network
+117 = dns-list    | fail | equals | xbl.spamhaus.org        | -6 | DNS Blacklist | Disinfect your host/network
+118 = dns-list    | fail | equals | cbl.abuseat.org         | -5 | DNS Blacklist | Disinfect your host/network
+119 = dns-list    | fail | equals | dnsbl.justspam.org      | -1 | DNS Blacklist | Disinfect your host/network
+120 = dns-list    | fail | equals | dnsbl.sorbs.net         | -2 | DNS Blacklist | Clean up DNSBL listing
 
 130 = helo.checks | fail | match | valid_hostname | -1  | HELO host invalid      | Use valid HELO hostname
 131 = helo.checks | pass | match | forward_dns    |  1  | HELO host has forward DNS

package/index.js

@@ -394,7 +394,7 @@ exports.tarpit_delay_msa = function (connection, delay, k) {
   // Reduce delay for good ASN history
   let asn = connection.results.get('asn')
   if (!asn) asn = connection.results.get('geoip')
-  if (asn && asn.asn && k.neighbors > 0) {
+  if (asn && asn.asn && asn.asn_score > 0) {
     connection.logdebug(this, `${trg} neighbors: ${delay}`)
     delay = delay - 2
   }
@@ -409,8 +409,8 @@ exports.tarpit_delay_msa = function (connection, delay, k) {
 }
 
 exports.should_we_skip = function (connection) {
-  if (connection.remote.is_private) return true
-  if (connection.notes.disable_karma) return true
+  if (connection.remote?.is_private) return true
+  if (connection.notes?.disable_karma) return true
   return false
 }
 
@@ -980,7 +980,6 @@ exports.check_asn = function (connection, asnkey) {
   if (!this.db) return
 
   const report_as = { name: this.name }
-
   if (this.cfg.asn.report_as) report_as.name = this.cfg.asn.report_as
 
   this.db
@@ -994,30 +993,24 @@ exports.check_asn = function (connection, asnkey) {
 
       this.db.hIncrBy(asnkey, 'connections', 1)
       const asn_score = parseInt(res.good || 0) - (res.bad || 0)
-      const asn_results = {
-        asn_score,
-        asn_connections: res.connections,
-        asn_good: res.good,
-        asn_bad: res.bad,
-        emit: true,
-      }
 
       if (asn_score) {
+        connection.results.add(report_as, { asn_score: asn_score })
         if (asn_score < -5) {
-          asn_results.fail = 'asn:history'
+          connection.results.add(report_as, { fail: 'asn:history' })
         } else if (asn_score > 5) {
-          asn_results.pass = 'asn:history'
+          connection.results.add(report_as, { pass: 'asn:history' })
         }
       }
 
       if (parseInt(res.bad) > 5 && parseInt(res.good) === 0) {
-        asn_results.fail = 'asn:all_bad'
+        connection.results.add(report_as, { fail: 'asn:all_bad' })
       }
       if (parseInt(res.good) > 5 && parseInt(res.bad) === 0) {
-        asn_results.pass = 'asn:all_good'
+        connection.results.add(report_as, { pass: 'asn:all_good' })
       }
 
-      connection.results.add(report_as, asn_results)
+      connection.results.add(report_as, { emit: true })
     })
     .catch((err) => {
       connection.results.add(this, { err })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haraka-plugin-karma",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "A heuristics scoring and reputation engine for SMTP connections",
   "main": "index.js",
   "files": [