Haraka 2.8.28 → 3.0.1

package/plugins/auth/auth_vpopmaild.js

@@ -3,24 +3,21 @@
 const net    = require('net');
 
 exports.register = function () {
-    const plugin = this;
-    plugin.inherits('auth/auth_base');
-    plugin.load_vpop_ini();
+    this.inherits('auth/auth_base');
+    this.load_vpop_ini();
 }
 
 exports.load_vpop_ini = function () {
-    const plugin = this;
-    plugin.cfg = plugin.config.get('auth_vpopmaild.ini', () => {
-        plugin.load_vpop_ini();
+    this.cfg = this.config.get('auth_vpopmaild.ini', () => {
+        this.load_vpop_ini();
     });
 }
 
 exports.hook_capabilities = function (next, connection) {
     if (!connection.tls.enabled) { return next(); }
-    const plugin = this;
 
     const methods = [ 'PLAIN', 'LOGIN' ];
-    if (plugin.cfg.main.sysadmin) { methods.push('CRAM-MD5'); }
+    if (this.cfg.main.sysadmin) { methods.push('CRAM-MD5'); }
 
     connection.capabilities.push(`AUTH ${methods.join(' ')}`);
     connection.notes.allowed_auth_methods = methods;
@@ -29,12 +26,11 @@ exports.hook_capabilities = function (next, connection) {
 }
 
 exports.check_plain_passwd = function (connection, user, passwd, cb) {
-    const plugin = this;
 
     let chunk_count = 0;
     let auth_success = false;
 
-    const socket = plugin.get_vpopmaild_socket(user);
+    const socket = this.get_vpopmaild_socket(user);
     socket.setEncoding('utf8');
 
     socket.on('data', chunk => {
@@ -55,94 +51,91 @@ exports.check_plain_passwd = function (connection, user, passwd, cb) {
         }
     });
     socket.on('end', () => {
-        connection.loginfo(plugin, `AUTH user="${user}" success=${auth_success}`);
+        connection.loginfo(this, `AUTH user="${user}" success=${auth_success}`);
         return cb(auth_success);
     });
 }
 
 exports.get_sock_opts = function (user) {
-    const plugin = this;
 
-    plugin.sock_opts = {
+    this.sock_opts = {
         port: 89,
         host: '127.0.0.1',
         sysadmin: undefined,
     };
 
     const domain = (user.split('@'))[1];
-    let sect = plugin.cfg.main;
-    if (domain && plugin.cfg[domain]) {
-        sect = plugin.cfg[domain];
+    let sect = this.cfg.main;
+    if (domain && this.cfg[domain]) {
+        sect = this.cfg[domain];
     }
 
-    if (sect.port)     { plugin.sock_opts.port     = sect.port;     }
-    if (sect.host)     { plugin.sock_opts.host     = sect.host;     }
-    if (sect.sysadmin) { plugin.sock_opts.sysadmin = sect.sysadmin; }
+    if (sect.port)     { this.sock_opts.port     = sect.port;     }
+    if (sect.host)     { this.sock_opts.host     = sect.host;     }
+    if (sect.sysadmin) { this.sock_opts.sysadmin = sect.sysadmin; }
 
-    plugin.logdebug(`sock: ${plugin.sock_opts.host}:${plugin.sock_opts.port}`);
-    return plugin.sock_opts;
+    this.logdebug(`sock: ${this.sock_opts.host}:${this.sock_opts.port}`);
+    return this.sock_opts;
 }
 
 exports.get_vpopmaild_socket = function (user) {
-    const plugin = this;
-    plugin.get_sock_opts(user);
+    this.get_sock_opts(user);
 
     const socket = new net.Socket();
-    socket.connect(plugin.sock_opts.port, plugin.sock_opts.host);
+    socket.connect(this.sock_opts.port, this.sock_opts.host);
     socket.setTimeout(300 * 1000);
     socket.setEncoding('utf8');
 
     socket.on('timeout', () => {
-        plugin.logerror("vpopmaild connection timed out");
+        this.logerror("vpopmaild connection timed out");
         socket.end();
     });
     socket.on('error', err => {
-        plugin.logerror(`vpopmaild connection failed: ${err}`);
+        this.logerror(`vpopmaild connection failed: ${err}`);
         socket.end();
     });
     socket.on('connect', () => {
-        plugin.logdebug('vpopmail connected');
+        this.logdebug('vpopmail connected');
     });
     return socket;
 }
 
 exports.get_plain_passwd = function (user, connection, cb) {
-    const plugin = this;
 
-    const socket = plugin.get_vpopmaild_socket(user);
-    if (!plugin.sock_opts.sysadmin) {
-        plugin.logerror("missing sysadmin credentials");
+    const socket = this.get_vpopmaild_socket(user);
+    if (!this.sock_opts.sysadmin) {
+        this.logerror("missing sysadmin credentials");
         return cb(null);
     }
 
-    const sys = plugin.sock_opts.sysadmin.split(':');
+    const sys = this.sock_opts.sysadmin.split(':');
     let plain_pass = null;
     let chunk_count = 0;
 
     socket.on('data', chunk => {
         chunk_count++;
-        plugin.logdebug(`${chunk_count}\t${chunk}`);
+        this.logdebug(`${chunk_count}\t${chunk}`);
         if (chunk_count === 1) {
             if (/^\+OK/.test(chunk)) {
                 socket.write(`slogin ${sys[0]} ${sys[1]}\n\r`);
                 return;
             }
-            plugin.logerror("no ok to start");
+            this.logerror("no ok to start");
             socket.end();             // disconnect
         }
         // slogin reply
         if (chunk_count === 2) {
             if (/^\+OK/.test(chunk)) {
-                plugin.logdebug('login success, getting user info');
+                this.logdebug('login success, getting user info');
                 socket.write(`user_info ${user}\n\r`);
                 return;
             }
-            plugin.logerror("syadmin login failed");
+            this.logerror("syadmin login failed");
             socket.end();             // disconnect
         }
         if (chunk_count > 2) {
             if (/^-ERR/.test(chunk)) {
-                plugin.lognotice(`get_plain failed: ${chunk}`);
+                this.lognotice(`get_plain failed: ${chunk}`);
                 socket.end();         // disconnect
                 return;
             }

package/plugins/auth/flat_file.js

@@ -1,30 +1,27 @@
 // Auth against a flat file
 
 exports.register = function () {
-    const plugin = this;
-    plugin.inherits('auth/auth_base');
-    plugin.load_flat_ini();
+    this.inherits('auth/auth_base');
+    this.load_flat_ini();
 }
 
 exports.load_flat_ini = function () {
-    const plugin = this;
-    plugin.cfg = plugin.config.get('auth_flat_file.ini', () => {
-        plugin.load_flat_ini();
+    this.cfg = this.config.get('auth_flat_file.ini', () => {
+        this.load_flat_ini();
     });
 }
 
 exports.hook_capabilities = function (next, connection) {
-    const plugin = this;
     // don't allow AUTH unless private IP or encrypted
     if (!connection.remote.is_private && !connection.tls.enabled) {
-        connection.logdebug(plugin,
+        connection.logdebug(this,
             "Auth disabled for insecure public connection");
         return next();
     }
 
     let methods = null;
-    if (plugin.cfg.core && plugin.cfg.core.methods ) {
-        methods = plugin.cfg.core.methods.split(',');
+    if (this.cfg.core?.methods ) {
+        methods = this.cfg.core.methods.split(',');
     }
     if (methods && methods.length > 0) {
         connection.capabilities.push(`AUTH ${methods.join(' ')}`);
@@ -34,9 +31,8 @@ exports.hook_capabilities = function (next, connection) {
 }
 
 exports.get_plain_passwd = function (user, connection, cb) {
-    const plugin = this;
-    if (plugin.cfg.users[user]) {
-        return cb(plugin.cfg.users[user].toString());
+    if (this.cfg.users[user]) {
+        return cb(this.cfg.users[user].toString());
     }
     return cb();
 }

package/plugins/avg.js

@@ -7,37 +7,35 @@ const fs   = require('fs');
 const path = require('path');
 
 const sock = require('./line_socket');
-const smtp_regexp = /^([0-9]{3})([ -])(.*)/;
+
+const smtp_regexp = /^(\d{3})([ -])(.*)/;
 
 exports.register = function () {
-    const plugin = this;
 
-    plugin.load_avg_ini();
+    this.load_avg_ini();
 }
 
 exports.load_avg_ini = function () {
-    const plugin = this;
 
-    plugin.cfg = plugin.config.get('avg.ini', {
+    this.cfg = this.config.get('avg.ini', {
         booleans: [
             '+defer.timeout',
             '+defer.error',
         ],
     }, () => {
-        plugin.load_avg_ini();
+        this.load_avg_ini();
     });
 }
 
 exports.get_tmp_file = function (transaction) {
-    const plugin = this;
-    const tmpdir  = plugin.cfg.main.tmpdir || '/tmp';
+    const tmpdir  = this.cfg.main.tmpdir || '/tmp';
     return path.join(tmpdir, `${transaction.uuid}.tmp`);
 }
 
 exports.hook_data_post = function (next, connection) {
-    const plugin = this;
-    if (!connection.transaction) return next();
+    if (!connection?.transaction) return next()
 
+    const plugin = this;
     const tmpfile = plugin.get_tmp_file(connection.transaction);
     const ws      = fs.createWriteStream(tmpfile);
 
@@ -103,7 +101,7 @@ exports.hook_data_post = function (next, connection) {
             const cont = matches[2];
             const rest = matches[3];
             response.push(rest);
-            if (cont !== ' ') { return; }
+            if (cont !== ' ') return;
 
             switch (command) {
                 case 'connect':

package/plugins/backscatterer.js

@@ -5,7 +5,7 @@ exports.register = function () {
 }
 
 exports.hook_mail = function (next, connection, params) {
-    const user = ((params[0] && params[0].user) ?
+    const user = ((params[0]?.user) ?
         params[0].user.toLowerCase() : null);
     if (!(!user || user === 'postmaster')) return next();
     // Check remote IP on ips.backscatterer.org

package/plugins/block_me.js

@@ -13,15 +13,11 @@ exports.hook_data = (next, connection) => {
 }
 
 exports.hook_data_post = function (next, connection) {
-    if (!connection.relaying) {
-        return next();
-    }
+    if (!connection?.relaying || !connection?.transaction) return next();
 
     const recip = (this.config.get('block_me.recipient') || '').toLowerCase();
     const senders = this.config.get('block_me.senders', 'list');
 
-    const self = this;
-
     // Make sure only 1 recipient
     if (connection.transaction.rcpt_to.length != 1) {
         return next();
@@ -52,7 +48,7 @@ exports.hook_data_post = function (next, connection) {
     // add to mail_from.blocklist
     fs.open('./config/mail_from.blocklist', 'a', (err, fd) => {
         if (err) {
-            connection.logerror(self, `Unable to append to mail_from.blocklist: ${err}`);
+            connection.logerror(this, `Unable to append to mail_from.blocklist: ${err}`);
             return;
         }
         fs.write(fd, `${to_block}\n`, null, 'UTF-8', (err2, written) => {