Haraka 2.8.28 → 3.0.1

package/plugins.js

@@ -39,7 +39,6 @@ class Plugin {
     }
 
     _get_plugin_path () {
-        const plugin = this;
         /* From https://github.com/haraka/Haraka/pull/1278#issuecomment-168856528
         In Development mode, or install via a plain "git clone":
 
@@ -57,9 +56,9 @@ class Plugin {
             Plugin in <core_haraka_dir>/node_modules.
         */
 
-        plugin.hasPackageJson = false;
-        const name = plugin.name.startsWith('haraka-plugin-') ? plugin.name.substr(14) : plugin.name;
-        if (plugin.name !== name) plugin.name = name;
+        this.hasPackageJson = false;
+        const name = this.name.startsWith('haraka-plugin-') ? this.name.substr(14) : this.name;
+        if (this.name !== name) this.name = name;
 
         let paths = [];
         if (process.env.HARAKA) {
@@ -76,12 +75,12 @@ class Plugin {
         // development mode
         paths = paths.concat(plugin_search_paths(__dirname, name));
         paths.forEach(pp => {
-            if (plugin.plugin_path) return;
+            if (this.plugin_path) return;
             try {
                 fs.statSync(pp);
-                plugin.plugin_path = pp;
+                this.plugin_path = pp;
                 if (path.basename(pp) === 'package.json') {
-                    plugin.hasPackageJson = true;
+                    this.hasPackageJson = true;
                 }
             }
             catch (ignore) {}
@@ -155,9 +154,8 @@ class Plugin {
     }
 
     _make_custom_require () {
-        const plugin = this;
         return module => {
-            if (plugin.hasPackageJson) {
+            if (this.hasPackageJson) {
                 const mod = require(module);
                 constants.import(global);
                 global.server = plugins.server;
@@ -165,7 +163,7 @@ class Plugin {
             }
 
             if (module === './config') {
-                return plugin.config;
+                return this.config;
             }
 
             if (!/^\./.test(module)) {
@@ -177,14 +175,13 @@ class Plugin {
                 return require(module);
             }
 
-            return require(path.join(path.dirname(plugin.plugin_path), module));
+            return require(path.join(path.dirname(this.plugin_path), module));
         };
     }
 
     _get_code (pp) {
-        const plugin = this;
 
-        if (plugin.hasPackageJson) {
+        if (this.hasPackageJson) {
             let packageDir = path.dirname(pp);
             if (/^win(32|64)/.test(process.platform)) {
                 // escape the c:\path\back\slashes else they disappear
@@ -198,25 +195,24 @@ class Plugin {
         }
         catch (err) {
             if (exports.config.get('smtp.ini').main.ignore_bad_plugins) {
-                logger.logcrit(`Loading plugin ${plugin.name} failed: ${err}`);
+                logger.logcrit(`Loading plugin ${this.name} failed: ${err}`);
                 return;
             }
-            throw `Loading plugin ${plugin.name} failed: ${err}`;
+            throw `Loading plugin ${this.name} failed: ${err}`;
         }
     }
 
     _compile () {
-        const plugin = this;
 
-        const pp = plugin.plugin_path;
-        const code = plugin._get_code(pp);
+        const pp = this.plugin_path;
+        const code = this._get_code(pp);
         if (!code) return;
 
         const sandbox = {
-            require: plugin._make_custom_require(),
+            require: this._make_custom_require(),
             __filename: pp,
             __dirname:  path.dirname(pp),
-            exports: plugin,
+            exports: this,
             setTimeout,
             clearTimeout,
             setInterval,
@@ -227,7 +223,7 @@ class Plugin {
             server: plugins.server,
             setImmediate
         };
-        if (plugin.hasPackageJson) {
+        if (this.hasPackageJson) {
             delete sandbox.__filename;
         }
         constants.import(sandbox);
@@ -235,16 +231,16 @@ class Plugin {
             vm.runInNewContext(code, sandbox, pp);
         }
         catch (err) {
-            logger.logcrit(`Compiling plugin: ${plugin.name} failed`);
+            logger.logcrit(`Compiling plugin: ${this.name} failed`);
             if (exports.config.get('smtp.ini').main.ignore_bad_plugins) {
-                logger.logcrit(`Loading plugin ${plugin.name} failed: `,
+                logger.logcrit(`Loading plugin ${this.name} failed: `,
                     `${err.message} - will skip this plugin and continue`);
                 return;
             }
             throw err; // default is to re-throw and stop Haraka
         }
 
-        return plugin;
+        return this;
     }
 }
 
@@ -331,8 +327,7 @@ plugins.load_plugins = override => {
 
     // Sort registered_hooks by priority
     const hooks = Object.keys(plugins.registered_hooks);
-    for (let h=0; h<hooks.length; h++) {
-        const hook = hooks[h];
+    for (const hook of hooks) {
         plugins.registered_hooks[hook].sort((a, b) => {
             if (a.priority < b.priority) return -1;
             if (a.priority > b.priority) return 1;
@@ -351,6 +346,7 @@ plugins.deprecated = {
     'connect.asn'         : 'asn',
     'connect.fcrdns'      : 'fcrdns',
     'connect.geoip'       : 'geoip',
+    'connect.p0f'         : 'p0f',
     'connect.rdns_access' : 'access',
     'data.nomsgid'        : 'headers',
     'data.noreceived'     : 'headers',
@@ -439,8 +435,7 @@ plugins.run_hooks = (hook, object, params) => {
     object.hooks_to_run = [];
 
     if (plugins.registered_hooks[hook]) {
-        for (let i=0; i<plugins.registered_hooks[hook].length; i++) {
-            const item = plugins.registered_hooks[hook][i];
+        for (const item of plugins.registered_hooks[hook]) {
             const plugin = plugins.registered_plugins[item.plugin];
             object.hooks_to_run.push([plugin, item.method]);
         }
@@ -529,7 +524,7 @@ plugins.run_next_hook = (hook, object, params) => {
         object.logdebug(`running ${hook} hook in ${item[0].name} plugin`);
     }
 
-    if (object.transaction && object.transaction.notes.skip_plugins.includes(item[0].name)) {
+    if (object.transaction?.notes.skip_plugins.includes(item[0].name)) {
         object.logdebug(`skipping ${item[0].name}_${hook} by request in notes`);
         return callback();
     }

package/rfc1869.js

@@ -86,8 +86,8 @@ exports.parse = (type, line, strict) => {
             else if (line.match(/@/)) {
                 if (!line.match(/^<.*>$/)) line = `<${line}>`;
             }
-            else if (!line.match(/^(postmaster|abuse)$/i)) {
-                throw new Error('Syntax error in address');
+            else if (!line.match(/^<(postmaster|abuse)>$/i)) {
+                throw new Error(`Syntax error in address: ${line}`);
             }
         }
     }

package/server.js

@@ -22,7 +22,7 @@ Server.config     = require('haraka-config');
 Server.plugins    = require('./plugins');
 Server.notes      = {};
 
-const logger      = Server.logger;
+const { logger }      = Server;
 
 // Need these here so we can run hooks
 logger.add_log_methods(Server, 'server');
@@ -233,16 +233,6 @@ Server._graceful = shutdown => {
     });
 }
 
-Server.drainPools = () => {
-    if (!Server.cluster) {
-        return outbound.drain_pools();
-    }
-
-    for (const id in cluster.workers) {
-        cluster.workers[id].send({event: 'outbound.drain_pools'});
-    }
-}
-
 Server.sendToMaster = (command, params) => {
     // console.log("Send to master: ", command);
     if (Server.cluster) {
@@ -274,7 +264,7 @@ function messageHandler (worker, msg, handle) {
         worker = undefined;
     }
     // console.log("received cmd: ", msg);
-    if (msg && msg.cmd) {
+    if (msg?.cmd) {
         Server.receiveAsMaster(msg.cmd, msg.params);
     }
 }
@@ -282,7 +272,7 @@ function messageHandler (worker, msg, handle) {
 Server.get_listen_addrs = (cfg, port) => {
     if (!port) port = 25;
     let listeners = [];
-    if (cfg && cfg.listen) {
+    if (cfg?.listen) {
         listeners = cfg.listen.split(/\s*,\s*/);
         if (listeners[0] === '') listeners = [];
         for (let i=0; i < listeners.length; i++) {