Haraka 3.1.0 → 3.1.2

package/plugins/toobusy.js

@@ -1,49 +1,47 @@
 // Stop accepting new connections when we are too busy
 
-let toobusy;
-let was_busy = false;
+let toobusy
+let was_busy = false
 
 exports.register = function () {
-
     try {
-        toobusy = require('toobusy-js');
-    }
-    catch (e) {
-        this.logerror(e);
-        this.logerror("try: 'npm install -g toobusy-js'");
-        return;
+        toobusy = require('toobusy-js')
+    } catch (e) {
+        this.logerror(e)
+        this.logerror("try: 'npm install -g toobusy-js'")
+        return
     }
 
-    this.loadConfig();
+    this.loadConfig()
 
-    this.register_hook('connect', 'check_busy', -100);
+    this.register_hook('connect', 'check_busy', -100)
 }
 
 exports.loadConfig = function () {
-    let maxLag = this.config.get('toobusy.maxlag','value', () => {
-        this.loadConfig();
-    });
+    let maxLag = this.config.get('toobusy.maxlag', 'value', () => {
+        this.loadConfig()
+    })
 
-    maxLag = parseInt(maxLag);
+    maxLag = parseInt(maxLag)
     if (maxLag) {
         // This will throw an exception on error
-        toobusy.maxLag(maxLag);
+        toobusy.maxLag(maxLag)
     }
 }
 
 exports.check_busy = function (next, connection) {
     if (!toobusy()) {
-        was_busy = false;
-        return next();
+        was_busy = false
+        return next()
     }
 
     if (!was_busy) {
-        was_busy = true;
+        was_busy = true
         // Log a CRIT error at the first occurrence
-        const currentLag = toobusy.lag();
-        const maxLag = toobusy.maxLag();
-        this.logcrit(`deferring connections: lag=${currentLag} max=${maxLag}`);
+        const currentLag = toobusy.lag()
+        const maxLag = toobusy.maxLag()
+        this.logcrit(`deferring connections: lag=${currentLag} max=${maxLag}`)
     }
 
-    return next(DENYSOFTDISCONNECT, 'Too busy; please try again later');
+    return next(DENYSOFTDISCONNECT, 'Too busy; please try again later')
 }

package/plugins/xclient.js

@@ -1,124 +1,122 @@
 // Implementation of XCLIENT protocol
 // See http://www.postfix.org/XCLIENT_README.html
 
-const net = require('node:net');
+const net = require('node:net')
 
-const utils = require('haraka-utils');
-const DSN = require('haraka-dsn');
-let allowed_hosts = {};
+const utils = require('haraka-utils')
+const DSN = require('haraka-dsn')
+let allowed_hosts = {}
 
 exports.register = function () {
-    this.load_xclient_hosts();
+    this.load_xclient_hosts()
 }
 
 exports.load_xclient_hosts = function () {
     const cfg = this.config.get('xclient.hosts', 'list', () => {
-        this.load_xclient_hosts();
-    });
-    const ah = {};
+        this.load_xclient_hosts()
+    })
+    const ah = {}
     for (const i in cfg) {
-        ah[cfg[i]] = true;
+        ah[cfg[i]] = true
     }
-    allowed_hosts = ah;
+    allowed_hosts = ah
 }
 
-function xclient_allowed (ip) {
-    return !!(ip === '127.0.0.1' || ip === '::1' || allowed_hosts[ip]);
+function xclient_allowed(ip) {
+    return !!(ip === '127.0.0.1' || ip === '::1' || allowed_hosts[ip])
 }
 
 exports.hook_capabilities = (next, connection) => {
     if (xclient_allowed(connection.remote.ip)) {
-        connection.capabilities.push('XCLIENT NAME ADDR PROTO HELO LOGIN');
+        connection.capabilities.push('XCLIENT NAME ADDR PROTO HELO LOGIN')
     }
-    next();
+    next()
 }
 
 exports.hook_unrecognized_command = function (next, connection, params) {
-    if (params[0] !== 'XCLIENT') return next();
+    if (params[0] !== 'XCLIENT') return next()
 
     // XCLIENT is not allowed after transaction start
     if (connection?.transaction) {
-        return next(DENY, DSN.proto_unspecified('Mail transaction in progress', 503));
+        return next(DENY, DSN.proto_unspecified('Mail transaction in progress', 503))
     }
 
-    if (!(xclient_allowed(connection?.remote?.ip))) {
-        return next(DENY, DSN.proto_unspecified('Not authorized', 550));
+    if (!xclient_allowed(connection?.remote?.ip)) {
+        return next(DENY, DSN.proto_unspecified('Not authorized', 550))
     }
 
     // If we get here - the client is allowed to use XCLIENT
     // Process arguments
-    const args = (new String(params[1])).toLowerCase().split(/ /);
-    const xclient = {};
+    const args = new String(params[1]).toLowerCase().split(/ /)
+    const xclient = {}
     for (const arg of args) {
-        const match = /^([^=]+)=([^ ]+)/.exec(arg);
+        const match = /^([^=]+)=([^ ]+)/.exec(arg)
         if (match) {
-            connection.logdebug(this, `found key=${match[1]} value=${match[2]}`);
+            connection.logdebug(this, `found key=${match[1]} value=${match[2]}`)
             switch (match[1]) {
                 case 'destaddr':
                 case 'addr': {
                     // IPv6 is prefixed in the XCLIENT protocol
-                    let ipv6;
+                    let ipv6
                     if ((ipv6 = /^IPV6:(.+)$/i.exec(match[2]))) {
                         // Validate
                         if (net.isIPv6(ipv6[1])) {
-                            xclient[match[1]] = ipv6[1];
+                            xclient[match[1]] = ipv6[1]
                         }
-                    }
-                    else if (!/\[UNAVAILABLE\]/i.test(match[2])) {
+                    } else if (!/\[UNAVAILABLE\]/i.test(match[2])) {
                         // IPv4
                         if (net.isIPv4(match[2])) {
-                            xclient[match[1]] = match[2];
+                            xclient[match[1]] = match[2]
                         }
                     }
-                    break;
+                    break
                 }
                 case 'proto':
                     // SMTP or ESMTP
                     if (/^e?smtp/i.test(match[2])) {
-                        xclient[match[1]] = match[2];
+                        xclient[match[1]] = match[2]
                     }
-                    break;
+                    break
                 case 'name':
                 case 'port':
                 case 'helo':
                 case 'login':
                 case 'destport':
                     if (!/\[(UNAVAILABLE|TEMPUNAVAIL)\]/i.test(match[2])) {
-                        xclient[match[1]] = match[2];
+                        xclient[match[1]] = match[2]
                     }
-                    break;
+                    break
                 default:
-                    connection.logwarn(this, `unknown argument: ${arg}`);
+                    connection.logwarn(this, `unknown argument: ${arg}`)
             }
-        }
-        else {
-            connection.logwarn(this, `unknown argument: ${arg}`);
+        } else {
+            connection.logwarn(this, `unknown argument: ${arg}`)
         }
     }
 
     // Abort if we don't have a valid IP address
     if (!xclient.addr) {
-        return next(DENY, DSN.proto_invalid_cmd_args('No valid IP address found', 501));
+        return next(DENY, DSN.proto_invalid_cmd_args('No valid IP address found', 501))
     }
 
     // Apply changes
-    const new_uuid = utils.uuid();
-    connection.loginfo(this, `new uuid=${new_uuid}`);
-    connection.uuid = new_uuid;
-    connection.reset_transaction();
-    connection.relaying = false;
-    connection.set('remote.ip', xclient.addr);
-    connection.set('remote.host', ((xclient.name) ? xclient.name : undefined));
-    connection.set('remote.login', ((xclient.login) ? xclient.login : undefined));
-    connection.set('hello.host', ((xclient.helo) ? xclient.helo : undefined));
-    connection.set('local.ip', ((xclient.destaddr) ? xclient.destaddr : undefined));
-    connection.set('local.port', ((xclient.destport) ? xclient.destport: undefined));
+    const new_uuid = utils.uuid()
+    connection.loginfo(this, `new uuid=${new_uuid}`)
+    connection.uuid = new_uuid
+    connection.reset_transaction()
+    connection.relaying = false
+    connection.set('remote.ip', xclient.addr)
+    connection.set('remote.host', xclient.name ? xclient.name : undefined)
+    connection.set('remote.login', xclient.login ? xclient.login : undefined)
+    connection.set('hello.host', xclient.helo ? xclient.helo : undefined)
+    connection.set('local.ip', xclient.destaddr ? xclient.destaddr : undefined)
+    connection.set('local.port', xclient.destport ? xclient.destport : undefined)
     if (xclient.proto) {
-        connection.set('hello', 'verb', ((xclient.proto === 'esmtp') ? 'EHLO' : 'HELO'));
+        connection.set('hello', 'verb', xclient.proto === 'esmtp' ? 'EHLO' : 'HELO')
     }
-    connection.esmtp = (xclient.proto === 'esmtp');
-    connection.xclient = true;
-    if (!xclient.name) return next(NEXT_HOOK, 'lookup_rdns');
+    connection.esmtp = xclient.proto === 'esmtp'
+    connection.xclient = true
+    if (!xclient.name) return next(NEXT_HOOK, 'lookup_rdns')
 
-    next(NEXT_HOOK, 'connect');
+    next(NEXT_HOOK, 'connect')
 }