nodemailer 6.7.2 → 6.7.5

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,22 @@
 # CHANGELOG
 
+## 6.7.5 2022-05-04
+
+-   No changes, pushing a new README to npmjs.org
+
+## 6.7.4 2022-04-29
+
+-   Ensure compatibility with Node 18
+-   Replaced Travis with Github Actions
+
+## 6.7.3 2022-03-21
+
+-   Typo fixes
+-   Added stale issue automation fir Github
+-   Add Infomaniak config to well known service (popod)
+-   Update Outlook/Hotmail host in well known services (popod)
+-   fix: DSN recipient gets ignored (KornKalle)
+
 ## 6.7.2 2021-11-26
 
 -   Fix proxies for account verification
@@ -81,7 +98,7 @@
 ## 6.4.7 2020-05-28
 
 -   Always set charset=utf-8 for Content-Type headers
--   Catch error whn using invalid crypto.sign input
+-   Catch error when using invalid crypto.sign input
 
 ## 6.4.6 2020-03-20
 

package/README.md

@@ -2,15 +2,21 @@
 
 [![Nodemailer](https://raw.githubusercontent.com/nodemailer/nodemailer/master/assets/nm_logo_200x136.png)](https://nodemailer.com/about/)
 
-Send e-mails from Node.js – easy as cake! 🍰✉️
+Send emails from Node.js – easy as cake! 🍰✉️
 
 [![NPM](https://nodei.co/npm/nodemailer.png?downloads=true&downloadRank=true&stars=true)](https://nodemailer.com/about/)
 
 See [nodemailer.com](https://nodemailer.com/) for documentation and terms.
 
-## Having an issue?
+---
+
+> Check out **[EmailEngine](https://emailengine.app/?utm_source=github-nodemailer&utm_campaign=nodemailer&utm_medium=readme-link)** – a self-hosted email gateway that allows making **REST requests against IMAP and SMTP servers**. EmailEngine also sends webhooks whenever something changes on the registered accounts.\
+> \
+> Using the email accounts registered with EmailEngine, you can receive and [send emails](https://emailengine.app/sending-emails?utm_source=github-nodemailer&utm_campaign=nodemailer&utm_medium=readme-link). EmailEngine supports OAuth2, delayed sends, opens and clicks tracking, bounce detection, etc. All on top of regular email accounts without an external MTA service.
+
+---
 
-> Nodemailer supports all Node.js versions starting from Node.js@v6.0.0. Existing test suite does not support such old Node.js versions so all features are not actually tested. From time to time some regression bugs might occur because of this.
+## Having an issue?
 
 #### First review the docs
 
@@ -18,20 +24,57 @@ Documentation for Nodemailer can be found at [nodemailer.com](https://nodemailer
 
 #### Nodemailer throws a SyntaxError for "..."
 
-You are using older Node.js version than v6.0. Upgrade Node.js to get support for the spread operator.
+You are using an older Node.js version than v6.0. Upgrade Node.js to get support for the spread operator. Nodemailer supports all Node.js versions starting from Node.js@v6.0.0.
 
 #### I'm having issues with Gmail
 
-Gmail either works well or it does not work at all. It is probably easier to switch to an alternative service instead of fixing issues with Gmail. If Gmail does not work for you then don't use it. Read more about it [here](https://nodemailer.com/usage/using-gmail/).
+Gmail either works well, or it does not work at all. It is probably easier to switch to an alternative service instead of fixing issues with Gmail. If Gmail does not work for you, then don't use it. Read more about it [here](https://nodemailer.com/usage/using-gmail/).
 
 #### I get ETIMEDOUT errors
 
-Check your firewall settings. Timeout usually occurs when you try to open a connection to a port that is firewalled either on the server or on your machine.
+Check your firewall settings. Timeout usually occurs when you try to open a connection to a firewalled port either on the server or on your machine. Some ISPs also block email ports to prevent spamming.
+
+#### Nodemailer works on one machine but not in another
+
+It's either a firewall issue, or your SMTP server blocks authentication attempts from some servers.
 
 #### I get TLS errors
 
--   If you are running the code in your own machine, then 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 how to get correct TLS support for your app.
+-   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 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
+
+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 = {
+    host: "1.2.3.4",
+    port: 465,
+    secure: true,
+    tls: {
+        // must provide server name, otherwise TLS certificate check will fail
+        servername: "example.com"
+    }
+}
+```
+
+#### 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
 

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/qp/index.js

@@ -149,7 +149,7 @@ function checkRanges(nr, ranges) {
  *
  * @constructor
  * @param {Object} options Stream options
- * @param {Number} [options.lineLength=76] Maximum lenght for lines, set to false to disable wrapping
+ * @param {Number} [options.lineLength=76] Maximum length for lines, set to false to disable wrapping
  */
 class Encoder extends Transform {
     constructor(options) {

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/smtp-connection/index.js

@@ -1108,7 +1108,7 @@ class SMTPConnection extends EventEmitter {
             notify = notify.join(',');
         }
 
-        let orcpt = (params.orcpt || params.recipient || '').toString() || null;
+        let orcpt = (params.recipient || params.orcpt || '').toString() || null;
         if (orcpt && orcpt.indexOf(';') < 0) {
             orcpt = 'rfc822;' + orcpt;
         }

package/lib/well-known/services.json

@@ -72,7 +72,7 @@
     "Hotmail": {
         "aliases": ["Outlook", "Outlook.com", "Hotmail.com"],
         "domains": ["hotmail.com", "outlook.com"],
-        "host": "smtp.live.com",
+        "host": "smtp-mail.outlook.com",
         "port": 587
     },
 
@@ -83,6 +83,12 @@
         "port": 587
     },
 
+    "Infomaniak": {
+        "host": "mail.infomaniak.com",
+        "domains": ["ik.me", "ikmail.com", "etik.com"],
+        "port": 587
+    },
+
     "mail.ee": {
         "host": "smtp.mail.ee"
     },

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.2",
+    "version": "6.7.5",
     "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.41.0",
-        "aws-sdk": "2.1028.0",
+        "@aws-sdk/client-ses": "3.79.0",
+        "aws-sdk": "2.1124.0",
         "bunyan": "1.8.15",
-        "chai": "4.3.4",
+        "chai": "4.3.6",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "8.3.0",
-        "grunt": "1.4.1",
+        "eslint-config-prettier": "8.5.0",
+        "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.1.3",
+        "mocha": "9.2.2",
         "nodemailer-ntlm-auth": "1.0.1",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
-        "sinon": "12.0.1",
-        "smtp-server": "3.9.0"
+        "sinon": "13.0.2",
+        "smtp-server": "3.11.0"
     },
     "engines": {
         "node": ">=6.0.0"