Haraka 3.1.0 → 3.1.2

package/outbound/tls.js

@@ -1,119 +1,126 @@
-'use strict';
+'use strict'
 
-const net          = require('node:net')
+const net = require('node:net')
 
-const config       = require('haraka-config');
-const hkredis      = require('haraka-plugin-redis');
+const config = require('haraka-config')
+const hkredis = require('haraka-plugin-redis')
 
-const logger       = require('../logger');
-const tls_socket   = require('../tls_socket');
+const logger = require('../logger')
+const tls_socket = require('../tls_socket')
 
 const inheritable_opts = [
-    'key', 'cert', 'ciphers', 'minVersion', 'dhparam',
-    'requestCert', 'honorCipherOrder', 'rejectUnauthorized',
-    'force_tls_hosts'
-];
+    'key',
+    'cert',
+    'ciphers',
+    'minVersion',
+    'dhparam',
+    'requestCert',
+    'honorCipherOrder',
+    'rejectUnauthorized',
+    'force_tls_hosts',
+]
 
 class OutboundTLS {
-    constructor () {
-        this.config = config;
-        this.name = 'OutboundTLS';
-        logger.add_log_methods(this);
+    constructor() {
+        this.config = config
+        this.name = 'OutboundTLS'
+        logger.add_log_methods(this)
     }
 
-    test_config (tls_config, our_config) {
-        tls_socket.config = tls_config;
-        this.config = our_config;
+    test_config(tls_config, our_config) {
+        tls_socket.config = tls_config
+        this.config = our_config
     }
 
-    load_config () {
-        const tls_cfg = tls_socket.load_tls_ini({role: 'client'});
-        const cfg = JSON.parse(JSON.stringify(tls_cfg.outbound || {}));
-        cfg.redis = tls_cfg.redis; // Don't clone - contains methods
+    load_config() {
+        const tls_cfg = tls_socket.load_tls_ini({ role: 'client' })
+        const cfg = JSON.parse(JSON.stringify(tls_cfg.outbound || {}))
+        cfg.redis = tls_cfg.redis // Don't clone - contains methods
 
         for (const opt of inheritable_opts) {
-            if (cfg[opt] !== undefined) continue;          // option set in [outbound]
-            if (tls_cfg.main[opt] === undefined) continue; // opt unset in tls.ini[main]
-            cfg[opt] = tls_cfg.main[opt];                  // use value from [main] section
+            if (cfg[opt] !== undefined) continue // option set in [outbound]
+            if (tls_cfg.main[opt] === undefined) continue // opt unset in tls.ini[main]
+            cfg[opt] = tls_cfg.main[opt] // use value from [main] section
         }
 
         if (cfg.key) {
             if (Array.isArray(cfg.key)) {
-                cfg.key = cfg.key[0];
+                cfg.key = cfg.key[0]
             }
-            cfg.key = this.config.get(cfg.key, 'binary');
+            cfg.key = this.config.get(cfg.key, 'binary')
         }
 
         if (cfg.dhparam) {
-            cfg.dhparam = this.config.get(cfg.dhparam, 'binary');
+            cfg.dhparam = this.config.get(cfg.dhparam, 'binary')
         }
 
         if (cfg.cert) {
             if (Array.isArray(cfg.cert)) {
-                cfg.cert = cfg.cert[0];
+                cfg.cert = cfg.cert[0]
             }
-            cfg.cert = this.config.get(cfg.cert, 'binary');
+            cfg.cert = this.config.get(cfg.cert, 'binary')
         }
 
-        if (!cfg.no_tls_hosts) cfg.no_tls_hosts = [];
-        if (!cfg.force_tls_hosts) cfg.force_tls_hosts = [];
+        if (!cfg.no_tls_hosts) cfg.no_tls_hosts = []
+        if (!cfg.force_tls_hosts) cfg.force_tls_hosts = []
 
-        this.cfg = cfg;
+        this.cfg = cfg
     }
 
-    init (cb) {
-        this.load_config();
+    init(cb) {
+        this.load_config()
         // changing this var in-flight won't work
-        if (this.cfg.redis && !this.cfg.redis.disable_for_failed_hosts) return cb();
-        logger.debug(this, 'Will disable outbound TLS for failing TLS hosts');
-        Object.assign(this, hkredis);
-        this.merge_redis_ini();
-        this.init_redis_plugin(cb);
+        if (this.cfg.redis && !this.cfg.redis.disable_for_failed_hosts) return cb()
+        logger.debug(this, 'Will disable outbound TLS for failing TLS hosts')
+        Object.assign(this, hkredis)
+        this.merge_redis_ini()
+        this.init_redis_plugin(cb)
     }
 
-    get_tls_options (mx) {
+    get_tls_options(mx) {
         // do NOT set servername to an IP address
         if (net.isIP(mx.exchange)) {
             // when mx.exchange looked up in DNS, from_dns has the hostname
             if (mx.from_dns) return { ...this.cfg, servername: mx.from_dns }
             return { ...this.cfg }
-        }
-        else {
+        } else {
             // mx.exchange is a hostname
             return { ...this.cfg, servername: mx.exchange }
         }
     }
 
     // Check for if host is prohibited from TLS negotiation
-    check_tls_nogo (host, cb_ok, cb_nogo) {
-        if (!this.cfg.redis.disable_for_failed_hosts) return cb_ok();
-
-        const dbkey = `no_tls|${host}`;
-        this.db.get(dbkey)
-            .then(dbr => {
-                dbr ? cb_nogo(dbr) : cb_ok();
+    check_tls_nogo(host, cb_ok, cb_nogo) {
+        if (!this.cfg.redis.disable_for_failed_hosts) return cb_ok()
+
+        const dbkey = `no_tls|${host}`
+        this.db
+            .get(dbkey)
+            .then((dbr) => {
+                dbr ? cb_nogo(dbr) : cb_ok()
             })
-            .catch(err => {
-                logger.debug(this, `Redis returned error: ${err}`);
-                cb_ok();
+            .catch((err) => {
+                logger.debug(this, `Redis returned error: ${err}`)
+                cb_ok()
             })
     }
 
-    mark_tls_nogo (host, cb) {
-        const dbkey = `no_tls|${host}`;
-        const expiry = this.cfg.redis.disable_expiry || 604800;
+    mark_tls_nogo(host, cb) {
+        const dbkey = `no_tls|${host}`
+        const expiry = this.cfg.redis.disable_expiry || 604800
 
-        if (!this.cfg.redis.disable_for_failed_hosts) return cb();
+        if (!this.cfg.redis.disable_for_failed_hosts) return cb()
 
-        logger.notice(this, `TLS connection failed. Marking ${host} as non-TLS for ${expiry} seconds`);
+        logger.notice(this, `TLS connection failed. Marking ${host} as non-TLS for ${expiry} seconds`)
 
-        this.db.setEx(dbkey, expiry, (new Date()).toISOString())
+        this.db
+            .setEx(dbkey, expiry, new Date().toISOString())
             .then(cb)
-            .catch(err => {
-                logger.error(this, `Redis returned error: ${err}`);
+            .catch((err) => {
+                logger.error(this, `Redis returned error: ${err}`)
             })
     }
 }
 
 // this is a singleton
-module.exports = new OutboundTLS();
+module.exports = new OutboundTLS()

package/outbound/todo.js

@@ -1,17 +1,17 @@
-'use strict';
+'use strict'
 
 // queue file header data
 class TODOItem {
-    constructor (domain, recipients, transaction) {
-        this.queue_time = Date.now();
-        this.domain = domain;
-        this.rcpt_to = recipients;
-        this.mail_from = transaction.mail_from;
-        this.message_stream = transaction.message_stream;
-        this.notes = transaction.notes;
-        this.uuid = transaction.uuid;
-        this.force_tls = false;
+    constructor(domain, recipients, transaction) {
+        this.queue_time = Date.now()
+        this.domain = domain
+        this.rcpt_to = recipients
+        this.mail_from = transaction.mail_from
+        this.message_stream = transaction.message_stream
+        this.notes = transaction.notes
+        this.uuid = transaction.uuid
+        this.force_tls = false
     }
 }
 
-module.exports = TODOItem;
+module.exports = TODOItem

package/package.json

@@ -9,7 +9,7 @@
     "server",
     "email"
   ],
-  "version": "3.1.0",
+  "version": "3.1.2",
   "homepage": "http://haraka.github.io",
   "repository": {
     "type": "git",
@@ -17,7 +17,7 @@
   },
   "main": "haraka.js",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "dependencies": {
     "address-rfc2821": "^2.1.3",
@@ -27,20 +27,20 @@
     "haraka-config": "^1.4.2",
     "haraka-constants": "^1.0.7",
     "haraka-dsn": "^1.1.0",
-    "haraka-email-message": "^1.2.5",
-    "haraka-message-stream": "^1.2.3",
+    "haraka-email-message": "^1.2.6",
+    "haraka-message-stream": "^1.3.2",
     "haraka-net-utils": "^1.7.2",
     "haraka-notes": "^1.1.1",
-    "haraka-plugin-redis": "^2.0.9",
-    "haraka-results": "^2.2.5",
-    "haraka-tld": "^1.2.3",
+    "haraka-plugin-redis": "^2.0.11",
+    "haraka-results": "^2.2.6",
+    "haraka-tld": "^1.2.4",
     "haraka-utils": "^1.1.4",
-    "ipaddr.js": "~2.2.0",
-    "node-gyp": "^11.1.0",
-    "nopt": "^8.1.0",
+    "ipaddr.js": "~2.3.0",
+    "node-gyp": "^12.1.0",
+    "nopt": "^9.0.0",
     "npid": "~0.4.0",
-    "redis": "~4.7.0",
-    "semver": "^7.7.1",
+    "redis": "~5.10.0",
+    "semver": "^7.7.3",
     "sockaddr": "^1.0.1",
     "sprintf-js": "~1.1.3"
   },
@@ -48,46 +48,45 @@
     "haraka-plugin-access": "^1.1.10",
     "haraka-plugin-aliases": "^1.0.3",
     "haraka-plugin-asn": "^2.0.5",
-    "haraka-plugin-attachment": "^1.1.4",
+    "haraka-plugin-attachment": "^1.1.5",
     "haraka-plugin-avg": "^1.1.0",
-    "haraka-plugin-bounce": "1.0.4",
-    "haraka-plugin-clamd": "1.0.2",
+    "haraka-plugin-bounce": "^2.1.1",
+    "haraka-plugin-clamd": "^1.0.2",
     "haraka-plugin-dcc": "^1.0.3",
     "haraka-plugin-dkim": "^1.0.11",
-    "haraka-plugin-dns-list": "^1.2.3",
+    "haraka-plugin-dns-list": "^1.2.4",
     "haraka-plugin-early_talker": "^1.0.2",
-    "haraka-plugin-elasticsearch": "^8.1.2",
+    "haraka-plugin-elasticsearch": "^8.1.5",
     "haraka-plugin-esets": "^1.0.1",
-    "haraka-plugin-fcrdns": "^1.1.1",
+    "haraka-plugin-fcrdns": "^1.1.2",
     "haraka-plugin-geoip": "^1.1.1",
     "haraka-plugin-graph": "^1.0.5",
     "haraka-plugin-greylist": "^1.0.1",
     "haraka-plugin-headers": "^1.0.6",
-    "haraka-plugin-helo.checks": "^1.0.3",
-    "haraka-plugin-karma": "^2.1.7",
-    "haraka-plugin-known-senders": "^1.1.2",
-    "haraka-plugin-limit": "^1.2.6",
-    "haraka-plugin-mail_from.is_resolvable": "^1.0.3",
+    "haraka-plugin-helo.checks": "^1.1.0",
+    "haraka-plugin-karma": "^2.1.8",
+    "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.2.5",
-    "haraka-plugin-recipient-routes": "^1.2.2",
+    "haraka-plugin-recipient-routes": "^1.3.1",
     "haraka-plugin-relay": "^1.0.1",
-    "haraka-plugin-rspamd": "^1.3.2",
+    "haraka-plugin-rspamd": "^1.4.2",
     "haraka-plugin-spamassassin": "^1.0.3",
-    "haraka-plugin-spf": "1.2.9",
+    "haraka-plugin-spf": "^1.2.10",
     "haraka-plugin-syslog": "^1.0.7",
     "haraka-plugin-uribl": "^1.0.10",
     "haraka-plugin-watch": "^2.0.8",
-    "@techteamer/ocsp": "^1.0.1",
-    "tmp": "~0.2.3"
+    "@techteamer/ocsp": "^1.0.1"
   },
   "devDependencies": {
-    "@haraka/eslint-config": "^2.0.2",
-    "haraka-test-fixtures": "^1.3.9",
-    "mocha": "^11.1.0",
+    "@haraka/eslint-config": "^2.0.3",
+    "haraka-test-fixtures": "^1.3.10",
+    "mocha": "^11.7.5",
     "mock-require": "^3.0.3",
-    "nodemailer": "^6.10.0"
+    "nodemailer": "^7.0.12"
   },
   "bugs": {
     "mail": "haraka.mail@gmail.com",
@@ -105,6 +104,12 @@
     "prettier:fix": "npx prettier . --write --log-level=warn",
     "test": "npx mocha --exit --timeout=4000 test test/outbound test/plugins/auth test/plugins/queue test/plugins",
     "versions": "npx dependency-version-checker check",
-    "versions:fix": "npx dependency-version-checker update"
+    "versions:fix": "npx dependency-version-checker update",
+    "format": "npm run prettier:fix && npm run lint:fix"
+  },
+  "prettier": {
+    "singleQuote": true,
+    "printWidth": 120,
+    "semi": false
   }
 }

package/plugins/.eslintrc.yaml

@@ -1,4 +1,3 @@
-
 globals:
   server: true
   NEXT_HOOK: true