Haraka 3.0.3 → 3.0.5

package/plugins/queue/rabbitmq.js

@@ -1,5 +1,4 @@
 const amqp = require('amqp');
-const logger = require('./logger');
 
 let rabbitqueue;
 let exchangeName;
@@ -12,41 +11,41 @@ exports.exchangeMapping = {}
 
 //This method registers the hook and try to initialize the connection to rabbitmq server for later use.
 exports.register = function () {
-    logger.logdebug("About to connect and initialize queue object");
+    this.logdebug("About to connect and initialize queue object");
     this.init_rabbitmq_server();
-    logger.logdebug(`Finished initiating : ${exports.exchangeMapping[exchangeName + queueName]}`);
+    this.logdebug(`Finished initiating : ${exports.exchangeMapping[exchangeName + queueName]}`);
 }
 
 
 //Actual magic of publishing message to rabbit when email comes happen here.
-exports.hook_queue = (next, connection) => {
+exports.hook_queue = function (next, connection) {
     if (!connection?.transaction) return next();
 
     //Calling the get_data method and when it gets the data on callback, publish the message to queue with routing key.
     connection.transaction.message_stream.get_data(buffere => {
         const exchangeData = exports.exchangeMapping[exchangeName + queueName]
-        logger.logdebug(`Sending the data: ${ queueName} Routing : ${exchangeData} exchange :${connExchange_}`);
+        this.logdebug(`Sending the data: ${ queueName} Routing : ${exchangeData} exchange :${connExchange_}`);
         if (connExchange_ && routing_) {
             //This is publish function of rabbitmq amqp library, currently direct queue is configured and routing is fixed.
             //Needs to be changed.
             connExchange_.publish(routing_, buffere,{deliveryMode}, error => {
                 if (error) {
                     //There was some error while sending the email to queue.
-                    logger.logdebug("queueFailure: #{JSON.stringify(error)}");
+                    this.logdebug("queueFailure: #{JSON.stringify(error)}");
                     exports.init_rabbitmq_server();
-                    return next();
+                    next();
                 }
                 else {
                     //Queueing was successful, send ok as reply
-                    logger.logdebug( "queueSuccess");
-                    return next(OK,"Successfully Queued! in rabbitmq");
+                    this.logdebug( "queueSuccess");
+                    next(OK,"Successfully Queued! in rabbitmq");
                 }
             });
         }
         else {
             //Seems like connExchange is not defined , lets create one for next call
             exports.init_rabbitmq_server();
-            return next();
+            next();
         }
     });
 }
@@ -88,18 +87,18 @@ exports.init_rabbitmq_server = function () {
 
 
     //Create connection to the rabbitmq server
-    logger.logdebug("About to Create connection with server");
+    this.logdebug("About to Create connection with server");
     rabbitqueue = amqp.createConnection(options);
 
 
     //Declaring listerner on error on connection.
     rabbitqueue.on('error', error => {
-        logger.logdebug(`There was some error on the connection : ${error}`);
+        this.logerror(`There was some error on the connection : ${error}`);
     });
 
     //Declaring listerner on close on connection.
     rabbitqueue.on('close', close => {
-        logger.logdebug(` Connection  is beingclosed : ${close}`);
+        this.logdebug(` Connection  is being closed : ${close}`);
     });
 
 
@@ -111,16 +110,16 @@ exports.init_rabbitmq_server = function () {
      */
 
     rabbitqueue.on('ready', () => {
-        logger.logdebug("Connection is ready, will try making exchange");
+        this.logdebug("Connection is ready, will try making exchange");
         // Now connection is ready will try to open exchange with config data.
         rabbitqueue.exchange(exchangeName, {  type: exchangeType,  confirm,  durable }, connExchange => {
 
 
-            logger.logdebug(`connExchange with server ${connExchange} autoDelete : ${autoDelete}`);
+            this.logdebug(`connExchange with server ${connExchange} autoDelete : ${autoDelete}`);
 
             //Exchange is now open, will try to open queue.
             return rabbitqueue.queue(queueName,{autoDelete, durable }, connQueue => {
-                logger.logdebug(`connQueue with server ${connQueue}`);
+                this.logdebug(`connQueue with server ${connQueue}`);
 
                 //Creating the Routing key to bind the queue and exchange.
                 const routing = `${queueName}Routing`;
@@ -142,7 +141,7 @@ exports.init_rabbitmq_server = function () {
                     routing : routing_,
                     queueName
                 });
-                logger.logdebug(`exchange: ${exchangeName}, queue: ${queueName}  exchange : ${connExchange_} queue : ${connQueue_}` );
+                this.logdebug(`exchange: ${exchangeName}, queue: ${queueName}  exchange : ${connExchange_} queue : ${connQueue_}` );
             });
         });
     });

package/plugins/queue/smtp_forward.js

@@ -4,7 +4,7 @@
 // and passes back any errors seen on the ongoing server to the
 // originating server.
 
-const url = require('url');
+const url = require('node:url');
 
 const smtp_client_mod = require('./smtp_client');
 
@@ -230,6 +230,7 @@ exports.forward_enabled = function (conn, dom_cfg) {
 
 exports.queue_forward = function (next, connection) {
     const plugin = this;
+    if (connection.remote.closed) return
     const txn = connection?.transaction;
 
     const cfg = plugin.get_config(connection);
@@ -247,8 +248,7 @@ exports.queue_forward = function (next, connection) {
         );
 
         function get_rs () {
-            if (txn) return txn.results;
-            return connection.results;
+            return connection?.transaction?.results ? connection.transaction.results : connection.results
         }
 
         function dead_sender () {

package/plugins/queue/smtp_proxy.js

@@ -79,6 +79,10 @@ exports.hook_mail = function (next, connection, params) {
 exports.hook_rcpt_ok = (next, connection, recipient) => {
     const { smtp_client } = connection.notes;
     if (!smtp_client) return next();
+    if (smtp_client.is_dead_sender(this, connection)) {
+        delete connection.notes.smtp_client;
+        return;
+    }
     smtp_client.next = next;
     smtp_client.send_command('RCPT', `TO:${recipient.format(!smtp_client.smtp_utf8)}`);
 }
@@ -86,6 +90,11 @@ exports.hook_rcpt_ok = (next, connection, recipient) => {
 exports.hook_data = (next, connection) => {
     const { smtp_client } = connection.notes;
     if (!smtp_client) return next();
+
+    if (smtp_client.is_dead_sender(this, connection)) {
+        delete connection.notes.smtp_client;
+        return;
+    }
     smtp_client.next = next;
     smtp_client.send_command("DATA");
 }
@@ -96,11 +105,11 @@ exports.hook_queue = function (next, connection) {
     const { smtp_client } = connection.notes;
     if (!smtp_client) return next();
 
-    smtp_client.next = next;
     if (smtp_client.is_dead_sender(this, connection)) {
         delete connection.notes.smtp_client;
         return;
     }
+    smtp_client.next = next;
     smtp_client.start_data(connection.transaction.message_stream);
 }
 

package/plugins/queue/test.js

@@ -1,5 +1,5 @@
-const fs = require('fs');
-const os = require('os');
+const fs = require('node:fs');
+const os = require('node:os');
 
 const tempDir = os.tmpdir();
 

package/plugins/rcpt_to.host_list_base.js

@@ -40,7 +40,7 @@ exports.hook_mail = function (next, connection, params) {
 
     const anti_spoof = this.config.get('host_list.anti_spoof') || false;
 
-    if (this.in_host_list(domain) || this.in_host_regex(domain)) {
+    if (this.in_host_list(domain, connection) || this.in_host_regex(domain, connection)) {
         if (anti_spoof && !connection.relaying) {
             txn.results.add(this, {fail: 'mail_from.anti_spoof'});
             return next(DENY, `Mail from domain '${domain}' is not allowed from your host`);
@@ -54,16 +54,16 @@ exports.hook_mail = function (next, connection, params) {
     return next();
 }
 
-exports.in_host_list = function (domain) {
-    this.logdebug(`checking ${domain} in config/host_list`);
+exports.in_host_list = function (domain, connection) {
+    this.logdebug(connection, `checking ${domain} in config/host_list`);
     return !!(this.host_list[domain]);
 }
 
-exports.in_host_regex = function (domain) {
+exports.in_host_regex = function (domain, connection) {
     if (!this.host_list_regex) return false;
     if (!this.host_list_regex.length) return false;
 
-    this.logdebug(`checking ${domain} against config/host_list_regex `);
+    this.logdebug(connection, `checking ${domain} against config/host_list_regex `);
 
     return !!(this.hl_re.test(domain));
 }

package/plugins/rcpt_to.in_host_list.js

@@ -32,12 +32,12 @@ exports.hook_rcpt = function (next, connection, params) {
 
     const domain = rcpt.host.toLowerCase();
 
-    if (this.in_host_list(domain)) {
+    if (this.in_host_list(domain, connection)) {
         txn.results.add(this, {pass: 'rcpt_to'});
         return next(OK);
     }
 
-    if (this.in_host_regex(domain)) {
+    if (this.in_host_regex(domain, connection)) {
         txn.results.add(this, {pass: 'rcpt_to'});
         return next(OK);
     }

package/plugins/relay.js

@@ -2,8 +2,9 @@
 //
 // documentation via: haraka -h relay
 
+const net = require('node:net');
+
 const ipaddr = require('ipaddr.js');
-const net    = require('net');
 
 exports.register = function () {
 
@@ -89,11 +90,9 @@ exports.acl = function (next, connection) {
 }
 
 exports.pass_relaying = (next, connection) => {
-    if (connection.relaying) {
-        return next(OK);
-    }
+    if (connection.relaying) return next(OK);
 
-    return next();
+    next();
 }
 
 exports.is_acl_allowed = function (connection) {
@@ -172,7 +171,7 @@ exports.dest_domains = function (next, connection, params) {
     }
 
     transaction.results.add(this, {fail: 'relay_dest_domain'});
-    return next(DENY, "Mail for that recipient is not accepted here.");
+    next(DENY, "Mail for that recipient is not accepted here.");
 }
 
 exports.force_routing = function (next, hmail, domain) {
@@ -196,7 +195,7 @@ exports.force_routing = function (next, hmail, domain) {
     }
 
     this.logdebug(this, `using ${nexthop} for: ${domain}`);
-    return next(OK, nexthop);
+    next(OK, nexthop);
 }
 
 exports.all = function (next, connection, params) {

package/plugins/reseed_rng.js

@@ -1,4 +1,4 @@
-const crypto = require('crypto');
+const crypto = require('node:crypto');
 
 exports.hook_init_child = function (next) {
     Math.seedrandom(crypto.randomBytes(256).toString('hex'));

package/plugins/status.js

@@ -1,8 +1,7 @@
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
-const async = require('async');
+const fs = require('node:fs');
+const path = require('node:path');
 
 exports.register = function () {
     this.outbound = require('../outbound');
@@ -81,38 +80,36 @@ exports.pool_list = cb => {
     const result = {};
 
     if (server.notes.pool) {
-        Object.keys(server.notes.pool).forEach(name => {
+        for (const name of Object.keys(server.notes.pool)) {
             const instance = server.notes.pool[name];
 
             result[name] = {
                 inUse: instance.inUseObjectsCount(),
                 size: instance.getPoolSize()
             };
-        });
+        }
     }
 
     cb(null, result);
 }
 
 exports.queue_list = function (cb) {
-    this.outbound.list_queue((err, qlist) => {
-        if (err) cb(err);
-
+    this.outbound.list_queue((err, qlist = []) => {
         const result = [];
 
-        if (qlist) {
-            qlist.forEach((todo) => result.push({
+        for (const todo of qlist) {
+            result.push({
                 file: todo.file,
                 uuid: todo.uuid,
                 queue_time: todo.queue_time,
                 domain: todo.domain,
                 from: todo.mail_from.toString(),
                 to: todo.rcpt_to.map((r) => r.toString())
-            }));
+            })
         }
 
         cb(err, result);
-    });
+    })
 }
 
 exports.queue_stats = function (cb) {
@@ -165,14 +162,14 @@ exports.queue_push = function (file, cb) {
 // cluster IPC
 
 exports.hook_init_master = function (next) {
-    const self = this;
+    const plugin = this;
 
     if (!server.cluster) return next();
 
     function message_handler (sender, msg) {
         if (msg.event !== 'status.request') return;
 
-        self.call_workers(msg, (err, response) => {
+        plugin.call_workers(msg, (response) => {
             msg.result = response.filter((el) => el != null);
             msg.event = 'status.result';
             sender.send(msg);
@@ -214,32 +211,39 @@ exports.call_master = (cmd, cb) => {
 }
 
 exports.call_workers = function (cmd, cb) {
-
-    async.map(server.cluster.workers, (w, done) => {
-        this.call_worker(w, cmd, done);
-    }, cb);
+    Promise.allSettled(
+        Object.values(server.cluster.workers).map(w => this.call_worker(w, cmd))
+    )
+    .then(r => {
+        cb(
+            // r.filter(s => s.status === 'rejected').flatMap(s => s.reason),
+            r.filter(s => s.status === 'fulfilled').flatMap(s => s.value),
+        )
+    })
 }
 
 // sends command to worker and then wait for response or timeout
-exports.call_worker = (worker, cmd, cb) => {
-    let timeout;
+exports.call_worker = (worker, cmd) => {
+    return new Promise((resolve) => {
+        let timeout;
 
-    function message_handler (sender, msg) {
-        if (sender.id !== worker.id) return;
-        if (msg.event !== 'status.response') return;
+        function message_handler (sender, msg) {
+            if (sender.id !== worker.id) return;
+            if (msg.event !== 'status.response') return;
 
-        clearTimeout(timeout);
-        server.cluster.removeListener('message', message_handler);
+            clearTimeout(timeout);
+            server.cluster.removeListener('message', message_handler);
 
-        cb(null, msg.result);
-    }
+            resolve(msg.result);
+        }
 
-    timeout = setTimeout(() => {
-        server.cluster.removeListener('message', message_handler);
-        cb();
-    }, 1000);
+        timeout = setTimeout(() => {
+            server.cluster.removeListener('message', message_handler);
+            resolve();
+        }, 1000);
 
 
-    server.cluster.on('message', message_handler);
-    worker.send(cmd);
+        server.cluster.on('message', message_handler);
+        worker.send(cmd);
+    })
 }

package/plugins/tls.js

@@ -123,7 +123,7 @@ exports.upgrade_connection = function (next, connection, params) {
 
             connection.results.add(plugin, connection.tls);
             plugin.emit_upgrade_msg(connection, verified, verifyErr, cert, cipher);
-            return next(OK);  // Return OK as we responded to the client
+            next(OK);
         })
     })
 }
@@ -132,7 +132,7 @@ exports.hook_disconnect = (next, connection) => {
     if (connection.notes.cleanUpDisconnect) {
         connection.notes.cleanUpDisconnect(true);
     }
-    return next();
+    next();
 }
 
 exports.emit_upgrade_msg = function (conn, verified, verifyErr, cert, cipher) {

package/plugins/xclient.js

@@ -1,9 +1,10 @@
 // Implementation of XCLIENT protocol
 // See http://www.postfix.org/XCLIENT_README.html
 
+const net = require('node:net');
+
 const utils = require('haraka-utils');
 const DSN = require('haraka-dsn');
-const net = require('net');
 let allowed_hosts = {};
 
 exports.register = function () {
@@ -119,5 +120,5 @@ exports.hook_unrecognized_command = function (next, connection, params) {
     connection.xclient = true;
     if (!xclient.name) return next(NEXT_HOOK, 'lookup_rdns');
 
-    return next(NEXT_HOOK, 'connect');
+    next(NEXT_HOOK, 'connect');
 }