nodemailer 6.4.13 → 6.4.17

package/CHANGELOG.md

@@ -1,12 +1,28 @@
 # CHANGELOG
 
+## 6.4.17 2020-12-11
+
+-   Allow mixing attachments with caendar alternatives
+
+## 6.4.16 2020-11-12
+
+-   Applied updated prettier formating rules
+
+## 6.4.15 2020-11-06
+
+-   Minor changes in header key casing
+
+## 6.4.14 2020-10-14
+
+-   Disabled postinstall script
+
 ## 6.4.13 2020-10-02
 
 -   Fix normalizeHeaderKey method for single node messages
 
 ## 6.4.12 2020-09-30
 
--   Better handling of attadhment filenames that include quote symbols
+-   Better handling of attachment filenames that include quote symbols
 -   Includes all information from the oath2 error response in the error message (Normal Gaussian) [1787f227]
 
 ## 6.4.11 2020-07-29

package/lib/dkim/message-parser.js

@@ -146,10 +146,7 @@ class MessageParser extends Transform {
         return lines
             .filter(line => line.trim())
             .map(line => ({
-                key: line
-                    .substr(0, line.indexOf(':'))
-                    .trim()
-                    .toLowerCase(),
+                key: line.substr(0, line.indexOf(':')).trim().toLowerCase(),
                 line
             }));
     }

package/lib/fetch/cookies.js

@@ -110,10 +110,7 @@ class Cookies {
             .split(';')
             .forEach(cookiePart => {
                 let valueParts = cookiePart.split('=');
-                let key = valueParts
-                    .shift()
-                    .trim()
-                    .toLowerCase();
+                let key = valueParts.shift().trim().toLowerCase();
                 let value = valueParts.join('=').trim();
                 let domain;
 

package/lib/fetch/index.js

@@ -10,7 +10,7 @@ const packageData = require('../../package.json');
 
 const MAX_REDIRECTS = 5;
 
-module.exports = function(url, options) {
+module.exports = function (url, options) {
     return fetch(url, options);
 };
 
@@ -33,11 +33,7 @@ function fetch(url, options) {
 
     let fetchRes = options.fetchRes;
     let parsed = urllib.parse(url);
-    let method =
-        (options.method || '')
-            .toString()
-            .trim()
-            .toUpperCase() || 'GET';
+    let method = (options.method || '').toString().trim().toUpperCase() || 'GET';
     let finished = false;
     let cookies;
     let body;
@@ -115,11 +111,7 @@ function fetch(url, options) {
             headers['Content-Length'] = body.length;
         }
         // if method is not provided, use POST instead of GET
-        method =
-            (options.method || '')
-                .toString()
-                .trim()
-                .toUpperCase() || 'POST';
+        method = (options.method || '').toString().trim().toUpperCase() || 'POST';
     }
 
     let req;

package/lib/mail-composer/index.js

@@ -230,9 +230,8 @@ class MailComposer {
             amp.contentType = 'text/x-amp-html; charset=utf-8';
         }
 
-        // only include the calendar alternative if there are no attachments
-        // otherwise you might end up in a blank screen on some clients
-        if (this.mail.icalEvent && !(this.mail.attachments && this.mail.attachments.length)) {
+        // NB! when including attachments with a calendar alternative you might end up in a blank screen on some clients
+        if (this.mail.icalEvent) {
             if (
                 typeof this.mail.icalEvent === 'object' &&
                 (this.mail.icalEvent.content || this.mail.icalEvent.path || this.mail.icalEvent.href || this.mail.icalEvent.raw)

package/lib/mailer/mail-message.js

@@ -64,12 +64,7 @@ class MailMessage {
         if (this.data.attachments && this.data.attachments.length) {
             this.data.attachments.forEach((attachment, i) => {
                 if (!attachment.filename) {
-                    attachment.filename =
-                        (attachment.path || attachment.href || '')
-                            .split('/')
-                            .pop()
-                            .split('?')
-                            .shift() || 'attachment-' + (i + 1);
+                    attachment.filename = (attachment.path || attachment.href || '').split('/').pop().split('?').shift() || 'attachment-' + (i + 1);
                     if (attachment.filename.indexOf('.') < 0) {
                         attachment.filename += '.' + mimeFuncs.detectExtension(attachment.contentType);
                     }

package/lib/mime-funcs/mime-types.js

@@ -2063,11 +2063,7 @@ module.exports = {
         }
 
         let parsed = path.parse(filename);
-        let extension = (parsed.ext.substr(1) || parsed.name || '')
-            .split('?')
-            .shift()
-            .trim()
-            .toLowerCase();
+        let extension = (parsed.ext.substr(1) || parsed.name || '').split('?').shift().trim().toLowerCase();
         let value = defaultMimeType;
 
         if (extensions.has(extension)) {
@@ -2084,10 +2080,7 @@ module.exports = {
         if (!mimeType) {
             return defaultExtension;
         }
-        let parts = (mimeType || '')
-            .toLowerCase()
-            .trim()
-            .split('/');
+        let parts = (mimeType || '').toLowerCase().trim().split('/');
         let rootType = parts.shift().trim();
         let subType = parts.join('/').trim();
 

package/lib/mime-node/index.js

@@ -999,7 +999,7 @@ class MimeNode {
             .trim()
             .toLowerCase()
             // use uppercase words, except MIME
-            .replace(/^X-SMTPAPI$|^(MIME|DKIM)\b|^[a-z]|-(SPF|FBL|ID|MD5)$|-[a-z]/gi, c => c.toUpperCase())
+            .replace(/^X-SMTPAPI$|^(MIME|DKIM|ARC|BIMI)\b|^[a-z]|-(SPF|FBL|ID|MD5)$|-[a-z]/gi, c => c.toUpperCase())
             // special case
             .replace(/^Content-Features$/i, 'Content-features');
 

package/lib/nodemailer.js

@@ -13,16 +13,11 @@ const packageData = require('../package.json');
 
 const ETHEREAL_API = (process.env.ETHEREAL_API || 'https://api.nodemailer.com').replace(/\/+$/, '');
 const ETHEREAL_WEB = (process.env.ETHEREAL_WEB || 'https://ethereal.email').replace(/\/+$/, '');
-const ETHEREAL_CACHE = ['true', 'yes', 'y', '1'].includes(
-    (process.env.ETHEREAL_CACHE || 'yes')
-        .toString()
-        .trim()
-        .toLowerCase()
-);
+const ETHEREAL_CACHE = ['true', 'yes', 'y', '1'].includes((process.env.ETHEREAL_CACHE || 'yes').toString().trim().toLowerCase());
 
 let testAccount = false;
 
-module.exports.createTransport = function(transporter, defaults) {
+module.exports.createTransport = function (transporter, defaults) {
     let urlConfig;
     let options;
     let mailer;
@@ -60,7 +55,7 @@ module.exports.createTransport = function(transporter, defaults) {
     return mailer;
 };
 
-module.exports.createTestAccount = function(apiUrl, callback) {
+module.exports.createTestAccount = function (apiUrl, callback) {
     let promise;
 
     if (!callback && typeof apiUrl === 'function') {
@@ -128,7 +123,7 @@ module.exports.createTestAccount = function(apiUrl, callback) {
     return promise;
 };
 
-module.exports.getTestMessageUrl = function(info) {
+module.exports.getTestMessageUrl = function (info) {
     if (!info || !info.response) {
         return false;
     }

package/lib/sendmail-transport/index.js

@@ -70,6 +70,14 @@ class SendmailTransport {
         let returned;
         let transform;
 
+        const hasInvalidAddresses = []
+            .concat(envelope.from || [])
+            .concat(envelope.to || [])
+            .some(addr => /^-/.test(addr));
+        if (hasInvalidAddresses) {
+            return done(new Error('Can not send mail. Invalid envelope addresses.'));
+        }
+
         if (this.args) {
             // force -i to keep single dots
             args = ['-i'].concat(this.args).concat(envelope.to);

package/lib/ses-transport/index.js

@@ -38,7 +38,7 @@ class SESTransport extends EventEmitter {
         // max messages per second
         this.sendingRate = Number(this.options.sendingRate) || Infinity;
         this.sendingRateTTL = null;
-        this.rateInterval = 1000;
+        this.rateInterval = 1000; // milliseconds
         this.rateMessages = [];
 
         this.pending = [];

package/lib/shared/index.js

@@ -276,7 +276,7 @@ module.exports.getLogger = (options, defaults) => {
  * @param {Function} reject Function to run if callback ends with an error
  */
 module.exports.callbackPromise = (resolve, reject) =>
-    function() {
+    function () {
         let args = Array.from(arguments);
         let err = args.shift();
         if (err) {
@@ -357,7 +357,7 @@ module.exports.resolveContent = (data, key, callback) => {
 /**
  * Copies properties from source objects to target objects
  */
-module.exports.assign = function(/* target, ... sources */) {
+module.exports.assign = function (/* target, ... sources */) {
     let args = Array.from(arguments);
     let target = args.shift() || {};
 
@@ -489,15 +489,7 @@ function createDefaultLogger(levels) {
 
         message = util.format(message, ...args);
         message.split(/\r?\n/).forEach(line => {
-            console.log(
-                '[%s] %s %s',
-                new Date()
-                    .toISOString()
-                    .substr(0, 19)
-                    .replace(/T/, ' '),
-                levelNames.get(level),
-                prefix + line
-            );
+            console.log('[%s] %s %s', new Date().toISOString().substr(0, 19).replace(/T/, ' '), levelNames.get(level), prefix + line);
         });
     };
 

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 = function (err) {
         if (finished) {
             return;
         }

package/lib/smtp-connection/index.js

@@ -45,10 +45,7 @@ class SMTPConnection extends EventEmitter {
     constructor(options) {
         super(options);
 
-        this.id = crypto
-            .randomBytes(8)
-            .toString('base64')
-            .replace(/\W/g, '');
+        this.id = crypto.randomBytes(8).toString('base64').replace(/\W/g, '');
         this.stage = 'init';
 
         this.options = options || {};
@@ -73,10 +70,7 @@ class SMTPConnection extends EventEmitter {
 
         this.customAuth = new Map();
         Object.keys(this.options.customAuth || {}).forEach(key => {
-            let mapKey = (key || '')
-                .toString()
-                .trim()
-                .toUpperCase();
+            let mapKey = (key || '').toString().trim().toUpperCase();
             if (!mapKey) {
                 return;
             }
@@ -424,11 +418,7 @@ class SMTPConnection extends EventEmitter {
 
         this._auth = authData || {};
         // Select SASL authentication method
-        this._authMethod =
-            (this._auth.method || '')
-                .toString()
-                .trim()
-                .toUpperCase() || false;
+        this._authMethod = (this._auth.method || '').toString().trim().toUpperCase() || false;
 
         if (!this._authMethod && this._auth.oauth2 && !this._auth.credentials) {
             this._authMethod = 'XOAUTH2';
@@ -598,7 +588,7 @@ class SMTPConnection extends EventEmitter {
 
         // ensure that callback is only called once
         let returned = false;
-        let callback = function() {
+        let callback = function () {
             if (returned) {
                 return;
             }

package/lib/well-known/index.js

@@ -41,7 +41,7 @@ function normalizeService(service) {
  * @param {String} key [description]
  * @returns {Object} SMTP config or false if not found
  */
-module.exports = function(key) {
+module.exports = function (key) {
     key = normalizeKey(key.split('@').pop());
     return normalized[key] || false;
 };

package/lib/well-known/services.json

@@ -23,6 +23,12 @@
         "port": 25
     },
 
+    "Ethereal": {
+        "aliases": ["ethereal.email"],
+        "host": "smtp.ethereal.email",
+        "port": 587
+    },
+
     "FastMail": {
         "domains": ["fastmail.fm"],
         "host": "smtp.fastmail.com",

package/lib/xoauth2/index.js

@@ -263,11 +263,11 @@ class XOAuth2 extends Stream {
             if (data.error) {
                 // Error Response : https://tools.ietf.org/html/rfc6749#section-5.2
                 let errorMessage = data.error;
-                if(data.error_description) {
-                  errorMessage += ': ' + data.error_description;
+                if (data.error_description) {
+                    errorMessage += ': ' + data.error_description;
                 }
-                if(data.error_uri) {
-                  errorMessage += ' (' + data.error_uri + ')';
+                if (data.error_uri) {
+                    errorMessage += ' (' + data.error_uri + ')';
                 }
                 return callback(new Error(errorMessage));
             }

package/package.json

@@ -1,11 +1,10 @@
 {
     "name": "nodemailer",
-    "version": "6.4.13",
+    "version": "6.4.17",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
-        "test": "grunt",
-        "postinstall": "node -e \"try{require('./postinstall')}catch(e){}\""
+        "test": "grunt"
     },
     "repository": {
         "type": "git",
@@ -24,7 +23,7 @@
         "bunyan": "1.8.14",
         "chai": "4.2.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "6.12.0",
+        "eslint-config-prettier": "7.0.0",
         "grunt": "1.3.0",
         "grunt-cli": "1.3.2",
         "grunt-eslint": "23.0.0",
@@ -32,12 +31,12 @@
         "libbase64": "1.2.1",
         "libmime": "5.0.0",
         "libqp": "1.1.0",
-        "mocha": "8.1.3",
+        "mocha": "8.2.1",
         "nodemailer-ntlm-auth": "1.0.1",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
-        "sinon": "9.1.0",
-        "smtp-server": "3.7.0"
+        "sinon": "9.2.1",
+        "smtp-server": "3.8.0"
     },
     "engines": {
         "node": ">=6.0.0"