Haraka 3.1.4 → 3.1.5

package/CONTRIBUTORS.md

@@ -2,7 +2,7 @@
 
 This handcrafted artisanal software is brought to you by:
 
-| <img height="80" src="https://avatars.githubusercontent.com/u/261635?v=4"><br><a href="https://github.com/msimerson">msimerson</a> (<a href="https://github.com/haraka/Haraka/commits?author=msimerson">1662</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/662371?v=4"><br><a href="https://github.com/baudehlo">baudehlo</a> (<a href="https://github.com/haraka/Haraka/commits?author=baudehlo">969</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/550490?v=4"><br><a href="https://github.com/smfreegard">smfreegard</a> (<a href="https://github.com/haraka/Haraka/commits?author=smfreegard">794</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/959600?v=4"><br><a href="https://github.com/godsflaw">godsflaw</a> (<a href="https://github.com/haraka/Haraka/commits?author=godsflaw">171</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/934254?v=4"><br><a href="https://github.com/analogic">analogic</a> (<a href="https://github.com/haraka/Haraka/commits?author=analogic">42</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/1674289?v=4"><br><a href="https://github.com/Dexus">Dexus</a> (<a href="https://github.com/haraka/Haraka/commits?author=Dexus">42</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/82041?v=4"><br><a href="https://github.com/gramakri">gramakri</a> (<a href="https://github.com/haraka/Haraka/commits?author=gramakri">40</a>)|
+| <img height="80" src="https://avatars.githubusercontent.com/u/261635?v=4"><br><a href="https://github.com/msimerson">msimerson</a> (<a href="https://github.com/haraka/Haraka/commits?author=msimerson">1666</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/662371?v=4"><br><a href="https://github.com/baudehlo">baudehlo</a> (<a href="https://github.com/haraka/Haraka/commits?author=baudehlo">969</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/550490?v=4"><br><a href="https://github.com/smfreegard">smfreegard</a> (<a href="https://github.com/haraka/Haraka/commits?author=smfreegard">794</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/959600?v=4"><br><a href="https://github.com/godsflaw">godsflaw</a> (<a href="https://github.com/haraka/Haraka/commits?author=godsflaw">171</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/934254?v=4"><br><a href="https://github.com/analogic">analogic</a> (<a href="https://github.com/haraka/Haraka/commits?author=analogic">42</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/1674289?v=4"><br><a href="https://github.com/Dexus">Dexus</a> (<a href="https://github.com/haraka/Haraka/commits?author=Dexus">42</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/82041?v=4"><br><a href="https://github.com/gramakri">gramakri</a> (<a href="https://github.com/haraka/Haraka/commits?author=gramakri">40</a>)|
 | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
 | <img height="80" src="https://avatars.githubusercontent.com/u/203240?v=4"><br><a href="https://github.com/lnedry">lnedry</a> (<a href="https://github.com/haraka/Haraka/commits?author=lnedry">27</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/748075?v=4"><br><a href="https://github.com/celesteking">celesteking</a> (<a href="https://github.com/haraka/Haraka/commits?author=celesteking">21</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/791972?v=4"><br><a href="https://github.com/lpatters">lpatters</a> (<a href="https://github.com/haraka/Haraka/commits?author=lpatters">20</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/366268?v=4"><br><a href="https://github.com/chazomaticus">chazomaticus</a> (<a href="https://github.com/haraka/Haraka/commits?author=chazomaticus">19</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/123708?v=4"><br><a href="https://github.com/arlolra">arlolra</a> (<a href="https://github.com/haraka/Haraka/commits?author=arlolra">16</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/271024?v=4"><br><a href="https://github.com/hayesgm">hayesgm</a> (<a href="https://github.com/haraka/Haraka/commits?author=hayesgm">16</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/1573133?v=4"><br><a href="https://github.com/gauravaror">gauravaror</a> (<a href="https://github.com/haraka/Haraka/commits?author=gauravaror">14</a>)|
 | <img height="80" src="https://avatars.githubusercontent.com/u/260607?v=4"><br><a href="https://github.com/typingArtist">typingArtist</a> (<a href="https://github.com/haraka/Haraka/commits?author=typingArtist">14</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/11343494?v=4"><br><a href="https://github.com/superman20">superman20</a> (<a href="https://github.com/haraka/Haraka/commits?author=superman20">13</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/158380?v=4"><br><a href="https://github.com/darkpixel">darkpixel</a> (<a href="https://github.com/haraka/Haraka/commits?author=darkpixel">12</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/9887966?v=4"><br><a href="https://github.com/KingNoosh">KingNoosh</a> (<a href="https://github.com/haraka/Haraka/commits?author=KingNoosh">11</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/5229495?v=4"><br><a href="https://github.com/tstonis">tstonis</a> (<a href="https://github.com/haraka/Haraka/commits?author=tstonis">10</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/1746394?v=4"><br><a href="https://github.com/wltsmrz">wltsmrz</a> (<a href="https://github.com/haraka/Haraka/commits?author=wltsmrz">9</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/218741413?v=4"><br><a href="https://github.com/SamuelGrave">SamuelGrave</a> (<a href="https://github.com/haraka/Haraka/commits?author=SamuelGrave">9</a>)|

package/Changes.md

@@ -4,6 +4,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ### Unreleased
 
+### [3.1.5] - 2026-04-02
+
+#### Changed
+
+- fix(smtp_forward): update AUTH to match WHATWG URL API #3546
+- fix(smtp_forward): queue hook now calls next() after delivery
+  — see haraka/message-stream#17
+- deps(all): bump versions to latest
+- test: refactor server, use smtp_client for all tests #3548
+- test runner is now node --test #3547
+- test(smtp_client, tls_socket, smtp_forward): 95% coverage #3546
+- ci: added explicit minimal permissions
+
 ### [3.1.4] - 2026-03-30
 
 #### Fixed
@@ -1797,3 +1810,4 @@ config files.
 [3.1.2]: https://github.com/haraka/Haraka/releases/tag/v3.1.2
 [3.1.3]: https://github.com/haraka/Haraka/releases/tag/v3.1.3
 [3.1.4]: https://github.com/haraka/Haraka/releases/tag/v3.1.4
+[3.1.5]: https://github.com/haraka/Haraka/releases/tag/v3.1.5

package/package.json

@@ -9,7 +9,7 @@
     "server",
     "email"
   ],
-  "version": "3.1.4",
+  "version": "3.1.5",
   "homepage": "http://haraka.github.io",
   "repository": {
     "type": "git",
@@ -26,13 +26,13 @@
     "haraka-config": "^1.5.0",
     "haraka-constants": "^1.0.7",
     "haraka-dsn": "^1.1.0",
-    "haraka-email-message": "^1.3.1",
-    "haraka-message-stream": "^2.0.0",
+    "haraka-email-message": "^1.3.2",
+    "haraka-message-stream": "^2.0.1",
     "haraka-net-utils": "^1.7.2",
     "haraka-notes": "^1.1.1",
     "haraka-plugin-redis": "^2.0.11",
     "haraka-results": "^2.3.0",
-    "haraka-tld": "^1.3.1",
+    "haraka-tld": "^1.3.3",
     "haraka-utils": "^1.1.4",
     "ipaddr.js": "~2.3.0",
     "node-gyp": "^12.2.0",
@@ -59,16 +59,16 @@
     "haraka-plugin-esets": "^1.0.1",
     "haraka-plugin-fcrdns": "^1.1.2",
     "haraka-plugin-geoip": "^1.1.2",
-    "haraka-plugin-greylist": "^1.1.0",
+    "haraka-plugin-greylist": "^1.1.1",
     "haraka-plugin-headers": "^1.1.0",
     "haraka-plugin-helo.checks": "^1.1.0",
-    "haraka-plugin-karma": "^2.1.8",
+    "haraka-plugin-karma": "^2.2.0",
     "haraka-plugin-known-senders": "^1.1.3",
     "haraka-plugin-limit": "^1.2.7",
     "haraka-plugin-mail_from.is_resolvable": "^1.1.0",
     "haraka-plugin-messagesniffer": "^1.0.1",
     "haraka-plugin-p0f": "^1.0.11",
-    "haraka-plugin-qmail-deliverable": "^1.3.2",
+    "haraka-plugin-qmail-deliverable": "^1.3.3",
     "haraka-plugin-recipient-routes": "^1.3.1",
     "haraka-plugin-relay": "^1.0.1",
     "haraka-plugin-rspamd": "^1.4.2",
@@ -82,9 +82,7 @@
   "devDependencies": {
     "@haraka/eslint-config": "^2.0.4",
     "haraka-test-fixtures": "^1.4.1",
-    "mocha": "^11.7.5",
-    "mock-require": "^3.0.3",
-    "nodemailer": "^8.0.4"
+    "mock-require": "^3.0.3"
   },
   "bugs": {
     "mail": "haraka.mail@gmail.com",

package/plugins/queue/smtp_forward.js

@@ -247,7 +247,7 @@ exports.queue_forward = function (next, connection) {
         )
 
         function get_rs() {
-            return connection?.transaction?.results ? connection.transaction.results : connection.results
+            return txn?.results ?? connection.results
         }
 
         function dead_sender() {
@@ -320,10 +320,10 @@ exports.get_mx_next_hop = (next_hop) => {
         exchange: dest.hostname,
     }
     if (dest.protocol === 'lmtp:') mx.using_lmtp = true
-    if (dest.auth) {
+    if (dest.username) {
         mx.auth_type = 'plain'
-        mx.auth_user = dest.auth.split(':')[0]
-        mx.auth_pass = dest.auth.split(':')[1]
+        mx.auth_user = dest.username
+        mx.auth_pass = dest.password
     }
     return mx
 }

package/run_tests

@@ -1,23 +1,11 @@
 #!/bin/sh
 
 # Files using node:test
-NODE_TEST_FILES="test/transaction.js test/connection.js test/outbound/*.js"
-
-# Mocha scans test/ but skips transaction.js, connection.js, and outbound/
-MOCHA_IGNORE="--ignore=test/transaction.js --ignore=test/connection.js"
-MOCHA_TESTS="test test/plugins/auth test/plugins/queue test/plugins"
+NODE_TEST_FILES="test/*.js test/outbound/*.js test/plugins/*.js test/plugins/auth/*.js test/plugins/queue/*.js"
 
 if [ -n "$1" ]; then
-    case "$1" in
-        test/transaction.js | test/connection.js | test/outbound/*)
-            node --test "$1"
-            ;;
-        *)
-            npx mocha --exit --timeout=4000 "$1"
-            ;;
-    esac
+    node --test "$1"
 else
     # default, run 'em all
-    node --test --test-concurrency=1 $NODE_TEST_FILES && \
-    npx mocha --exit --timeout=4000 $MOCHA_IGNORE $MOCHA_TESTS
+    node --test --test-concurrency=1 $NODE_TEST_FILES
 fi

package/smtp_client.js

@@ -216,8 +216,7 @@ class SMTPClient extends events.EventEmitter {
 
     release() {
         if (this.state === STATE.DESTROYED) return
-        logger.debug(`[smtp_client] ${this.uuid} releasing, state=${this.state}`)
-        ;[
+        const listeners = [
             'auth',
             'bad_code',
             'capabilities',
@@ -233,9 +232,11 @@ class SMTPClient extends events.EventEmitter {
             'rset',
             'server_protocol',
             'xclient',
-        ].forEach((l) => {
+        ]
+        logger.debug(`[smtp_client] ${this.uuid} releasing, state=${this.state}`)
+        for (const l of listeners) {
             this.removeAllListeners(l)
-        })
+        }
 
         if (this.connected) this.send_command('QUIT')
         this.destroy()
@@ -349,7 +350,7 @@ exports.get_client_plugin = (plugin, connection, c, callback) => {
         }
     }
 
-    const hostport = get_hostport(connection, connection.server, c)
+    const hostport = get_hostport(connection, c)
     const smtp_client = new SMTPClient(hostport)
     logger.info(`[smtp_client] uuid=${smtp_client.uuid} host=${hostport.host} port=${hostport.port} created`)
 
@@ -468,7 +469,8 @@ exports.get_client_plugin = (plugin, connection, c, callback) => {
     callback(null, smtp_client)
 }
 
-function get_hostport(connection, server, cfg) {
+function get_hostport(connection, cfg) {
+    const server = connection.server
     if (cfg.forwarding_host_pool) {
         if (!server.notes.host_pool) {
             connection.logwarn(`creating host_pool from ${cfg.forwarding_host_pool}`)

package/test/endpoint.js

@@ -1,3 +1,6 @@
+'use strict'
+
+const { describe, it, beforeEach, afterEach } = require('node:test')
 const assert = require('node:assert')
 
 const mock = require('mock-require')
@@ -39,7 +42,7 @@ describe('endpoint', () => {
     })
 
     describe('bind()', () => {
-        beforeEach((done) => {
+        beforeEach(() => {
             // Mock filesystem and log server + fs method calls
             const modes = (this.modes = {})
             const log = (this.log = [])
@@ -63,12 +66,10 @@ describe('endpoint', () => {
 
             mock('node:fs/promises', this.mockfs)
             this.endpoint = mock.reRequire('../endpoint')
-            done()
         })
 
-        afterEach((done) => {
+        afterEach(() => {
             mock.stop('node:fs/promises')
-            done()
         })
 
         it('IP socket', async () => {

package/test/host_pool.js

@@ -1,20 +1,20 @@
 'use strict'
 
-const assert = require('node:assert')
+const { describe, it } = require('node:test')
+const assert = require('node:assert/strict')
 
 const HostPool = require('../host_pool')
 
 describe('HostPool', () => {
-    it('get a host', (done) => {
+    it('get a host', () => {
         const pool = new HostPool('1.1.1.1:1111, 2.2.2.2:2222')
         const host = pool.get_host()
 
         assert.ok(/\d\.\d\.\d\.\d/.test(host.host), `'${host.host}' looks like a IP`)
         assert.ok(/\d\d\d\d/.test(host.port), `'${host.port}' looks like a port`)
-        done()
     })
 
-    it('uses all the list', (done) => {
+    it('uses all the list', () => {
         const pool = new HostPool('1.1.1.1:1111, 2.2.2.2:2222')
 
         const host1 = pool.get_host()
@@ -24,10 +24,9 @@ describe('HostPool', () => {
         assert.notEqual(host1.host, host2.host)
         assert.notEqual(host3.host, host2.host)
         assert.equal(host3.host, host1.host)
-        done()
     })
 
-    it('default port 25', (done) => {
+    it('default port 25', () => {
         const pool = new HostPool('1.1.1.1, 2.2.2.2')
 
         const host1 = pool.get_host()
@@ -35,11 +34,24 @@ describe('HostPool', () => {
 
         assert.equal(host1.port, 25, `is port 25: ${host1.port}`)
         assert.equal(host2.port, 25, `is port 25: ${host2.port}`)
-        done()
     })
 
-    it('dead host', (done) => {
-        const pool = new HostPool('1.1.1.1:1111, 2.2.2.2:2222')
+    it('dead host', () => {
+        const pool = new HostPool('1.1.1.1:1111, 2.2.2.2:2222', 0.001)
+        pool.get_socket = () => ({
+            pretendTimeout: () => {},
+            setTimeout(ms, cb) {
+                this.pretendTimeout = cb
+            },
+            listeners: {},
+            on(ev, cb) {
+                this.listeners[ev] = cb
+            },
+            connect(port, host, cb) {
+                cb()
+            }, // immediately "connects" to stop retry loop
+            destroy() {},
+        })
 
         pool.failed('1.1.1.1', '1111')
 
@@ -51,17 +63,30 @@ describe('HostPool', () => {
         assert.equal(host.host, '2.2.2.2', 'dead host is not returned')
         host = pool.get_host()
         assert.equal(host.host, '2.2.2.2', 'dead host is not returned')
-        done()
     })
 
     // if they're *all* dead, we return a host to try anyway, to keep from
     // accidentally DOS'ing ourselves if there's a transient but widespread
     // network outage
-    it("they're all dead", (done) => {
+    it("they're all dead", () => {
         let host1
         let host2
 
-        const pool = new HostPool('1.1.1.1:1111, 2.2.2.2:2222')
+        const pool = new HostPool('1.1.1.1:1111, 2.2.2.2:2222', 0.001)
+        pool.get_socket = () => ({
+            pretendTimeout: () => {},
+            setTimeout(ms, cb) {
+                this.pretendTimeout = cb
+            },
+            listeners: {},
+            on(ev, cb) {
+                this.listeners[ev] = cb
+            },
+            connect(port, host, cb) {
+                cb()
+            }, // immediately "connects" to stop retry loop
+            destroy() {},
+        })
 
         host1 = pool.get_host()
 
@@ -79,13 +104,12 @@ describe('HostPool', () => {
         host2 = pool.get_host()
         assert.ok(host2, "if they're all dead, try one anyway")
         assert.notEqual(host1.host, host2.host, 'rotation continues')
-        done()
     })
 
     // after .01 secs the timer to retry the dead host will fire, and then
     // we connect using this mock socket, whose "connect" always succeeds
     // so the code brings the dead host back to life
-    it('host dead checking timer', (done) => {
+    it('host dead checking timer', async () => {
         let num_reqs = 0
         const MockSocket = function MockSocket(pool) {
             // these are the methods called from probe_dead_host
@@ -141,22 +165,24 @@ describe('HostPool', () => {
 
         // probe_dead_host() will hit two failures and one success (based on
         // num_reqs above). So we wait at least 10s for that to happen:
-        const timer = setTimeout(() => {
-            clearInterval(interval)
-            assert.ok(false, 'probe_dead_host failed')
-            done()
-        }, 10 * 1000)
-
-        const interval = setInterval(
-            () => {
-                if (!pool.dead_hosts['1.1.1.1:1111']) {
-                    clearTimeout(timer)
-                    clearInterval(interval)
-                    assert.ok(true, 'timer un-deaded it')
-                    done()
-                }
-            },
-            retry_secs * 1000 * 3,
-        )
+        await new Promise((resolve, reject) => {
+            const timer = setTimeout(() => {
+                clearInterval(interval)
+                reject(new Error('probe_dead_host failed'))
+            }, 10 * 1000)
+
+            const interval = setInterval(
+                () => {
+                    if (!pool.dead_hosts['1.1.1.1:1111']) {
+                        clearTimeout(timer)
+                        clearInterval(interval)
+                        resolve()
+                    }
+                },
+                retry_secs * 1000 * 3,
+            )
+        })
+
+        assert.ok(true, 'timer un-deaded it')
     })
 })

package/test/logger.js

@@ -1,9 +1,11 @@
-const assert = require('node:assert')
+'use strict'
+
+const { describe, it, beforeEach } = require('node:test')
+const assert = require('node:assert/strict')
 const util = require('node:util')
 
-const _set_up = (done) => {
+const _set_up = () => {
     this.logger = require('../logger')
-    done()
 }
 
 describe('logger', () => {
@@ -16,55 +18,23 @@ describe('logger', () => {
     })
 
     describe('log', () => {
-        it('log', () => {
-            this.logger.deferred_logs = []
-            assert.equal(0, this.logger.deferred_logs.length)
-            assert.ok(this.logger.log('WARN', 'test warning'))
-            assert.equal(1, this.logger.deferred_logs.length)
-        })
-
-        it('log, w/deferred', () => {
-            this.logger.plugins = { plugin_list: true }
-            this.logger.deferred_logs.push({
-                level: 'INFO',
-                data: 'log test info',
+        const formats = ['DEFAULT', 'LOGFMT', 'JSON']
+
+        for (const fmt of formats) {
+            it(`log in ${fmt} format`, () => {
+                this.logger.deferred_logs = []
+                this.logger.format = this.logger.formats[fmt]
+                assert.ok(this.logger.log('WARN', 'test warning'))
+                assert.equal(this.logger.deferred_logs.length, 1)
             })
-            assert.ok(this.logger.log('INFO', 'another test info'))
-        })
 
-        it('log in logfmt', () => {
-            this.logger.deferred_logs = []
-            this.logger.format = this.logger.formats.LOGFMT
-            assert.equal(0, this.logger.deferred_logs.length)
-            assert.ok(this.logger.log('WARN', 'test warning'))
-            assert.equal(1, this.logger.deferred_logs.length)
-        })
-
-        it('log in logfmt w/deferred', () => {
-            this.logger.plugins = { plugin_list: true }
-            this.logger.deferred_logs.push({
-                level: 'INFO',
-                data: 'log test info',
+            it(`log in ${fmt} format w/deferred`, () => {
+                this.logger.format = this.logger.formats[fmt]
+                this.logger.plugins = { plugin_list: true }
+                this.logger.deferred_logs.push({ level: 'INFO', data: 'log test info' })
+                assert.ok(this.logger.log('INFO', 'another test info'))
             })
-            assert.ok(this.logger.log('INFO', 'another test info'))
-        })
-
-        it('log in json', () => {
-            this.logger.deferred_logs = []
-            this.logger.format = this.logger.formats.JSON
-            assert.equal(0, this.logger.deferred_logs.length)
-            assert.ok(this.logger.log('WARN', 'test warning'))
-            assert.equal(1, this.logger.deferred_logs.length)
-        })
-
-        it('log in json w/deferred', () => {
-            this.logger.plugins = { plugin_list: true }
-            this.logger.deferred_logs.push({
-                level: 'INFO',
-                data: 'log test info',
-            })
-            assert.ok(this.logger.log('INFO', 'another test info'))
-        })
+        }
     })
 
     describe('level', () => {
@@ -75,68 +45,40 @@ describe('logger', () => {
     })
 
     describe('set_format', () => {
-        it('set format to DEFAULT', () => {
-            this.logger.format = ''
-            this.logger.set_format('DEFAULT')
-            assert.equal(this.logger.format, this.logger.formats.DEFAULT)
-        })
-
-        it('set format to LOGFMT', () => {
-            this.logger.format = ''
-            this.logger.set_format('LOGFMT')
-            assert.equal(this.logger.format, this.logger.formats.LOGFMT)
-        })
-
-        it('set format to JSON', () => {
-            this.logger.format = ''
-            this.logger.set_format('JSON')
-            assert.equal(this.logger.format, this.logger.formats.JSON)
-        })
-
-        it('set format to DEFAULT if empty', () => {
-            this.logger.format = ''
-            this.logger.set_format('')
-            assert.equal(this.logger.format, this.logger.formats.DEFAULT)
-        })
-
-        it('set format to DEFAULT if lowercase', () => {
-            this.logger.format = ''
-            this.logger.set_format('default')
-            assert.equal(this.logger.format, this.logger.formats.DEFAULT)
-        })
-
-        it('set format to DEFAULT if invalid', () => {
-            this.logger.format = ''
-            this.logger.set_format('invalid')
-            assert.equal(this.logger.format, this.logger.formats.DEFAULT)
-        })
+        // [input, expected format key]
+        const cases = [
+            ['DEFAULT', 'DEFAULT'],
+            ['LOGFMT', 'LOGFMT'],
+            ['JSON', 'JSON'],
+            ['', 'DEFAULT'], // empty → DEFAULT
+            ['default', 'DEFAULT'], // case-insensitive → DEFAULT
+            ['invalid', 'DEFAULT'], // unknown → DEFAULT
+        ]
+        for (const [input, expectedKey] of cases) {
+            it(`set_format(${JSON.stringify(input)}) → ${expectedKey}`, () => {
+                this.logger.format = ''
+                this.logger.set_format(input)
+                assert.equal(this.logger.format, this.logger.formats[expectedKey])
+            })
+        }
     })
 
     describe('set_loglevel', () => {
-        it('set loglevel to LOGINFO', () => {
-            this.logger.set_loglevel('LOGINFO')
-            assert.equal(this.logger.loglevel, this.logger.levels.LOGINFO)
-        })
-
-        it('set loglevel to INFO', () => {
-            this.logger.set_loglevel('INFO')
-            assert.equal(this.logger.loglevel, this.logger.levels.INFO)
-        })
-
-        it('set loglevel to EMERG', () => {
-            this.logger.set_loglevel('emerg')
-            assert.equal(this.logger.loglevel, this.logger.levels.EMERG)
-        })
-
-        it('set loglevel to 6', () => {
-            this.logger.set_loglevel(6)
-            assert.equal(this.logger.loglevel, 6)
-        })
-
-        it('set loglevel to WARN if invalid', () => {
-            this.logger.set_loglevel('invalid')
-            assert.equal(this.logger.loglevel, this.logger.levels.WARN)
-        })
+        // [input, expected level key or null for numeric assertion]
+        const cases = [
+            ['LOGINFO', 'LOGINFO'],
+            ['INFO', 'INFO'],
+            ['emerg', 'EMERG'], // case-insensitive
+            [6, null], // numeric passthrough
+            ['invalid', 'WARN'], // unknown → WARN
+        ]
+        for (const [input, expectedKey] of cases) {
+            it(`set_loglevel(${JSON.stringify(input)}) → ${expectedKey ?? input}`, () => {
+                this.logger.set_loglevel(input)
+                const expected = expectedKey ? this.logger.levels[expectedKey] : input
+                assert.equal(this.logger.loglevel, expected)
+            })
+        }
     })
 
     describe('set_timestamps', () => {
@@ -219,40 +161,38 @@ describe('logger', () => {
     })
 
     describe('log_if_level', () => {
-        it('log_if_level is a function', () => {
-            assert.ok('function' === typeof this.logger.log_if_level)
+        it('is a function', () => {
+            assert.equal(typeof this.logger.log_if_level, 'function')
         })
 
-        it('log_if_level test log entry', () => {
+        it('returns a logging function', () => {
             this.logger.loglevel = 9
             const f = this.logger.log_if_level('INFO', 'LOGINFO')
-            assert.ok(f)
-            assert.ok('function' === typeof f)
-            assert.ok(f('test info message'))
-            assert.equal(1, this.logger.deferred_logs.length)
-            // console.log(this.logger.deferred_logs[0]);
-            assert.equal('INFO', this.logger.deferred_logs[0].level)
-        })
-
-        it('log_if_level null case', () => {
-            this.logger.loglevel = 9
-            const f = this.logger.log_if_level('INFO', 'LOGINFO')
-            assert.ok(f(null))
-            assert.equal(2, this.logger.deferred_logs.length)
-        })
-
-        it('log_if_level false', () => {
-            this.logger.loglevel = 9
-            const f = this.logger.log_if_level('INFO', 'LOGINFO')
-            assert.ok(f(false))
-            assert.equal(3, this.logger.deferred_logs.length)
-        })
+            assert.equal(typeof f, 'function')
+        })
+
+        // Each of these runs independently with a fresh deferred_logs
+        for (const [label, msg] of [
+            ['string', 'test info message'],
+            ['null', null],
+            ['false', false],
+            ['0 (falsy number)', 0],
+        ]) {
+            it(`logs ${label} value and appends to deferred_logs`, () => {
+                this.logger.loglevel = 9
+                this.logger.deferred_logs = []
+                const f = this.logger.log_if_level('INFO', 'LOGINFO')
+                assert.ok(f(msg))
+                assert.equal(this.logger.deferred_logs.length, 1)
+            })
+        }
 
-        it('log_if_level 0', () => {
+        it('records correct level in deferred log entry', () => {
             this.logger.loglevel = 9
+            this.logger.deferred_logs = []
             const f = this.logger.log_if_level('INFO', 'LOGINFO')
-            assert.ok(f(0))
-            assert.equal(4, this.logger.deferred_logs.length)
+            f('test info message')
+            assert.equal(this.logger.deferred_logs[0].level, 'INFO')
         })
     })