nodemailer 6.7.3 → 6.7.4

package/.gitattributes

@@ -0,0 +1,6 @@
+*.js text eol=lf
+*.txt text eol=lf
+*.html text eol=lf
+*.htm text eol=lf
+*.ics -text
+*.bin -text

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 6.7.4 2022-04-29
+
+-   Ensure compatibility with Node 18
+-   Replaced Travis with Github Actions
+
 ## 6.7.3 2022-03-21
 
 -   Typo fixes

package/README.md

@@ -35,13 +35,24 @@ It's either a firewall issue, or your SMTP server blocks authentication attempts
 #### I get TLS errors
 
 -   If you are running the code on your machine, check your antivirus settings. Antiviruses often mess around with email ports usage. Node.js might not recognize the MITM cert your antivirus is using.
--   Latest Node versions allow only TLS versions 1.2 and higher. Some servers might still use TLS 1.1 or lower. Check Node.js docs on how to get correct TLS support for your app.
--   You might have the wrong value for the `secure` option. This is `true` _only_ for port 465. For every other port, it should be `false`. Setting `secure` to `false` does not mean that Nodemailer would not use TLS. Nodemailer would still try to upgrade the connection to use TLS if the server supports it.
--   Older Node versions do not support the newest Let's Encrypt certificates. Either set `tls.rejectUnauthorized` to `false` or upgrade your Node version
+-   Latest Node versions allow only TLS versions 1.2 and higher. Some servers might still use TLS 1.1 or lower. Check Node.js docs on how to get correct TLS support for your app. You can change this with [tls.minVersion](https://nodejs.org/dist/latest-v16.x/docs/api/tls.html#tls_tls_createsecurecontext_options) option
+-   You might have the wrong value for the `secure` option. This should be set to `true` only for port 465. For every other port, it should be `false`. Setting it to `false` does not mean that Nodemailer would not use TLS. Nodemailer would still try to upgrade the connection to use TLS if the server supports it.
+-   Older Node versions do not fully support the certificate chain of the newest Let's Encrypt certificates. Either set [tls.rejectUnauthorized](https://nodejs.org/dist/latest-v16.x/docs/api/tls.html#tlsconnectoptions-callback) to `false` to skip chain verification or upgrade your Node version
+
+```
+let configOptions = {
+    host: "smtp.example.com",
+    port: 587,
+    tls: {
+        rejectUnauthorized: true,
+        minVersion: "TLSv1.2"
+    }
+}
+```
 
 #### I have issues with DNS / hosts file
 
-Nodemailer uses `dns.resolve4()` and `dns.resolve6()` to resolve hostname into an IP address. If both calls fail, then Nodemailer will fall back to `dns.lookup()`. If this does not work for you, you can hard code the IP address into the configuration. In that case, Nodemailer would not perform any DNS lookups.
+Node.js uses [c-ares](https://nodejs.org/en/docs/meta/topics/dependencies/#c-ares) to resolve domain names, not the DNS library provided by the system, so if you have some custom DNS routing set up, it might be ignored. Nodemailer runs [dns.resolve4()](https://nodejs.org/dist/latest-v16.x/docs/api/dns.html#dnsresolve4hostname-options-callback) and [dns.resolve6()](https://nodejs.org/dist/latest-v16.x/docs/api/dns.html#dnsresolve6hostname-options-callback) to resolve hostname into an IP address. If both calls fail, then Nodemailer will fall back to [dns.lookup()](https://nodejs.org/dist/latest-v16.x/docs/api/dns.html#dnslookuphostname-options-callback). If this does not work for you, you can hard code the IP address into the configuration like shown below. In that case, Nodemailer would not perform any DNS lookups.
 
 ```
 let configOptions = {
@@ -55,6 +66,10 @@ let configOptions = {
 }
 ```
 
+#### I have an issue with TypeScript types
+
+Nodemailer has official support for Node.js only. For anything related to TypeScript, you need to directly contact the authors of the [type definitions](https://www.npmjs.com/package/@types/nodemailer).
+
 #### I have a different problem
 
 If you are having issues with Nodemailer, then the best way to find help would be [Stack Overflow](https://stackoverflow.com/search?q=nodemailer) or revisit the [docs](https://nodemailer.com/about/).

package/lib/dkim/index.js

@@ -54,10 +54,10 @@ class DKIMSigner {
         this.output = output;
         this.output.usingCache = false;
 
-        this.errored = false;
+        this.hasErrored = false;
 
         this.input.on('error', err => {
-            this.errored = true;
+            this.hasErrored = true;
             this.cleanup();
             output.emit('error', err);
         });
@@ -84,7 +84,7 @@ class DKIMSigner {
     }
 
     sendNextChunk() {
-        if (this.errored) {
+        if (this.hasErrored) {
             return;
         }
 
@@ -145,7 +145,7 @@ class DKIMSigner {
                     // do nothing
                 }
             });
-            this.errored = true;
+            this.hasErrored = true;
             // emit error
             this.output.emit('error', err);
         });

package/lib/fetch/index.js

@@ -11,12 +11,12 @@ const packageData = require('../../package.json');
 const MAX_REDIRECTS = 5;
 
 module.exports = function (url, options) {
-    return fetch(url, options);
+    return nmfetch(url, options);
 };
 
 module.exports.Cookies = Cookies;
 
-function fetch(url, options) {
+function nmfetch(url, options) {
     options = options || {};
 
     options.fetchRes = options.fetchRes || new PassThrough();
@@ -202,7 +202,7 @@ function fetch(url, options) {
             // redirect does not include POST body
             options.method = 'GET';
             options.body = false;
-            return fetch(urllib.resolve(url, res.headers.location), options);
+            return nmfetch(urllib.resolve(url, res.headers.location), options);
         }
 
         fetchRes.statusCode = res.statusCode;

package/lib/mime-node/index.js

@@ -13,7 +13,7 @@ const mimeFuncs = require('../mime-funcs');
 const qp = require('../qp');
 const base64 = require('../base64');
 const addressparser = require('../addressparser');
-const fetch = require('../fetch');
+const nmfetch = require('../fetch');
 const LastNewline = require('./last-newline');
 
 const LeWindows = require('./le-windows');
@@ -971,7 +971,7 @@ class MimeNode {
                 return contentStream;
             }
             // fetch URL
-            return fetch(content.href, { headers: content.httpHeaders });
+            return nmfetch(content.href, { headers: content.httpHeaders });
         } else {
             // pass string or buffer content as a stream
             contentStream = new PassThrough();

package/lib/nodemailer.js

@@ -8,7 +8,7 @@ const SendmailTransport = require('./sendmail-transport');
 const StreamTransport = require('./stream-transport');
 const JSONTransport = require('./json-transport');
 const SESTransport = require('./ses-transport');
-const fetch = require('./fetch');
+const nmfetch = require('./fetch');
 const packageData = require('../package.json');
 
 const ETHEREAL_API = (process.env.ETHEREAL_API || 'https://api.nodemailer.com').replace(/\/+$/, '');
@@ -79,7 +79,7 @@ module.exports.createTestAccount = function (apiUrl, callback) {
     let chunks = [];
     let chunklen = 0;
 
-    let req = fetch(apiUrl + '/user', {
+    let req = nmfetch(apiUrl + '/user', {
         contentType: 'application/json',
         method: 'POST',
         body: Buffer.from(

package/lib/shared/index.js

@@ -5,7 +5,7 @@
 const urllib = require('url');
 const util = require('util');
 const fs = require('fs');
-const fetch = require('../fetch');
+const nmfetch = require('../fetch');
 const dns = require('dns');
 const net = require('net');
 const os = require('os');
@@ -14,7 +14,7 @@ const DNS_TTL = 5 * 60 * 1000;
 
 const networkInterfaces = (module.exports.networkInterfaces = os.networkInterfaces());
 
-const resolver = (family, hostname, callback) => {
+const isFamilySupported = family => {
     const familySupported =
         // crux that replaces Object.values(networkInterfaces) as Object.values is not supported in nodejs v6
         Object.keys(networkInterfaces)
@@ -22,7 +22,13 @@ const resolver = (family, hostname, callback) => {
             // 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.family === 'IPv' + family).length > 0;
+            .filter(i => i.family === 'IPv' + family || i.family === family).length > 0;
+
+    return familySupported;
+};
+
+const resolver = (family, hostname, callback) => {
+    const familySupported = isFamilySupported(family);
 
     if (!familySupported) {
         return callback(null, []);
@@ -88,9 +94,9 @@ module.exports.resolveHostname = (options, callback) => {
     }
 
     let cached;
-
     if (dnsCache.has(options.host)) {
         cached = dnsCache.get(options.host);
+
         if (!cached.expires || cached.expires >= Date.now()) {
             return callback(
                 null,
@@ -124,7 +130,7 @@ module.exports.resolveHostname = (options, callback) => {
 
             dnsCache.set(options.host, {
                 value,
-                expires: Date.now() + DNS_TTL
+                expires: Date.now() + (options.dnsTtl || DNS_TTL)
             });
 
             return callback(
@@ -158,7 +164,7 @@ module.exports.resolveHostname = (options, callback) => {
 
                 dnsCache.set(options.host, {
                     value,
-                    expires: Date.now() + DNS_TTL
+                    expires: Date.now() + (options.dnsTtl || DNS_TTL)
                 });
 
                 return callback(
@@ -170,7 +176,7 @@ module.exports.resolveHostname = (options, callback) => {
             }
 
             try {
-                dns.lookup(options.host, {}, (err, address) => {
+                dns.lookup(options.host, { all: true }, (err, addresses) => {
                     if (err) {
                         if (cached) {
                             // ignore error, use expired value
@@ -185,6 +191,19 @@ module.exports.resolveHostname = (options, callback) => {
                         return callback(err);
                     }
 
+                    let address = addresses
+                        ? addresses
+                              .filter(addr => isFamilySupported(addr.family))
+                              .map(addr => addr.address)
+                              .shift()
+                        : false;
+
+                    if (addresses && addresses.length && !address) {
+                        // there are addresses but none can be used
+                        let err = new Error(`Can not use IPv${addresses[0].family} addresses with current network`);
+                        return callback(err);
+                    }
+
                     if (!address && cached) {
                         // nothing was found, fallback to cached value
                         return callback(
@@ -202,7 +221,7 @@ module.exports.resolveHostname = (options, callback) => {
 
                     dnsCache.set(options.host, {
                         value,
-                        expires: Date.now() + DNS_TTL
+                        expires: Date.now() + (options.dnsTtl || DNS_TTL)
                     });
 
                     return callback(
@@ -433,7 +452,7 @@ module.exports.resolveContent = (data, key, callback) => {
                 callback(null, value);
             });
         } else if (/^https?:\/\//i.test(content.path || content.href)) {
-            contentStream = fetch(content.path || content.href);
+            contentStream = nmfetch(content.path || content.href);
             return resolveStream(contentStream, callback);
         } else if (/^data:/i.test(content.path || content.href)) {
             let parts = (content.path || content.href).match(/^data:((?:[^;]*;)*(?:[^,]*)),(.*)$/i);

package/lib/xoauth2/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const Stream = require('stream').Stream;
-const fetch = require('../fetch');
+const nmfetch = require('../fetch');
 const crypto = require('crypto');
 const shared = require('../shared');
 
@@ -310,7 +310,7 @@ class XOAuth2 extends Stream {
         let chunks = [];
         let chunklen = 0;
 
-        let req = fetch(url, {
+        let req = nmfetch(url, {
             method: 'post',
             headers: params.customHeaders,
             body: payload,

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "nodemailer",
-    "version": "6.7.3",
+    "version": "6.7.4",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
-        "test": "grunt"
+        "test": "grunt --trace-warnings"
     },
     "repository": {
         "type": "git",
@@ -20,25 +20,25 @@
     },
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
-        "@aws-sdk/client-ses": "3.54.1",
-        "aws-sdk": "2.1096.0",
+        "@aws-sdk/client-ses": "3.79.0",
+        "aws-sdk": "2.1124.0",
         "bunyan": "1.8.15",
         "chai": "4.3.6",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "8.5.0",
-        "grunt": "1.4.1",
+        "grunt": "1.5.2",
         "grunt-cli": "1.4.3",
         "grunt-eslint": "24.0.0",
         "grunt-mocha-test": "0.13.3",
         "libbase64": "1.2.1",
-        "libmime": "5.0.0",
+        "libmime": "5.1.0",
         "libqp": "1.1.0",
         "mocha": "9.2.2",
         "nodemailer-ntlm-auth": "1.0.1",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
-        "sinon": "13.0.1",
-        "smtp-server": "3.10.0"
+        "sinon": "13.0.2",
+        "smtp-server": "3.11.0"
     },
     "engines": {
         "node": ">=6.0.0"