diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 7d016d6ef..33a3500bd 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -8,9 +8,11 @@ assignees: '' --- **Describe the bug** + A clear and concise description of what the bug is. **Expected behavior** + A clear and concise description of what you expected to happen. **Observed behavior** @@ -24,4 +26,5 @@ Please report your OS, Node version, and Haraka version by running this shell sc echo "Haraka | $(haraka -v)"; echo " --- | :--- "; echo "Node | $(node -v)"; echo "OS | $(uname -a)"; echo "openssl | $(openssl version)" **Additional context** + Add any other context about the problem here. diff --git a/.gitignore b/.gitignore index 0874254ad..b6a2e6d07 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,3 @@ tests/queue/plain tests/queue/multibyte tests/test-queue package-lock.json -.release \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..a8e94cbc2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule ".release"] + path = .release + url = git@github.com:msimerson/.release.git diff --git a/.npmignore b/.npmignore index 10026de53..56cbb427d 100644 --- a/.npmignore +++ b/.npmignore @@ -9,3 +9,4 @@ http/node_modules appveyor.yml codecov.yml .codeclimate.yml +.release \ No newline at end of file diff --git a/.release b/.release new file mode 160000 index 000000000..0890e945e --- /dev/null +++ b/.release @@ -0,0 +1 @@ +Subproject commit 0890e945e4e061c96c7b2ab45017525904c17728 diff --git a/Changes.md b/Changes.md index 18aa115ce..6e7be7423 100644 --- a/Changes.md +++ b/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 diff --git a/bin/haraka b/bin/haraka index e655c2a0c..9acf6b076 100755 --- a/bin/haraka +++ b/bin/haraka @@ -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 () { diff --git a/package.json b/package.json index bb2db952b..1cf095e60 100644 --- a/package.json +++ b/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",