haraka-plugin-spamassassin 1.0.3 → 1.1.0

package/CHANGELOG.md

@@ -4,6 +4,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ### Unreleased
 
+### [1.1.0] - 2026-05-17
+
+- changed: dep address-rfc2821 -> @haraka/email-address
+- changed: bumped all dep versions to latest
+
+### [1.0.4] - 2026-05-10
+
+- fix: cleanup message pipe if spamd errors
+- ci: updated configs
+- deps: bumped all versions to latest
+
 ### [1.0.3] - 2025-02-06
 
 - results: tidying up duplicate data
@@ -27,3 +38,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 [1.0.2]: https://github.com/haraka/haraka-plugin-spamassassin/releases/tag/v1.0.2
 [1.0.0]: https://github.com/haraka/haraka-plugin-spamassassin/releases/tag/1.0.0
 [1.0.3]: https://github.com/haraka/haraka-plugin-spamassassin/releases/tag/v1.0.3
+[1.0.4]: https://github.com/haraka/haraka-plugin-spamassassin/releases/tag/v1.0.4
+[1.1.0]: https://github.com/haraka/haraka-plugin-spamassassin/releases/tag/v1.1.0

package/index.js

@@ -137,11 +137,11 @@ exports.hook_data_post = function (next, connection) {
     this.log_results(connection, spamd_response)
 
     const exceeds_err = this.score_too_high(connection, spamd_response)
-    if (exceeds_err) return next(DENY, exceeds_err)
+    if (exceeds_err) return socket.nextOnce(DENY, exceeds_err)
 
     this.munge_subject(connection, spamd_response.score)
 
-    next()
+    socket.nextOnce()
   })
 }
 
@@ -245,7 +245,7 @@ exports.get_spamd_username = function (conn) {
   // Enable per-user SA prefs
   if (user === 'first-recipient') {
     // special cases
-    return conn.transaction.rcpt_to[0].address()
+    return conn.transaction.rcpt_to[0].address
   }
   if (user === 'all-recipients') {
     throw 'Unimplemented'
@@ -263,7 +263,7 @@ exports.get_spamd_headers = function (conn, username) {
     'HEADERS SPAMC/1.4',
     `User: ${username}`,
     '',
-    `X-Envelope-From: ${conn.transaction.mail_from.address()}`,
+    `X-Envelope-From: ${conn.transaction.mail_from.address}`,
     `X-Haraka-UUID: ${conn.transaction.uuid}`,
   ]
   if (conn.relaying) {
@@ -282,6 +282,19 @@ exports.get_spamd_socket = function (next, conn, headers) {
   net_utils.add_line_processor(socket)
   const results_timeout = parseInt(plugin.cfg.main.results_timeout) || 300
 
+  // Idempotent terminal handler; exposed on the socket so hook_data_post's
+  // 'end' handler shares the guard. unpipe() before destroy() — see
+  // haraka/message-stream#22.
+  let calledNext = false
+  socket.nextOnce = function (code, msg) {
+    if (txn?.message_stream) txn.message_stream.unpipe()
+    if (!socket.destroyed) socket.destroy()
+    if (calledNext) return
+    calledNext = true
+    if (code) return next(code, msg)
+    return next()
+  }
+
   socket.on('connect', function () {
     // Abort if the transaction is gone
     if (!txn) {
@@ -298,24 +311,23 @@ exports.get_spamd_socket = function (next, conn, headers) {
   })
 
   socket.on('error', (err) => {
-    socket.destroy()
     if (txn) txn.results.add(plugin, { err: `socket error: ${err.message}` })
-    if (plugin.cfg.defer.error) return next(DENYSOFT, 'spamd scan error')
-    return next()
+    if (plugin.cfg.defer.error)
+      return socket.nextOnce(DENYSOFT, 'spamd scan error')
+    return socket.nextOnce()
   })
 
   socket.on('timeout', function () {
-    socket.destroy()
     if (!this.is_connected) {
       if (txn) txn.results.add(plugin, { err: `socket connect timeout` })
       if (plugin.cfg.defer.connect_timeout)
-        return next(DENYSOFT, 'spamd connect timeout')
+        return socket.nextOnce(DENYSOFT, 'spamd connect timeout')
     } else {
       if (txn) txn.results.add(plugin, { err: `timeout waiting for results` })
       if (plugin.cfg.defer.scan_timeout)
-        return next(DENYSOFT, 'spamd scan timeout')
+        return socket.nextOnce(DENYSOFT, 'spamd scan timeout')
     }
-    return next()
+    return socket.nextOnce()
   })
 
   const connect_timeout = parseInt(plugin.cfg.main.connect_timeout) || 30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haraka-plugin-spamassassin",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "Haraka plugin that scans messages with SpamAssassin",
   "main": "index.js",
   "files": [
@@ -14,8 +14,10 @@
     "prettier": "npx prettier . --check",
     "prettier:fix": "npx prettier . --write --log-level=warn",
     "test": "node --test",
-    "versions": "npx dependency-version-checker check",
-    "versions:fix": "npx dependency-version-checker update"
+    "versions": "npx npm-dep-mgr check",
+    "versions:fix": "npx npm-dep-mgr update",
+    "test:coverage": "node --test --experimental-test-coverage --test-coverage-exclude=package.json --test-coverage-exclude=test/*.js",
+    "test:coverage:lcov": "mkdir -p coverage && node --test --experimental-test-coverage --test-reporter=lcov --test-reporter-destination=coverage/lcov.info test/*.js"
   },
   "repository": {
     "type": "git",
@@ -33,13 +35,13 @@
   },
   "homepage": "https://github.com/haraka/haraka-plugin-spamassassin#readme",
   "dependencies": {
-    "haraka-net-utils": "^1.7.2",
+    "haraka-net-utils": "^1.8.2",
     "haraka-utils": "^1.1.4"
   },
   "devDependencies": {
-    "@haraka/eslint-config": "^2.0.2",
-    "address-rfc2821": "^2.1.3",
-    "haraka-test-fixtures": "1.3.9"
+    "@haraka/eslint-config": "^2.0.4",
+    "@haraka/email-address": "^3.1.4",
+    "haraka-test-fixtures": "^1.6.0"
   },
   "prettier": {
     "singleQuote": true,