Haraka 3.0.4 → 3.0.5

package/.eslintrc.yaml

@@ -6,7 +6,6 @@ env:
 extends: ['@haraka']
 
 rules:
-  semi-style: [error, last]
   prefer-template: 'warn'
   no-unneeded-ternary: 1
   no-unused-vars: 0

package/CONTRIBUTORS.md

@@ -2,9 +2,9 @@
 
 This handcrafted artisinal 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">1619</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">37</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">1623</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">37</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">23</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/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/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/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/203240?v=4"><br><a href="https://github.com/lnedry">lnedry</a> (<a href="https://github.com/haraka/Haraka/commits?author=lnedry">25</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/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/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/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/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/11343494?v=4"><br><a href="https://github.com/superman20">superman20</a> (<a href="https://github.com/haraka/Haraka/commits?author=superman20">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/2176651?v=4"><br><a href="https://github.com/fatalbanana">fatalbanana</a> (<a href="https://github.com/haraka/Haraka/commits?author=fatalbanana">8</a>)|
 | <img height="80" src="https://avatars.githubusercontent.com/u/231081?v=4"><br><a href="https://github.com/EyePulp">EyePulp</a> (<a href="https://github.com/haraka/Haraka/commits?author=EyePulp">8</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/81561?v=4"><br><a href="https://github.com/Synchro">Synchro</a> (<a href="https://github.com/haraka/Haraka/commits?author=Synchro">8</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/3957811?v=4"><br><a href="https://github.com/gene-hightower">gene-hightower</a> (<a href="https://github.com/haraka/Haraka/commits?author=gene-hightower">7</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/103802?v=4"><br><a href="https://github.com/joshuathayer">joshuathayer</a> (<a href="https://github.com/haraka/Haraka/commits?author=joshuathayer">6</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/8224508?v=4"><br><a href="https://github.com/DarkSorrow">DarkSorrow</a> (<a href="https://github.com/haraka/Haraka/commits?author=DarkSorrow">6</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/1521113?v=4"><br><a href="https://github.com/hontas">hontas</a> (<a href="https://github.com/haraka/Haraka/commits?author=hontas">5</a>)| <img height="80" src="https://avatars.githubusercontent.com/u/1263856?v=4"><br><a href="https://github.com/ricardopolo">ricardopolo</a> (<a href="https://github.com/haraka/Haraka/commits?author=ricardopolo">5</a>)|
 

package/Changes.md

@@ -1,5 +1,37 @@
+# Changelog
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/).
+
 ### Unreleased
 
+### [3.0.5] - 2024-09-27
+
+#### Fixed
+
+- fix(q/lmtp): revert a refactoring error #3407
+- fix: install Plugins.md when haraka -i #3406
+- fix(haraka -h): add missing return for plugin list #3405
+- fix `no_tls_hosts` related docs & tests #3404
+- fix: install docs/Plugins.md when haraka -i installed
+- fix(changes): spelling correction #3397
+
+#### Changed
+
+- lint: remove deprecated semi-style rule
+- removed dependency on ldap plugins #3399
+- doc(tls.md): add note for no_tls_hosts for outbound
+- test(tls): add tests for no_tls_hosts for inbound & outbound
+- dep version bumps:
+  - haraka-email-message: 1.2.4, #3408
+  - nodemailer: 6.9.15
+  - nopt: 8.0.0
+  - tld: 1.2.2
+  - plugin-dkim: 1.0.7
+  - plugin-dns-list: 1.2.1
+  - plugin-elastisearch: 8.0.3
+  - test-fixtures: 1.3.8
+
+
 ### [3.0.4] - 2024-08-21
 
 #### Added
@@ -46,7 +78,7 @@
   - client_pool.get_client & release_client: arity of 5 -> 2
   - mx_lookup: make it async/await
   - mx_lookup: deleted. Logic moved into net_utils #3322
-  - use net_utils.HarkaMx for get_mx parsing #3344
+  - use net_utils.HarakaMx for get_mx parsing #3344
   - emit log message when ignoring local MX #3285
   - pass in config when initiating txn #3315
   - minor es6 updates #3315, #3322
@@ -1552,3 +1584,4 @@
 [3.0.2]: https://github.com/haraka/Haraka/releases/tag/v3.0.2
 [3.0.3]: https://github.com/haraka/Haraka/releases/tag/v3.0.3
 [3.0.4]: https://github.com/haraka/Haraka/releases/tag/3.0.4
+[3.0.5]: https://github.com/haraka/Haraka/releases/tag/v3.0.5

package/bin/haraka

@@ -228,7 +228,7 @@ const plugin_doc = [
 
 
 function getHooks () {   // see haraka/Haraka#3306
-    fs.readFileSync('docs/Plugins.md').toString()
+    return fs.readFileSync('docs/Plugins.md').toString()
         .split('## Available Hooks')[1]    // discard everything before this string
         .split('### rcpt')[0]              // discard everything after this string
         .match(/\*\s(\S+)/gm)              // grab the first word of lines starting with '* '
@@ -554,6 +554,7 @@ else if (parsed.install) {
     for (const d of ['plugins', 'docs', 'config']) {
         utils.mkDir(path.join(pa, d));
     }
+    utils.copyFile(path.join(base, 'docs', 'Plugins.md'), path.join(pa, 'docs', 'Plugins.md'));
     utils.createFile(path.join(pa, 'README'), readme, {}, parsed.force);
     utils.createFile(path.join(pa, 'package.json'), packageJson, {}, parsed.force);
     const bytes = require('crypto').randomBytes(32);

package/config/plugins

@@ -38,7 +38,6 @@
 # ----------
 # auth/flat_file
 # auth/auth_proxy
-# auth/auth_ldap
 
 # MAIL FROM
 # ----------
@@ -50,7 +49,6 @@ mail_from.is_resolvable
 # At least one rcpt_to plugin is REQUIRED for inbound email.
 rcpt_to.in_host_list
 # qmail-deliverable
-# rcpt_to.ldap
 # rcpt_to.routes
 
 # DATA

package/config/smtp.ini

@@ -22,6 +22,7 @@
 ;ignore_bad_plugins=0
 
 ; Run using cluster to fork multiple backend processes
+; Ref: https://github.com/haraka/Haraka/wiki/Performance-Tuning
 ;nodes=cpus
 
 ; Daemonize

package/config/tls.ini

@@ -77,5 +77,7 @@
 ; key=tls_key.pem
 ; cert=tls_cert.pem
 ; dhparam=dhparams.pem
+; no_tls_hosts[]=127.0.0.1
+; no_tls_hosts[]=192.168.1.1
 
 ; and other options from [main] section above

package/docs/plugins/tls.md

@@ -109,6 +109,14 @@ If needed, add this section to the `config/tls.ini` file and list any IP ranges
 172.16.0.0/16
 ```
 
+Note: `[no_tls_hosts]` section applies to inbound only. For outbound mail, this feature is implemented as an array like `force_tls_hosts`:
+
+```ini
+[outbound]
+no_tls_hosts[]=192.168.1.3
+no_tls_hosts[]=172.16.0.0/16
+```
+
 The [Node.js TLS](http://nodejs.org/api/tls.html) page has additional information about the following options.
 
 ### no_starttls_ports

package/http/html/index.html

@@ -9,10 +9,13 @@
 
         <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.5.1/css/bootstrap.min.css">
         <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.5.1/css/bootstrap-theme.min.css">
+
+        <script src="https://code.jquery.com/jquery-3.5.1.min.js" async></script>
+        <script src="https://stackpath.bootstrapcdn.com/bootstrap/3.5.1/js/bootstrap.min.js" async></script>
     </head>
     <body>
         <!--[if lt IE 7]>
-            <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
+            <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
 
         <ul id="tabList" class="nav nav-tabs" role="tablist navigation">
@@ -23,13 +26,11 @@
             <div class="tab-pane fade in active" id="home">
                 <h1>Haraka, a mail server (MTA).</h1>
 
-                <p>You are visiting an installation of <a href="http://haraka.github.io">Haraka</a>.</p>
+                <p>You are visiting an installation of <a href="https://haraka.github.io">Haraka</a>.</p>
 
-                <p>Haraka is on the <a href="http://haraka.github.io">web</a> and <a href="https://github.com/haraka/Haraka">GitHub</a></p>
+                <p>Haraka is on the <a href="https://haraka.github.io">web</a> and <a href="https://github.com/haraka/Haraka">GitHub</a></p>
             </div>
         </div>
 
-        <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
-        <script src="https://stackpath.bootstrapcdn.com/bootstrap/3.5.1/js/bootstrap.min.js"></script>
     </body>
 </html>

package/package.json

@@ -9,7 +9,7 @@
     "server",
     "email"
   ],
-  "version": "3.0.4",
+  "version": "3.0.5",
   "homepage": "http://haraka.github.io",
   "repository": {
     "type": "git",
@@ -27,17 +27,17 @@
     "haraka-config": "^1.4.0",
     "haraka-constants": "^1.0.7",
     "haraka-dsn": "^1.1.0",
-    "haraka-email-message": "^1.2.3",
+    "haraka-email-message": "^1.2.4",
     "haraka-message-stream": "^1.2.2",
     "haraka-net-utils": "^1.7.0",
     "haraka-notes": "^1.1.0",
     "haraka-plugin-redis": "^2.0.7",
     "haraka-results": "^2.2.4",
-    "haraka-tld": "^1.2.1",
+    "haraka-tld": "^1.2.2",
     "haraka-utils": "^1.1.3",
     "ipaddr.js": "~2.2.0",
     "node-gyp": "^10.2.0",
-    "nopt": "^7.2.1",
+    "nopt": "^8.0.0",
     "npid": "~0.4.0",
     "redis": "~4.7.0",
     "semver": "^7.6.3",
@@ -49,14 +49,13 @@
     "haraka-plugin-aliases": "^1.0.2",
     "haraka-plugin-asn": "^2.0.3",
     "haraka-plugin-attachment": "^1.1.2",
-    "haraka-plugin-auth-ldap": "^1.1.0",
     "haraka-plugin-avg": "^1.1.0",
     "haraka-plugin-bounce": "1.0.2",
     "haraka-plugin-clamd": "1.0.1",
     "haraka-plugin-dcc": "^1.0.2",
-    "haraka-plugin-dkim": "^1.0.4",
-    "haraka-plugin-dns-list": "^1.2.0",
-    "haraka-plugin-elasticsearch": "^8.0.2",
+    "haraka-plugin-dkim": "^1.0.7",
+    "haraka-plugin-dns-list": "^1.2.1",
+    "haraka-plugin-elasticsearch": "^8.0.3",
     "haraka-plugin-esets": "^1.0.0",
     "haraka-plugin-fcrdns": "^1.1.0",
     "haraka-plugin-geoip": "^1.1.0",
@@ -70,7 +69,6 @@
     "haraka-plugin-messagesniffer": "^1.0.0",
     "haraka-plugin-p0f": "^1.0.9",
     "haraka-plugin-qmail-deliverable": "^1.2.3",
-    "haraka-plugin-rcpt-ldap": "^1.1.0",
     "haraka-plugin-recipient-routes": "^1.2.0",
     "haraka-plugin-rspamd": "^1.3.1",
     "haraka-plugin-spamassassin": "^1.0.0",
@@ -83,10 +81,10 @@
   },
   "devDependencies": {
     "@haraka/eslint-config": "^1.1.5",
-    "haraka-test-fixtures": "^1.3.7",
+    "haraka-test-fixtures": "^1.3.8",
     "mocha": "^10.7.3",
     "mock-require": "^3.0.3",
-    "nodemailer": "^6.9.14"
+    "nodemailer": "^6.9.15"
   },
   "bugs": {
     "mail": "haraka.mail@gmail.com",
@@ -97,7 +95,7 @@
     "haraka_grep": "./bin/haraka_grep"
   },
   "scripts": {
-    "format": "npm run prettier:fix && npm run lint:fix",
+    "format:NYET": "npm run prettier:fix && npm run lint:fix",
     "lint": "npx eslint@^8 *.js outbound plugins plugins/*/*.js test test/*/*.js test/*/*/*.js bin/haraka",
     "lint:fix": "npx eslint@^8 --fix *.js outbound plugins plugins/*/*.js test test/*/*.js test/*/*/*.js bin/haraka",
     "prettier": "npx prettier . --check",

package/plugins/queue/lmtp.js

@@ -37,7 +37,9 @@ exports.hook_queue = (next, connection) => {
     const txn = connection?.transaction;
     if (!txn) return next();
 
-    if (txn.notes.get('queue.wants') !== 'lmtp') return next();
+    const q_wants = txn.notes.get('queue.wants');
+
+    if (q_wants && q_wants !== 'lmtp') return next();
 
     txn.notes.using_lmtp = true;
     outbound.send_trans_email(txn, next);

package/test/config/smtp.ini

@@ -2,6 +2,8 @@ listen=0.0.0.0:2500
 
 ignore_bad_plugins=0
 
+show_version=true
+
 nodes=0
 
 daemonize=false

package/test/config/tls.ini

@@ -26,8 +26,8 @@ no_starttls_ports[]=2525
 
 ; no_tls_hosts - disable TLS for servers with broken TLS.
 [no_tls_hosts]
-; 127.0.0.1
-; 192.168.1.1
+192.168.1.1
+172.16.0.0/16
 ; 172.16.0.0/16
 
 [outbound]
@@ -41,3 +41,5 @@ requestCert=false
 honorCipherOrder=false
 force_tls_hosts[]=first.example.com
 force_tls_hosts[]=second.example.net
+no_tls_hosts[]=127.0.0.2
+no_tls_hosts[]=192.168.31.1/24

package/test/connection.js

@@ -216,7 +216,7 @@ describe('connection', () => {
 
     })
 
-    describe('local_info', () => {
+    describe('local.info', () => {
         beforeEach(_set_up)
 
         it('is Haraka/version', () => {
@@ -299,4 +299,4 @@ describe('connection', () => {
             );
         })
     })
-})
+})

package/test/outbound/index.js

@@ -109,7 +109,7 @@ describe('outbound', () => {
                 requestCert: false,
                 honorCipherOrder: false,
                 redis: { disable_for_failed_hosts: false },
-                no_tls_hosts: [],
+                no_tls_hosts: ['127.0.0.2', '192.168.31.1/24'],
                 force_tls_hosts: ['first.example.com', 'second.example.net']
             })
         })

package/test/tls_socket.js

@@ -152,7 +152,10 @@ describe('tls_socket', () => {
                     no_starttls_ports: [2525],
                 },
                 redis: { disable_for_failed_hosts: false },
-                no_tls_hosts: {},
+                no_tls_hosts: {
+                    '192.168.1.1': undefined,
+                    '172.16.0.0/16': undefined,
+                },
                 mutual_auth_hosts: {},
                 mutual_auth_hosts_exclude: {},
                 outbound: {
@@ -165,6 +168,7 @@ describe('tls_socket', () => {
                     requestCert: false,
                     honorCipherOrder: false,
                     force_tls_hosts: ['first.example.com', 'second.example.net'],
+                    no_tls_hosts: ['127.0.0.2', '192.168.31.1/24'],
                 }
             })
         })

package/.prettierrc.yml

@@ -1 +0,0 @@
-singleQuote: true