nodemailer 6.9.14 → 6.9.16

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## [6.9.16](https://github.com/nodemailer/nodemailer/compare/v6.9.15...v6.9.16) (2024-10-28)
+
+
+### Bug Fixes
+
+* **addressparser:** Correctly detect if user local part is attached to domain part ([f2096c5](https://github.com/nodemailer/nodemailer/commit/f2096c51b92a69ecfbcc15884c28cb2c2f00b826))
+
+## [6.9.15](https://github.com/nodemailer/nodemailer/compare/v6.9.14...v6.9.15) (2024-08-08)
+
+
+### Bug Fixes
+
+* Fix memory leak ([#1667](https://github.com/nodemailer/nodemailer/issues/1667)) ([baa28f6](https://github.com/nodemailer/nodemailer/commit/baa28f659641a4bc30360633673d851618f8e8bd))
+* **mime:** Added GeoJSON closes [#1637](https://github.com/nodemailer/nodemailer/issues/1637) ([#1665](https://github.com/nodemailer/nodemailer/issues/1665)) ([79b8293](https://github.com/nodemailer/nodemailer/commit/79b8293ad557d36f066b4675e649dd80362fd45b))
+
 ## [6.9.14](https://github.com/nodemailer/nodemailer/compare/v6.9.13...v6.9.14) (2024-06-19)
 
 

package/lib/addressparser/index.js

@@ -7,7 +7,6 @@
  * @return {Object} Address object
  */
 function _handleAddress(tokens) {
-    let token;
     let isGroup = false;
     let state = 'text';
     let address;
@@ -23,7 +22,8 @@ function _handleAddress(tokens) {
 
     // Filter out <addresses>, (comments) and regular text
     for (i = 0, len = tokens.length; i < len; i++) {
-        token = tokens[i];
+        let token = tokens[i];
+        let prevToken = i ? tokens[i - 1] : null;
         if (token.type === 'operator') {
             switch (token.value) {
                 case '<':
@@ -38,6 +38,7 @@ function _handleAddress(tokens) {
                     break;
                 default:
                     state = 'text';
+                    break;
             }
         } else if (token.value) {
             if (state === 'address') {
@@ -46,7 +47,13 @@ function _handleAddress(tokens) {
                 // and so will we
                 token.value = token.value.replace(/^[^<]*<\s*/, '');
             }
-            data[state].push(token.value);
+
+            if (prevToken && prevToken.noBreak && data[state].length) {
+                // join values
+                data[state][data[state].length - 1] += token.value;
+            } else {
+                data[state].push(token.value);
+            }
         }
     }
 
@@ -172,11 +179,12 @@ class Tokenizer {
      * @return {Array} An array of operator|text tokens
      */
     tokenize() {
-        let chr,
-            list = [];
+        let list = [];
+
         for (let i = 0, len = this.str.length; i < len; i++) {
-            chr = this.str.charAt(i);
-            this.checkChar(chr);
+            let chr = this.str.charAt(i);
+            let nextChr = i < len - 1 ? this.str.charAt(i + 1) : null;
+            this.checkChar(chr, nextChr);
         }
 
         this.list.forEach(node => {
@@ -194,7 +202,7 @@ class Tokenizer {
      *
      * @param {String} chr Character from the address field
      */
-    checkChar(chr) {
+    checkChar(chr, nextChr) {
         if (this.escaped) {
             // ignore next condition blocks
         } else if (chr === this.operatorExpecting) {
@@ -202,10 +210,16 @@ class Tokenizer {
                 type: 'operator',
                 value: chr
             };
+
+            if (nextChr && ![' ', '\t', '\r', '\n', ',', ';'].includes(nextChr)) {
+                this.node.noBreak = true;
+            }
+
             this.list.push(this.node);
             this.node = null;
             this.operatorExpecting = '';
             this.escaped = false;
+
             return;
         } else if (!this.operatorExpecting && chr in this.operators) {
             this.node = {

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

@@ -44,6 +44,7 @@ const mimeTypes = new Map([
     ['application/fractals', 'fif'],
     ['application/freeloader', 'frl'],
     ['application/futuresplash', 'spl'],
+    ['application/geo+json', 'geojson'],
     ['application/gnutar', 'tgz'],
     ['application/groupwise', 'vew'],
     ['application/hlp', 'hlp'],
@@ -1287,6 +1288,7 @@ const extensions = new Map([
     ['gac', 'application/vnd.groove-account'],
     ['gdl', 'model/vnd.gdl'],
     ['geo', 'application/vnd.dynageo'],
+    ['geojson', 'application/geo+json'],
     ['gex', 'application/vnd.geometry-explorer'],
     ['ggb', 'application/vnd.geogebra.file'],
     ['ggt', 'application/vnd.geogebra.tool'],

package/lib/smtp-connection/index.js

@@ -628,6 +628,15 @@ class SMTPConnection extends EventEmitter {
         let startTime = Date.now();
         this._setEnvelope(envelope, (err, info) => {
             if (err) {
+                // create passthrough stream to consume to prevent OOM
+                let stream = new PassThrough();
+                if (typeof message.pipe === 'function') {
+                    message.pipe(stream);
+                } else {
+                    stream.write(message);
+                    stream.end();
+                }
+                
                 return callback(err);
             }
             let envelopeTime = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "6.9.14",
+    "version": "6.9.16",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -23,7 +23,7 @@
     },
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
-        "@aws-sdk/client-ses": "3.600.0",
+        "@aws-sdk/client-ses": "3.679.0",
         "bunyan": "1.8.15",
         "c8": "10.1.2",
         "eslint": "8.57.0",
@@ -35,7 +35,7 @@
         "nodemailer-ntlm-auth": "1.0.4",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
-        "smtp-server": "3.13.4"
+        "smtp-server": "3.13.6"
     },
     "engines": {
         "node": ">=6.0.0"