nodemailer 6.7.6 → 6.7.7

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 6.7.7 2022-07-06
+
+-   Resolver fixes
+
 ## 6.7.5 2022-05-04
 
 -   No changes, pushing a new README to npmjs.org

package/lib/mime-node/index.js

@@ -3,7 +3,6 @@
 'use strict';
 
 const crypto = require('crypto');
-const os = require('os');
 const fs = require('fs');
 const punycode = require('punycode');
 const PassThrough = require('stream').PassThrough;
@@ -1282,7 +1281,7 @@ class MimeNode {
             ) +
             '@' +
             // try to use the domain of the FROM address or fallback to server hostname
-            (this.getEnvelope().from || this.hostname || os.hostname() || 'localhost').split('@').pop() +
+            (this.getEnvelope().from || this.hostname || 'localhost').split('@').pop() +
             '>'
         );
     }

package/lib/shared/index.js

@@ -12,23 +12,37 @@ const os = require('os');
 
 const DNS_TTL = 5 * 60 * 1000;
 
-const networkInterfaces = (module.exports.networkInterfaces = os.networkInterfaces());
+let networkInterfaces;
+try {
+    networkInterfaces = os.networkInterfaces();
+} catch (err) {
+    // fails on some systems
+}
+
+module.exports.networkInterfaces = networkInterfaces;
+
+const isFamilySupported = (family, allowInternal) => {
+    let networkInterfaces = module.exports.networkInterfaces;
+    if (!networkInterfaces) {
+        // hope for the best
+        return true;
+    }
 
-const isFamilySupported = family => {
     const familySupported =
         // crux that replaces Object.values(networkInterfaces) as Object.values is not supported in nodejs v6
         Object.keys(networkInterfaces)
             .map(key => networkInterfaces[key])
             // crux that replaces .flat() as it is not supported in older Node versions (v10 and older)
             .reduce((acc, val) => acc.concat(val), [])
-            .filter(i => !i.internal)
+            .filter(i => !i.internal || allowInternal)
             .filter(i => i.family === 'IPv' + family || i.family === family).length > 0;
 
     return familySupported;
 };
 
-const resolver = (family, hostname, callback) => {
-    const familySupported = isFamilySupported(family);
+const resolver = (family, hostname, options, callback) => {
+    options = options || {};
+    const familySupported = isFamilySupported(family, options.allowInternalNetworkInterfaces);
 
     if (!familySupported) {
         return callback(null, []);
@@ -107,7 +121,7 @@ module.exports.resolveHostname = (options, callback) => {
         }
     }
 
-    resolver(4, options.host, (err, addresses) => {
+    resolver(4, options.host, options, (err, addresses) => {
         if (err) {
             if (cached) {
                 // ignore error, use expired value
@@ -141,7 +155,7 @@ module.exports.resolveHostname = (options, callback) => {
             );
         }
 
-        resolver(6, options.host, (err, addresses) => {
+        resolver(6, options.host, options, (err, addresses) => {
             if (err) {
                 if (cached) {
                     // ignore error, use expired value

package/lib/smtp-connection/http-proxy-client.js

@@ -44,7 +44,7 @@ function httpProxyClient(proxyUrl, destinationPort, destinationHost, callback) {
     // Error harness for initial connection. Once connection is established, the responsibility
     // to handle errors is passed to whoever uses this socket
     let finished = false;
-    let tempSocketErr = function (err) {
+    let tempSocketErr = err => {
         if (finished) {
             return;
         }
@@ -57,6 +57,12 @@ function httpProxyClient(proxyUrl, destinationPort, destinationHost, callback) {
         callback(err);
     };
 
+    let timeoutErr = () => {
+        let err = new Error('Proxy socket timed out');
+        err.code = 'ETIMEDOUT';
+        tempSocketErr(err);
+    };
+
     socket = connect(options, () => {
         if (finished) {
             return;
@@ -119,12 +125,18 @@ function httpProxyClient(proxyUrl, destinationPort, destinationHost, callback) {
                 }
 
                 socket.removeListener('error', tempSocketErr);
+                socket.removeListener('timeout', timeoutErr);
+                socket.setTimeout(0);
+
                 return callback(null, socket);
             }
         };
         socket.on('data', onSocketData);
     });
 
+    socket.setTimeout(httpProxyClient.timeout || 30 * 1000);
+    socket.on('timeout', timeoutErr);
+
     socket.once('error', tempSocketErr);
 }
 

package/lib/smtp-connection/index.js

@@ -56,6 +56,8 @@ class SMTPConnection extends EventEmitter {
         this.port = Number(this.options.port) || (this.secureConnection ? 465 : 587);
         this.host = this.options.host || 'localhost';
 
+        this.allowInternalNetworkInterfaces = this.options.allowInternalNetworkInterfaces || false;
+
         if (typeof this.options.secure === 'undefined' && this.port === 465) {
             // if secure option is not set but port is 465, then default to secure
             this.secureConnection = true;
@@ -217,7 +219,8 @@ class SMTPConnection extends EventEmitter {
 
         let opts = {
             port: this.port,
-            host: this.host
+            host: this.host,
+            allowInternalNetworkInterfaces: this.allowInternalNetworkInterfaces
         };
 
         if (this.options.localAddress) {
@@ -1755,10 +1758,16 @@ class SMTPConnection extends EventEmitter {
 
     _getHostname() {
         // defaul hostname is machine hostname or [IP]
-        let defaultHostname = os.hostname() || '';
+        let defaultHostname;
+        try {
+            defaultHostname = os.hostname() || '';
+        } catch (err) {
+            // fails on windows 7
+            defaultHostname = 'localhost';
+        }
 
         // ignore if not FQDN
-        if (defaultHostname.indexOf('.') < 0) {
+        if (!defaultHostname || defaultHostname.indexOf('.') < 0) {
             defaultHostname = '[127.0.0.1]';
         }
 

package/lib/smtp-pool/index.js

@@ -627,7 +627,7 @@ class SMTPPool extends EventEmitter {
 
                         finalize();
                     });
-                } else if (!auth && connection.allowsAuth) {
+                } else if (!auth && connection.allowsAuth && options.forceAuth) {
                     let err = new Error('Authentication info was not provided');
                     err.code = 'NoAuth';
 

package/lib/smtp-transport/index.js

@@ -18,6 +18,7 @@ class SMTPTransport extends EventEmitter {
         super();
 
         options = options || {};
+
         if (typeof options === 'string') {
             options = {
                 url: options
@@ -384,7 +385,7 @@ class SMTPTransport extends EventEmitter {
 
                         finalize();
                     });
-                } else if (!authData && connection.allowsAuth) {
+                } else if (!authData && connection.allowsAuth && options.forceAuth) {
                     let err = new Error('Authentication info was not provided');
                     err.code = 'NoAuth';
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "6.7.6",
+    "version": "6.7.7",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -20,8 +20,8 @@
     },
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
-        "@aws-sdk/client-ses": "3.118.1",
-        "aws-sdk": "2.1165.0",
+        "@aws-sdk/client-ses": "3.121.0",
+        "aws-sdk": "2.1168.0",
         "bunyan": "1.8.15",
         "chai": "4.3.6",
         "eslint-config-nodemailer": "1.2.0",