Haraka 3.0.0 → 3.0.1

package/Changes.md

@@ -1,6 +1,21 @@
 
 ### Unreleased
 
+
+### [3.0.1] - 2023-01-19
+
+#### Fixed
+
+- fix(bin/haraka): set server.cfg and pass to conn, fixes #3143
+- fix(bin/haraka): correct error messages for help options #3142
+- fix: dkim_verify fails to find record #3149
+
+#### Changed
+
+- plugins: Add haraka-plugin-outbound-logger to registry #3146
+- dep(pi-spf): bump version 1.1.3 to 1.2.0
+
+
 ### [3.0.0] - 2022-12-17
 
 #### Added
@@ -1329,3 +1344,4 @@
 
 
 [3.0.0]: https://github.com/haraka/Haraka/releases/tag/3.0.0
+[3.0.1]: https://github.com/haraka/Haraka/releases/tag/3.0.1

package/Plugins.md

@@ -69,6 +69,7 @@ Create a PR adding yours to this list.
 | [messagesniffer][url-msgsniff]    | Anti-spam via [MessageSniffer][url-ms] |
 | [milter][url-milter]              | milter support |
 | [mongodb][mongo-url]              | Queue emails to MongoDB |
+| [outbound-logger][url-outbound-logger] | JSON logging of outbound email traffic. Logs useful metadata about delivered/bounced emails |
 | [prevent_credential_leaks][url-creds]  | Prevent users from emailing their credentials |
 | [process_title][url-proctitle]    | Populate `ps` output with activity counters |
 | queue/[discard][url-qdisc]        | queues messages to /dev/null |
@@ -190,4 +191,5 @@ Create a PR adding yours to this list.
 [url-wildduck]: https://github.com/nodemailer/haraka-plugin-wildduck
 [url-xclient]: https://github.com/haraka/Haraka/blob/master/docs/plugins/xclient.md
 [mongo-url]: https://github.com/Helpmonks/haraka-plugin-mongodb
+[url-outbound-logger]: https://github.com/mr-karan/haraka-plugin-outbound-logger
 

package/bin/haraka

@@ -383,7 +383,7 @@ else if (parsed.qlist) {
 }
 else if (parsed.qstat) {
     if (!parsed.configs) {
-        fail("qlist option requires config path");
+        fail("qstat option requires config path");
     }
     process.env.HARAKA = parsed.configs;
     logger = require(path.join(base, "logger"));
@@ -435,7 +435,7 @@ else if (parsed.graceful) {
 }
 else if (parsed.qempty) {
     if (!parsed.configs) {
-        fail("qlist option requires config path");
+        fail("qempty option requires config path");
     }
     fail("qempty is unimplemented");
 }
@@ -476,7 +476,7 @@ else if (parsed.order) {
 }
 else if (parsed.test) {
     if (!parsed.configs) {
-        fail("order option requires config path");
+        fail("test option requires config path");
     }
     process.env.HARAKA = parsed.configs;
     try {
@@ -528,9 +528,10 @@ else if (parsed.test) {
         address () {
             return { port: 25, family: 'ipv4', address: '127.0.0.1' };
         },
+        cfg  : require('haraka-config').get('smtp.ini'),
         notes: new Notes(),
     }
-    const connection = Connection.createConnection(client, server);
+    const connection = Connection.createConnection(client, server, server.cfg);
     if (parsed['set-relay']) connection.relaying = true;
 
     const run_next_hook = function () {

package/dkim.js

@@ -302,7 +302,8 @@ class DKIMObject {
                 }
             }
             if (!res) return this.result('no key for signature', 'invalid');
-            for (const record of res) {
+            for (const recordSegments of res) {
+                const record = recordSegments.join('');
                 if (!record.includes('p=')) {
                     this.debug(`${this.identity}: ignoring TXT record: ${record}`);
                     continue;

package/package.json

@@ -9,7 +9,7 @@
     "server",
     "email"
   ],
-  "version": "3.0.0",
+  "version": "3.0.1",
   "homepage": "http://haraka.github.io",
   "repository": {
     "type": "git",
@@ -20,65 +20,65 @@
     "node": ">=16"
   },
   "dependencies": {
-    "address-rfc2821"       : "^2.0.1",
-    "address-rfc2822"       : "^2.1.0",
-    "async"                 : "^3.2.4",
-    "daemon"                : "~1.1.0",
-    "ipaddr.js"             : "~2.0.1",
-    "node-gyp"              : "^9.3.1",
-    "nopt"                  : "~7.0.0",
-    "npid"                  : "~0.4.0",
-    "semver"                : "~7.3.8",
-    "sprintf-js"            : "~1.1.2",
-    "haraka-config"         : "^1.1.0",
-    "haraka-constants"      : "^1.0.6",
-    "haraka-dsn"            : "^1.0.4",
-    "haraka-email-message"  : "^1.2.0",
-    "haraka-message-stream" : "^1.2.0",
-    "haraka-net-utils"      : "^1.5.0",
-    "haraka-notes"          : "^1.0.6",
+    "address-rfc2821": "^2.0.1",
+    "address-rfc2822": "^2.1.0",
+    "async": "^3.2.4",
+    "daemon": "~1.1.0",
+    "ipaddr.js": "~2.0.1",
+    "node-gyp": "^9.3.1",
+    "nopt": "~7.0.0",
+    "npid": "~0.4.0",
+    "semver": "~7.3.8",
+    "sprintf-js": "~1.1.2",
+    "haraka-config": "^1.1.0",
+    "haraka-constants": "^1.0.6",
+    "haraka-dsn": "^1.0.4",
+    "haraka-email-message": "^1.2.0",
+    "haraka-message-stream": "^1.2.0",
+    "haraka-net-utils": "^1.5.0",
+    "haraka-notes": "^1.0.6",
     "haraka-plugin-attachment": "^1.0.7",
-    "haraka-plugin-spf"     : "1.1.3",
-    "haraka-plugin-redis"   : "^2.0.5",
-    "haraka-results"        : "^2.2.2",
-    "haraka-tld"            : "^1.1.0",
-    "haraka-utils"          : "^1.0.3",
-    "openssl-wrapper"       : "^0.3.4",
-    "sockaddr"              : "^1.0.1"
+    "haraka-plugin-spf": "1.2.0",
+    "haraka-plugin-redis": "^2.0.5",
+    "haraka-results": "^2.2.2",
+    "haraka-tld": "^1.1.0",
+    "haraka-utils": "^1.0.3",
+    "openssl-wrapper": "^0.3.4",
+    "sockaddr": "^1.0.1"
   },
   "optionalDependencies": {
-    "haraka-plugin-access"  : "^1.1.5",
-    "haraka-plugin-aliases" : "^1.0.1",
-    "haraka-plugin-asn"     : "^2.0.1",
+    "haraka-plugin-access": "^1.1.5",
+    "haraka-plugin-aliases": "^1.0.1",
+    "haraka-plugin-asn": "^2.0.1",
     "haraka-plugin-auth-ldap": "^1.0.2",
-    "haraka-plugin-dcc"     : "^1.0.1",
-    "haraka-plugin-elasticsearch" : "^1.0.6",
-    "haraka-plugin-fcrdns"  : "^1.1.0",
-    "haraka-plugin-graph"   : "^1.0.5",
-    "haraka-plugin-geoip"   : "^1.0.17",
-    "haraka-plugin-headers" : "^1.0.3",
-    "haraka-plugin-karma"   : "^2.1.0",
-    "haraka-plugin-limit"   : "^1.1.0",
-    "haraka-plugin-p0f"     : "^1.0.9",
-    "haraka-plugin-qmail-deliverable" : "^1.1.1",
+    "haraka-plugin-dcc": "^1.0.1",
+    "haraka-plugin-elasticsearch": "^1.0.6",
+    "haraka-plugin-fcrdns": "^1.1.0",
+    "haraka-plugin-graph": "^1.0.5",
+    "haraka-plugin-geoip": "^1.0.17",
+    "haraka-plugin-headers": "^1.0.3",
+    "haraka-plugin-karma": "^2.1.0",
+    "haraka-plugin-limit": "^1.1.0",
+    "haraka-plugin-p0f": "^1.0.9",
+    "haraka-plugin-qmail-deliverable": "^1.1.1",
     "haraka-plugin-known-senders": "^1.0.8",
     "haraka-plugin-rcpt-ldap": "^1.0.0",
-    "haraka-plugin-recipient-routes" : "^1.0.4",
-    "haraka-plugin-rspamd"  : "^1.2.0",
-    "haraka-plugin-syslog"  : "^1.0.3",
-    "haraka-plugin-uribl"   : "^1.0.6",
-    "haraka-plugin-watch"   : "^2.0.2",
-    "ocsp"                  : "~1.2.0",
-    "redis"                 : "~4.5.1",
-    "tmp"                   : "~0.2.1"
+    "haraka-plugin-recipient-routes": "^1.0.4",
+    "haraka-plugin-rspamd": "^1.2.0",
+    "haraka-plugin-syslog": "^1.0.3",
+    "haraka-plugin-uribl": "^1.0.6",
+    "haraka-plugin-watch": "^2.0.2",
+    "ocsp": "~1.2.0",
+    "redis": "~4.5.1",
+    "tmp": "~0.2.1"
   },
   "devDependencies": {
-    "nodeunit-x"            : "^0.15.0",
-    "haraka-test-fixtures"  : "^1.2.1",
-    "mock-require"          : "^3.0.3",
-    "eslint"                : "^8.27.0",
-    "eslint-plugin-haraka"  : "^1.0.15",
-    "nodemailer"            : "^6.7.7"
+    "nodeunit-x": "^0.15.0",
+    "haraka-test-fixtures": "^1.2.1",
+    "mock-require": "^3.0.3",
+    "eslint": "^8.27.0",
+    "eslint-plugin-haraka": "^1.0.15",
+    "nodemailer": "^6.7.7"
   },
   "bugs": {
     "mail": "haraka.mail@gmail.com",

package/smtp_client.js

@@ -168,10 +168,10 @@ class SMTPClient extends events.EventEmitter {
                 // error is e.g. "Error: connect ECONNREFUSED"
                 const errMsg = `${client.uuid}: [${client.host}:${client.port}] SMTP connection ${msg} ${error}`;
 
+                /* eslint-disable no-fallthrough */
                 switch (client.state) {
                     case STATE.ACTIVE:
                         client.emit('error', errMsg);
-                    // eslint-disable no-fallthrough
                     case STATE.IDLE:
                     case STATE.RELEASED:
                         client.destroy();