Merge branch 'master' into dependabot/npm_and_yarn/redis-4.6.7

Changes.md

@@ -1,6 +1,8 @@
 
 ### Unreleased
 
+- dep(plugin-spf): bump version to 1.2.1
+- feat(rabbitmq_amqplib): configurable optional queue arguments
 
 ### [3.0.2] - 2023-06-12
 

Plugins.md

@@ -3,7 +3,7 @@
 To create your own plugin, see:
 - the [plugin template][template] that includes all the boilerplate
 - the [Write a Plugin][write-plugin] tutorial
-- the [Plugins](plugins-doc) section of [the manual](https://haraka.github.io)
+- the [Plugins][plugins-doc] section of [the manual](https://haraka.github.io)
 
 ## Installing NPM packaged plugins
 
@@ -109,7 +109,7 @@ Create a PR adding yours to this list.
 
 [template]: https://github.com/haraka/haraka-plugin-template
 [write-plugin]: https://github.com/haraka/Haraka/wiki/Write-a-Plugin
-[plugins-doc]: https://haraka.github.io/manual/Plugins.html
+[plugins-doc]: https://haraka.github.io/core/Plugins
 [url-access]: https://github.com/haraka/haraka-plugin-access
 [url-acc-files]: https://github.com/acharkizakaria/haraka-plugin-accounting-files/blob/master/README.md
 [url-action-mailbox]: https://guides.rubyonrails.org/action_mailbox_basics.html

README.md

@@ -140,10 +140,10 @@ SpamAssassin and a hacker on [Qpsmtpd][13].
 [6]: https://github.com/haraka/Haraka/blob/master/docs/plugins/dkim_sign.md
 [7]: https://en.wikipedia.org/wiki/Mail_delivery_agent
 [8]: mailto:[email protected]
-[9]: https://haraka.github.io/manual/plugins/spamassassin.html
-[10]: https://haraka.github.io/manual/plugins/helo.checks.html
-[11]: https://haraka.github.io/manual/plugins/dnsbl.html
-[12]: https://github.com/haraka/Haraka/tree/master/plugins
+[9]:  https://haraka.github.io/plugins/spamassassin
+[10]: https://haraka.github.io/plugins/helo.checks
+[11]: https://haraka.github.io/plugins/dnsbl
+[12]: https://github.com/haraka/Haraka/blob/master/Plugins.md
 [13]: https://github.com/smtpd/qpsmtpd/
 [15]: https://github.com/haraka/Haraka/issues
 [16]: https://github.com/haraka/Haraka/blob/master/LICENSE

config/access.domains

@@ -10,4 +10,4 @@
 # aol.com
 # [email protected]
 #
-# See full docs for details:  http://haraka.github.io/manual/plugins/access.html
+# See full docs for details:  http://haraka.github.io/plugins/access

config/rabbitmq_amqplib.ini

@@ -9,4 +9,11 @@ queueName = emails
 deliveryMode = 2
 confirm = true
 durable = true
-autoDelete = false
+autoDelete = false
+
+; Optional queue arguments
+; [queue_args]
+; x-dead-letter-exchange =
+; x-dead-letter-routing-key = emails_dlq
+; x-overflow = reject-publish
+; x-queue-type = quorum

docs/Connection.md

@@ -63,5 +63,5 @@ For low level use.  This value is set when the remote host drops the connection.
 
 * connection.results
 
-Store results of processing in a structured format. See [docs/Results](http://haraka.github.io/manual/Results.html)
+Store results of processing in a structured format. See [haraka-results](https://github.com/haraka/haraka-results)
 

docs/Outbound.md

@@ -38,9 +38,9 @@ of CPUs that you have.
 
 Default: true. Switch to false to disable TLS for outbound mail.
 
-This uses the same `tls_key.pem` and `tls_cert.pem` files that the `tls`
-plugin uses, along with other values in `tls.ini`. See the [tls plugin
-docs](http://haraka.github.io/manual/plugins/tls.html) for information on generating those files.
+This uses the same `tls_key.pem` and `tls_cert.pem` files that the `TLS`
+plugin uses, along with other values in `tls.ini`. See the [TLS plugin
+docs](http://haraka.github.io/plugins/tls) for information on generating those files.
 
 Within `tls.ini` you can specify global options for the values `ciphers`, `minVersion`, `requestCert` and `rejectUnauthorized`, alternatively you can provide separate values by putting them under a key: `[outbound]`, such as:
 

docs/Transaction.md

@@ -160,6 +160,6 @@ body in the same encoding.
 
 * transaction.results
 
-Store results of processing in a structured format. See [docs/Results](http://haraka.github.io/manual/Results.html)
+Store results of processing in a structured format. See [haraka-results](https://github.com/haraka/haraka-results)
 
 [1]: `Address` objects are address-rfc2821 objects. See https://github.com/haraka/node-address-rfc2821

docs/plugins/connect.rdns_access.md

@@ -1,6 +1,6 @@
 ## DEPRECATION NOTICE
 
-See the [access](http://haraka.github.io/manual/plugins/access.html) plugin
+See [haraka-plugin-access](https://github.com/haraka/haraka-plugin-access)
 for upgrade instructions.
 
 

docs/plugins/mail_from.access.md

@@ -1,6 +1,6 @@
 ## DEPRECATION NOTICE
 
-See the [access](http://haraka.github.io/manual/plugins/access.html) plugin
+See [haraka-plugin-access](https://github.com/haraka/haraka-plugin-access)
 for upgrade instructions.
 
 

docs/plugins/queue/rabbitmq_amqplib.md

@@ -36,5 +36,12 @@ Configuration
 		durable = true
 		autoDelete = false
 
+        ; Optional queue arguments
+		; More information about x-arguments can be found at https://www.rabbitmq.com/queues.html#optional-arguments
+        [queue_args]
+        x-dead-letter-exchange =
+        x-dead-letter-routing-key = emails_dlq
+        x-overflow = reject-publish
+        x-queue-type = quorum
 
  More information about RabbitMQ can be found at https://www.rabbitmq.com/

docs/plugins/queue/smtp_forward.md

@@ -100,4 +100,4 @@ enable\_outbound can be set or unset on a per-domain level to enable or disable
 
 # Split host forward routing
 
-When an incoming email transaction has multiple recipients with different forward routes,  recipients to subsequent forward routes are deferred. Example: an incoming email transaction has recipients [email protected], [email protected], and [email protected]. The first two recipients will be accepted (they share the same forward destination) and the latter will be deferred. It will arrive in a future delivery attempt by the remote.
+When an incoming email transaction has multiple recipients with different forward routes, recipients to subsequent forward routes are deferred. Example: an incoming email transaction has recipients [email protected], [email protected], and [email protected]. The first two recipients will be accepted (they share the same forward destination) and the latter will be deferred. It will arrive in a future delivery attempt by the remote.

docs/plugins/rcpt_to.access.md

@@ -1,6 +1,6 @@
 ## DEPRECATION NOTICE
 
-See the [access](http://haraka.github.io/manual/plugins/access.html) plugin
+See [haraka-plugin-access](https://github.com/haraka/haraka-plugin-access)
 for upgrade instructions.
 
 

docs/plugins/relay.md

@@ -8,7 +8,7 @@ This **relay** plugin provides Haraka with options for managing relay permission
 
 ## Authentication
 
-One way to enable relaying is [authentication](http://haraka.github.io/manual.html) via the auth plugins. Successful authentication enables relaying during _that_ SMTP connection. To securely offer SMTP AUTH, the [tls](http://haraka.github.io/manual/plugins/tls.html) plugin and at least one auth plugin must be enabled and properly configured. When that requirement is met, the AUTH SMTP extension will be advertised to SMTP clients.
+One way to enable relaying is authentication via the [auth plugins](http://haraka.github.io/plugins). Successful authentication enables relaying during _that_ SMTP connection. To securely offer SMTP AUTH, the [tls](http://haraka.github.io/plugins/tls) plugin and at least one auth plugin must be enabled and properly configured. When that requirement is met, the AUTH SMTP extension will be advertised to SMTP clients.
 
     % nc mail.example.com 587
     220 mail.example.com ESMTP Haraka 2.4.0 ready
@@ -118,7 +118,7 @@ Example:
     [domains]
     test.com = { "action": "accept" }
 
-I think of *accept* as the equivalent of qmail's *rcpthosts*, or a misplaced Haraka `rcpt_to.*` plugin. The *accept* mechanism is another way to tell Haraka that a particular domain is one we accept mail for. The difference between this and the [rcpt_to.in_host_list](http://haraka.github.io/manual/plugins/rcpt_to.in_host_list.html) plugin is that this one also enables relaying.
+Think of *accept* as the equivalent of qmail's *rcpthosts*, or a misplaced Haraka `rcpt_to.*` plugin. The *accept* mechanism is another way to tell Haraka that a particular domain is one we accept mail for. The difference between this and the [rcpt_to.in_host_list](http://haraka.github.io/plugins/rcpt_to.in_host_list) plugin is that this one also enables relaying.
 
     * continue (mails are subject to further checks)
 

outbound/hmail.js

@@ -1062,7 +1062,7 @@ class HMailItem extends events.EventEmitter {
             "\r": '#10',
             "\n": '#13'
         };
-        const escape_pattern = new RegExp(`[${Object.keys(escaped_chars).join()}]`, 'g');
+        const escape_pattern = new RegExp(`[${Object.keys(escaped_chars).join('')}]`, 'g');
 
         bounce_msg_html_.forEach(line => {
             line = line.replace(/\{(\w+)\}/g, (i, word) => {

package.json

@@ -38,7 +38,7 @@
     "haraka-net-utils": "^1.5.0",
     "haraka-notes": "^1.0.6",
     "haraka-plugin-attachment": "^1.0.7",
-    "haraka-plugin-spf": "1.2.0",
+    "haraka-plugin-spf": "1.2.3",
     "haraka-plugin-redis": "^2.0.5",
     "haraka-results": "^2.2.3",
     "haraka-tld": "^1.1.1",

plugins/clamd.js

@@ -269,6 +269,7 @@ exports.hook_data_post = function (next, connection) {
                 if (virus && plugin.rejectRE &&       // enabled
                     plugin.allRE.test(virus) &&       // has a reject option
                     !plugin.rejectRE.test(virus)) {   // reject=false set
+                    txn.add_header('X-Haraka-Virus', virus);
                     return next();
                 }
                 if (!plugin.cfg.reject.virus) { return next(); }

plugins/queue/rabbitmq_amqplib.js

@@ -58,7 +58,7 @@ exports.init_amqp_connection = function () {
                     return conn.close();
                 }
                 ch.assertQueue(queueName,
-                    {durable, autoDelete},
+                    {durable, autoDelete, arguments: this.config.get("rabbitmq.ini").queue_args},
                     (err4, ok2) => {
                         if (err4) {
                             this.logerror(`Error asserting rabbitmq queue: ${err4}`);

plugins/queue/smtp_forward.js

@@ -28,10 +28,10 @@ exports.register = function () {
     if (this.cfg.main.enable_outbound) {
         // deliver local message via smtp forward when relaying=true
         this.register_hook('queue_outbound', 'queue_forward');
-
-        // may specify more specific routes for outbound
-        this.register_hook('get_mx', 'get_mx');
     }
+
+    // may specify more specific [per-domain] outbound routes
+    this.register_hook('get_mx', 'get_mx');
 }
 
 exports.load_smtp_forward_ini = function () {