haraka-plugin-spamassassin 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -4,6 +4,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ### Unreleased
 
+### [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
+- results.hits: deleted, alias for score
+- results.status: deleted, alias for flag
+- results.flag: change from Yes/No to boolean
+
 ### [1.0.2] - 2025-01-26
 
 - prettier: move config into package.json
@@ -16,6 +29,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 - repackaged from haraka/Haraka
 
-[1.0.1]: https://github.com/haraka/haraka-plugin-spamassassin/releases/tag/v1.0.1
+[1.0.1]: https://github.com/haraka/haraka-plugin-spamassassin/releases/tag/1.0.1
 [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

package/README.md

@@ -178,7 +178,6 @@ Other headers options you might find interesting or useful are:
     add_header all DCC _DCCB_: _DCCR_
     add_header all Tests _TESTS_
 
-## USAGE
 
 <!-- leave these buried at the bottom of the document -->
 

package/index.js

@@ -82,11 +82,9 @@ exports.hook_data_post = function (next, connection) {
           /Spam: (True|False) ; (-?\d+\.\d) \/ (-?\d+\.\d)/,
         )
         if (matches) {
-          spamd_response.flag = matches[1]
+          spamd_response.flag = matches[1] === 'True'
           spamd_response.score = matches[2]
-          spamd_response.hits = matches[2] // backwards compat
           spamd_response.reqd = matches[3]
-          spamd_response.flag = spamd_response.flag === 'True' ? 'Yes' : 'No'
         }
       } else {
         state = 'headers'
@@ -131,7 +129,6 @@ exports.hook_data_post = function (next, connection) {
     txn.notes.spamassassin = spamd_response
     connection.results.add(this, {
       time: (Date.now() - start) / 1000,
-      hits: spamd_response.hits,
       flag: spamd_response.flag,
     })
 
@@ -140,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()
   })
 }
 
@@ -197,7 +194,7 @@ exports.munge_subject = function (conn, score) {
 }
 
 exports.do_header_updates = function (conn, spamd_response) {
-  if (spamd_response.flag === 'Yes') {
+  if (spamd_response.flag) {
     // X-Spam-Flag is added by SpamAssassin
     conn.transaction.remove_header('precedence')
     conn.transaction.add_header('Precedence', 'junk')
@@ -285,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) {
@@ -301,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
@@ -342,7 +351,7 @@ exports.log_results = function (conn, spamd_response) {
     : cfg.reject_threshold
 
   const human_text =
-    `status=${spamd_response.flag}` +
+    `status=${spamd_response.flag ? 'Yes' : 'No'}` +
     `, score=${spamd_response.score}` +
     `, required=${spamd_response.reqd}` +
     `, reject=${reject_threshold}` +
@@ -350,7 +359,6 @@ exports.log_results = function (conn, spamd_response) {
 
   conn.transaction.results.add(this, {
     human: human_text,
-    status: spamd_response.flag,
     score: parseFloat(spamd_response.score),
     required: parseFloat(spamd_response.reqd),
     reject: reject_threshold,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haraka-plugin-spamassassin",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Haraka plugin that scans messages with SpamAssassin",
   "main": "index.js",
   "files": [
@@ -14,8 +14,9 @@
     "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": "npx c8 --reporter=text --reporter=text-summary npm test"
   },
   "repository": {
     "type": "git",
@@ -33,13 +34,13 @@
   },
   "homepage": "https://github.com/haraka/haraka-plugin-spamassassin#readme",
   "dependencies": {
-    "haraka-net-utils": "^1.7.1",
-    "haraka-utils": "^1.1.3"
+    "haraka-net-utils": "^1.8.1",
+    "haraka-utils": "^1.1.4"
   },
   "devDependencies": {
-    "@haraka/eslint-config": "^2.0.2",
-    "address-rfc2821": "^2.1.2",
-    "haraka-test-fixtures": "1.3.8"
+    "@haraka/eslint-config": "^2.0.4",
+    "address-rfc2821": "^2.1.5",
+    "haraka-test-fixtures": "^1.4.3"
   },
   "prettier": {
     "singleQuote": true,