Haraka 3.0.3 → 3.0.4

package/outbound/client_pool.js

@@ -1,48 +1,52 @@
 'use strict';
 
-const utils        = require('haraka-utils');
+const utils = require('haraka-utils');
+const net_utils = require('haraka-net-utils')
 
-const sock         = require('../line_socket');
-const logger       = require('../logger');
+const tls_socket = require('../tls_socket');
+const logger = require('../logger');
+const obc  = require('./config');
 
-const obc          = require('./config');
+exports.name = 'outbound'
 
-function _create_socket (name, port, host, local_addr, is_unix_socket, callback) {
+// Get a socket for the given attributes.
+exports.get_client = function (mx, callback) {
+    const socketArgs = mx.path ? { path: mx.path } : { port: mx.port, host: mx.exchange, localAddress: mx.bind };
+
+    const socket = tls_socket.connect(socketArgs);
+    net_utils.add_line_processor(socket);
 
-    const socket = is_unix_socket ? sock.connect({path: host}) : sock.connect({port, host, localAddress: local_addr});
-    socket.name = name;
+    socket.name = `outbound::${JSON.stringify(socketArgs)}`;
     socket.__uuid = utils.uuid();
     socket.setTimeout(obc.cfg.connect_timeout * 1000);
-    logger.logdebug(`[outbound] created. host: ${host} port: ${port}`, { uuid: socket.__uuid });
+
+    logger.debug(exports, `created ${socket.name}`, { uuid: socket.__uuid });
+
     socket.once('connect', () => {
         socket.removeAllListeners('error'); // these get added after callback
         socket.removeAllListeners('timeout');
         callback(null, socket);
-    });
+    })
+
     socket.once('error', err => {
         socket.end();
         socket.removeAllListeners();
         socket.destroy();
-        callback(`Outbound connection error: ${err}`, null);
-    });
+        callback(err.message, null);
+    })
+
     socket.once('timeout', () => {
         socket.end();
         socket.removeAllListeners();
         socket.destroy();
-        callback(`Outbound connection timed out to ${host}:${port}`, null);
-    });
-}
-
-
-// Get a socket for the given attributes.
-exports.get_client = (port = 25, host = 'localhost', local_addr, is_unix_socket, callback) => {
-    const name = `outbound::${port}:${host}:${local_addr}`;
-
-    _create_socket(name, port, host, local_addr, is_unix_socket, callback)
+        callback(`connection timed out to ${socket.name}`, null);
+    })
 }
 
-exports.release_client = (socket, port, host, local_addr, error) => {
-    logger.logdebug(`[outbound] release_client: ${socket.__uuid} ${host}:${port} to ${local_addr}`);
+exports.release_client = (socket, mx) => {
+    let logMsg = `release_client: ${socket.name}`
+    if (mx.bind) logMsg += ` from ${mx.bind}`
+    logger.debug(exports, logMsg);
     socket.removeAllListeners();
     socket.destroy();
 }

package/outbound/config.js

@@ -3,13 +3,14 @@
 const config = require('haraka-config');
 const logger = require('../logger');
 
+exports.name = 'outbound/config'
+
 function load_config () {
     const cfg = exports.cfg = config.get('outbound.ini', {
         booleans: [
             '-disabled',
             '-always_split',
             '+enable_tls',
-            '-ipv6_enabled',
             '-local_mx_ok',
         ],
     }, () => {
@@ -35,9 +36,6 @@ function load_config () {
     if (!cfg.connect_timeout) {
         cfg.connect_timeout = 30;
     }
-    if (!cfg.ipv6_enabled && config.get('outbound.ipv6_enabled')) {
-        cfg.ipv6_enabled = true;
-    }
     if (!cfg.received_header) {
         cfg.received_header = config.get('outbound.received_header') || 'Haraka outbound';
     }
@@ -64,8 +62,8 @@ exports.set_temp_fail_intervals = function () {
 
     // Helpful error function in case of parsing failure
     function error (i, msg) {
-        logger.logerror(`outbound temp_fail_intervals syntax error parsing element ${i}: ${msg}`);
-        logger.logwarn('Setting outbound temp_fail_intervals to old defaults because of previous error');
+        logger.error(exports, `temp_fail_intervals syntax error parsing element ${i}: ${msg}`);
+        logger.warn(exports, 'Setting outbound temp_fail_intervals to old defaults');
         set_old_defaults();
     }
 

package/outbound/fsync_writestream.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const fs      = require('fs');
+const fs = require('node:fs');
 
 class FsyncWriteStream extends fs.WriteStream {
     constructor (path, options) {