Haraka 3.0.2 → 3.0.4

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');
 }

package/plugins.js

@@ -2,9 +2,9 @@
 // load all defined plugins
 
 // node built-ins
-const fs          = require('fs');
-const path        = require('path');
-const vm          = require('vm');
+const fs          = require('node:fs');
+const path        = require('node:path');
+const vm          = require('node:vm');
 
 // npm modules
 exports.config    = require('haraka-config');
@@ -74,8 +74,8 @@ class Plugin {
 
         // development mode
         paths = paths.concat(plugin_search_paths(__dirname, name));
-        paths.forEach(pp => {
-            if (this.plugin_path) return;
+        for (const pp of paths) {
+            if (this.plugin_path) continue;
             try {
                 fs.statSync(pp);
                 this.plugin_path = pp;
@@ -84,7 +84,7 @@ class Plugin {
                 }
             }
             catch (ignore) {}
-        });
+        }
     }
 
     _get_config () {
@@ -128,8 +128,7 @@ class Plugin {
         this.hooks[hook_name] = this.hooks[hook_name] || [];
         this.hooks[hook_name].push(method_name);
 
-        logger.logdebug(`registered hook ${hook_name} to ${this.name}.` +
-                        `${method_name} priority ${priority}`);
+        plugins.logdebug(`registered hook ${hook_name} to ${this.name}.${method_name} priority ${priority}`);
     }
 
     register () {} // noop
@@ -140,12 +139,6 @@ class Plugin {
             if (!this[method]) {
                 this[method] = parent_plugin[method];
             }
-            // else if (method == 'shutdown') {
-            //     Method is in this module, so it exists in the plugin
-            //     if (!this.hasOwnProperty('shutdown')) {
-            //         this[method] = parent_plugin[method];
-            //     }
-            // }
         }
         if (parent_plugin.register) {
             parent_plugin.register.call(this);
@@ -195,7 +188,7 @@ class Plugin {
         }
         catch (err) {
             if (exports.config.get('smtp.ini').main.ignore_bad_plugins) {
-                logger.logcrit(`Loading plugin ${this.name} failed: ${err}`);
+                plugins.logcrit(`Loading ${this.name} failed: ${err}`);
                 return;
             }
             throw `Loading plugin ${this.name} failed: ${err}`;
@@ -231,16 +224,13 @@ class Plugin {
             vm.runInNewContext(code, sandbox, pp);
         }
         catch (err) {
-            logger.logcrit(`Compiling plugin: ${this.name} failed`);
+            plugins.logcrit(`compiling '${this.name}' failed`);
             if (exports.config.get('smtp.ini').main.ignore_bad_plugins) {
-                logger.logcrit(`Loading plugin ${this.name} failed: `,
-                    `${err.message} - will skip this plugin and continue`);
+                plugins.logcrit(`Loading '${this.name}' failed: ${err.message} - skipping`);
                 return;
             }
             throw err; // default is to re-throw and stop Haraka
         }
-
-        return this;
     }
 }
 
@@ -254,7 +244,7 @@ exports.shutdown_plugins = () => {
 
 process.on('message', msg => {
     if (msg.event && msg.event == 'plugins.shutdown') {
-        logger.loginfo("[plugins] Shutting down plugins");
+        plugins.loginfo("Shutting down");
         exports.shutdown_plugins();
     }
 });
@@ -270,39 +260,28 @@ function plugin_search_paths (prefix, name) {
 function get_timeout (name) {
     let timeout = parseFloat((exports.config.get(`${name}.timeout`)));
     if (isNaN(timeout)) {
-        logger.logdebug(`no timeout in ${name}.timeout`);
+        plugins.logdebug(`no timeout in ${name}.timeout`);
         timeout = parseFloat(exports.config.get('plugin_timeout'));
     }
     if (isNaN(timeout)) {
-        logger.logdebug('no timeout in plugin_timeout');
+        plugins.logdebug('no timeout in plugin_timeout');
         timeout = 30;
     }
 
-    logger.logdebug(`plugin ${name} timeout is: ${timeout}s`);
+    plugins.logdebug(`plugin ${name} timeout is: ${timeout}s`);
     return timeout;
 }
 
-// copy logger methods into Plugin:
-for (const key in logger) {
-    if (!/^log\w/.test(key)) continue;
-    // console.log(`adding Plugin.${key} method`);
-    Plugin.prototype[key] = (function (lev) {
-        return function () {
-            const args = [this];
-            for (let i=0, l=arguments.length; i<l; i++) {
-                args.push(arguments[i]);
-            }
-            logger[lev].apply(logger, args);
-        };
-    })(key);
-}
+logger.add_log_methods(Plugin)
 
 const plugins = exports;
 
+logger.add_log_methods(plugins, 'plugins')
+
 plugins.Plugin = Plugin;
 
 plugins.load_plugins = override => {
-    logger.loginfo('Loading plugins');
+    plugins.logdebug('Loading');
     let plugin_list;
     if (override) {
         if (!Array.isArray(override)) override = [ override ];
@@ -312,22 +291,21 @@ plugins.load_plugins = override => {
         plugin_list = exports.config.get('plugins', 'list');
     }
 
-    plugin_list.forEach(plugin => {
+    for (let plugin of plugin_list) {
         if (plugin.startsWith('haraka-plugin-')) plugin = plugin.substr(14)
         if (plugins.deprecated[plugin]) {
-            logger.lognotice(`the plugin ${plugin} has been replaced by '${plugins.deprecated[plugin]}'. Please update config/plugins`)
+            plugins.lognotice(`${plugin} has been replaced by '${plugins.deprecated[plugin]}'. Please update config/plugins`)
             plugins.load_plugin(plugins.deprecated[plugin]);
         }
         else {
             plugins.load_plugin(plugin);
         }
-    });
+    }
 
     plugins.plugin_list = Object.keys(plugins.registered_plugins);
 
     // Sort registered_hooks by priority
-    const hooks = Object.keys(plugins.registered_hooks);
-    for (const hook of hooks) {
+    for (const hook of Object.keys(plugins.registered_hooks)) {
         plugins.registered_hooks[hook].sort((a, b) => {
             if (a.priority < b.priority) return -1;
             if (a.priority > b.priority) return 1;
@@ -343,6 +321,8 @@ plugins.load_plugins = override => {
 }
 
 plugins.deprecated = {
+    'auth/auth_ldap'      : 'auth-ldap',
+    'backscatterer'       : 'dns-list',
     'connect.asn'         : 'asn',
     'connect.fcrdns'      : 'fcrdns',
     'connect.geoip'       : 'geoip',
@@ -352,6 +332,11 @@ plugins.deprecated = {
     'data.noreceived'     : 'headers',
     'data.rfc5322_header_checks': 'headers',
     'data.headers'        : 'headers',
+    'dkim_sign'           : 'dkim',
+    'dkim_verify'         : 'dkim',
+    'data.uribl'          : 'uribl',
+    'dnsbl'               : 'dns-list',
+    'dnswl'               : 'dns-list',
     'log.syslog'          : 'syslog',
     'mail_from.access'    : 'access',
     'mail_from.blocklist' : 'access',
@@ -360,14 +345,17 @@ plugins.deprecated = {
     'rate_limit'          : 'limit',
     'rcpt_to.access'      : 'access',
     'rcpt_to.blocklist'   : 'access',
+    'rcpt_to.ldap'        : 'rcpt-ldap',
+    'rcpt_to.max_count'   : 'limit',
     'rcpt_to.qmail_deliverable' : 'qmail-deliverable',
     'rdns.regexp'         : 'access',
     'relay_acl'           : 'relay',
+    'relay_all'           : 'relay',
     'relay_force_routing' : 'relay',
 }
 
 plugins.load_plugin = name => {
-    logger.loginfo(`Loading plugin: ${name}`);
+    plugins.loginfo(`loading ${name}`);
 
     const plugin = plugins._load_and_compile_plugin(name);
     if (plugin) {
@@ -375,7 +363,6 @@ plugins.load_plugin = name => {
     }
 
     plugins.registered_plugins[name] = plugin;
-    return plugin;
 }
 
 // Set in server.js; initialized to empty object
@@ -387,7 +374,7 @@ plugins._load_and_compile_plugin = name => {
     if (!plugin.plugin_path) {
         const err = `Loading plugin ${plugin.name} failed: No plugin with this name found`;
         if (exports.config.get('smtp.ini').main.ignore_bad_plugins) {
-            logger.logcrit(err);
+            plugins.logcrit(err);
             return;
         }
         throw err;
@@ -406,8 +393,6 @@ plugins._register_plugin = plugin => {
             plugin.register_hook(result[1], method);
         }
     }
-
-    return plugin;
 }
 
 plugins.run_hooks = (hook, object, params) => {
@@ -495,10 +480,8 @@ plugins.run_next_hook = (hook, object, params) => {
 
         const respond_method = `${hook}_respond`;
         if (item && is_deny_retval(retval) && hook.substr(0,5) !== 'init_') {
-            object.deny_respond =
-                get_denyfn(object, hook, params, retval, msg, respond_method);
-            plugins.run_hooks('deny', object,
-                [retval, msg, item[0].name, item[1], params, hook]);
+            object.deny_respond = get_denyfn(object, hook, params, retval, msg, respond_method);
+            plugins.run_hooks('deny', object, [retval, msg, item[0].name, item[1], params, hook]);
         }
         else {
             object.hooks_to_run = [];
@@ -578,11 +561,25 @@ function log_run_item (item, hook, retval, object, params, msg) {
             'function'  :  item[1],
             'params'    :  ((params) ? ((typeof params === 'string') ? params : params[0]) : ''),
             'retval'    : constants.translate(retval),
-            'msg'       :  ((msg) ? msg : ''),
+            'msg'       :  sanitize(msg),
         });
     }
 }
 
+function sanitize (msg) {
+    if (!msg) return ''
+    if (typeof msg === 'string') return msg
+    if (typeof msg === 'object') {
+        if (msg.constructor.name === 'DSN') return msg.reply
+        const sanitized = { ...msg }; // copy the message
+        for (const priv of ['password','auth_pass']) {
+            delete sanitized[priv]
+        }
+        return JSON.stringify(sanitized)
+    }
+    logger.logerror(`what is ${msg} (typeof ${typeof msg})?`)
+}
+
 function is_deny_retval (val) {
     switch (val) {
         case constants.deny:

package/run_tests

@@ -1,32 +1,5 @@
-#!/usr/bin/env node
+#!/bin/sh
 
-'use strict';
+TESTS=${1:-"test test/outbound test/plugins/auth test/plugins/queue test/plugins"}
 
-let reporter;
-try {
-    reporter = require('nodeunit-x').reporters.default;
-}
-catch (e) {
-    console.log(`Error: ${e.message}
-
-Cannot find nodeunit module. Please run the following:
-
-    npm install\n`);
-
-    process.exit();
-}
-
-process.chdir(__dirname);
-
-let tests = [
-    'tests', 'tests/outbound', 'tests/plugins',
-    'tests/plugins/auth', 'tests/plugins/queue'
-];
-
-if (process.argv[2]) {
-    console.log("Running tests: ", process.argv.slice(2));
-    tests = process.argv.slice(2);
-}
-reporter.run(tests, undefined, function (err) {
-    process.exit(((err) ? 1 : 0));
-});
+npx mocha --exit $TESTS