nodemailer 6.9.12 → 6.9.14

package/.ncurc.js

@@ -2,6 +2,9 @@ module.exports = {
     upgrade: true,
     reject: [
         // API changes break existing tests
-        'proxy'
+        'proxy',
+
+        // API changes
+        'eslint'
     ]
 };

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # CHANGELOG
 
+## [6.9.14](https://github.com/nodemailer/nodemailer/compare/v6.9.13...v6.9.14) (2024-06-19)
+
+
+### Bug Fixes
+
+* **api:** Added support for Ethereal authentication ([56b2205](https://github.com/nodemailer/nodemailer/commit/56b22052a98de9e363f6c4d26d1512925349c3f3))
+* **services.json:** Add Email Services Provider Feishu Mail (CN) ([#1648](https://github.com/nodemailer/nodemailer/issues/1648)) ([e9e9ecc](https://github.com/nodemailer/nodemailer/commit/e9e9ecc99b352948a912868c7912b280a05178c6))
+* **services.json:** update Mailtrap host and port in well known ([#1652](https://github.com/nodemailer/nodemailer/issues/1652)) ([fc2c9ea](https://github.com/nodemailer/nodemailer/commit/fc2c9ea0b4c4f4e514143d2a138c9a23095fc827))
+* **well-known-services:** Add Loopia in well known services ([#1655](https://github.com/nodemailer/nodemailer/issues/1655)) ([21a28a1](https://github.com/nodemailer/nodemailer/commit/21a28a18fc9fdf8e0e86ddd846e54641395b2cb6))
+
+## [6.9.13](https://github.com/nodemailer/nodemailer/compare/v6.9.12...v6.9.13) (2024-03-20)
+
+
+### Bug Fixes
+
+* **tls:** Ensure servername for SMTP ([d66fdd3](https://github.com/nodemailer/nodemailer/commit/d66fdd3dccacc4bc79d697fe9009204cc8d4bde0))
+
 ## [6.9.12](https://github.com/nodemailer/nodemailer/compare/v6.9.11...v6.9.12) (2024-03-08)
 
 

package/lib/nodemailer.js

@@ -13,6 +13,7 @@ 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_API_KEY = (process.env.ETHEREAL_API_KEY || '').replace(/\s*/g, '') || null;
 const ETHEREAL_CACHE = ['true', 'yes', 'y', '1'].includes((process.env.ETHEREAL_CACHE || 'yes').toString().trim().toLowerCase());
 
 let testAccount = false;
@@ -79,15 +80,21 @@ module.exports.createTestAccount = function (apiUrl, callback) {
     let chunks = [];
     let chunklen = 0;
 
+    let requestHeaders = {};
+    let requestBody = {
+        requestor: packageData.name,
+        version: packageData.version
+    };
+
+    if (ETHEREAL_API_KEY) {
+        requestHeaders.Authorization = 'Bearer ' + ETHEREAL_API_KEY;
+    }
+
     let req = nmfetch(apiUrl + '/user', {
         contentType: 'application/json',
         method: 'POST',
-        body: Buffer.from(
-            JSON.stringify({
-                requestor: packageData.name,
-                version: packageData.version
-            })
-        )
+        headers: requestHeaders,
+        body: Buffer.from(JSON.stringify(requestBody))
     });
 
     req.on('readable', () => {

package/lib/smtp-connection/index.js

@@ -58,6 +58,8 @@ class SMTPConnection extends EventEmitter {
         this.port = Number(this.options.port) || (this.secureConnection ? 465 : 587);
         this.host = this.options.host || 'localhost';
 
+        this.servername = this.options.servername ? this.options.servername : !net.isIP(this.host) ? this.host : false;
+
         this.allowInternalNetworkInterfaces = this.options.allowInternalNetworkInterfaces || false;
 
         if (typeof this.options.secure === 'undefined' && this.port === 465) {
@@ -296,6 +298,12 @@ class SMTPConnection extends EventEmitter {
                     opts[key] = this.options.tls[key];
                 });
             }
+
+            // ensure servername for SNI
+            if (this.servername && !opts.servername) {
+                opts.servername = this.servername;
+            }
+
             return shared.resolveHostname(opts, (err, resolved) => {
                 if (err) {
                     return setImmediate(() => this._onError(err, 'EDNS', false, 'CONN'));
@@ -904,6 +912,11 @@ class SMTPConnection extends EventEmitter {
             opts[key] = this.options.tls[key];
         });
 
+        // ensure servername for SNI
+        if (this.servername && !opts.servername) {
+            opts.servername = this.servername;
+        }
+
         this.upgrading = true;
         // tls.connect is not an asynchronous function however it may still throw errors and requires to be wrapped with try/catch
         try {

package/lib/well-known/services.json

@@ -57,6 +57,14 @@
         "secure": true
     },
 
+    "Feishu Mail": {
+        "aliases": ["Feishu", "FeishuMail"],
+        "domains": ["www.feishu.cn"],
+        "host": "smtp.feishu.cn",
+        "port": 465,
+        "secure": true
+    },
+
     "GandiMail": {
         "aliases": ["Gandi", "Gandi Mail"],
         "host": "mail.gandi.net",
@@ -109,7 +117,10 @@
         "domains": ["ik.me", "ikmail.com", "etik.com"],
         "port": 587
     },
-
+    "Loopia": {
+        "host": "mailcluster.loopia.se",
+        "port": 465
+    },
     "mail.ee": {
         "host": "smtp.mail.ee"
     },
@@ -147,8 +158,8 @@
     },
 
     "Mailtrap": {
-        "host": "smtp.mailtrap.io",
-        "port": 2525
+        "host": "live.smtp.mailtrap.io",
+        "port": 587
     },
 
     "Mandrill": {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "6.9.12",
+    "version": "6.9.14",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -23,19 +23,19 @@
     },
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
-        "@aws-sdk/client-ses": "3.529.1",
+        "@aws-sdk/client-ses": "3.600.0",
         "bunyan": "1.8.15",
-        "c8": "9.1.0",
+        "c8": "10.1.2",
         "eslint": "8.57.0",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "9.1.0",
         "libbase64": "1.3.0",
-        "libmime": "5.3.4",
+        "libmime": "5.3.5",
         "libqp": "2.1.0",
         "nodemailer-ntlm-auth": "1.0.4",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
-        "smtp-server": "3.13.3"
+        "smtp-server": "3.13.4"
     },
     "engines": {
         "node": ">=6.0.0"