nodemailer 7.0.4 → 7.0.6

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## [7.0.6](https://github.com/nodemailer/nodemailer/compare/v7.0.5...v7.0.6) (2025-08-27)
+
+
+### Bug Fixes
+
+* **encoder:** avoid silent data loss by properly flushing trailing base64 ([#1747](https://github.com/nodemailer/nodemailer/issues/1747)) ([01ae76f](https://github.com/nodemailer/nodemailer/commit/01ae76f2cfe991c0c3fe80170f236da60531496b))
+* handle multiple XOAUTH2 token requests correctly ([#1754](https://github.com/nodemailer/nodemailer/issues/1754)) ([dbe0028](https://github.com/nodemailer/nodemailer/commit/dbe00286351cddf012726a41a96ae613d30a34ee))
+* ReDoS vulnerability in parseDataURI and _processDataUrl ([#1755](https://github.com/nodemailer/nodemailer/issues/1755)) ([90b3e24](https://github.com/nodemailer/nodemailer/commit/90b3e24d23929ebf9f4e16261049b40ee4055a39))
+
+## [7.0.5](https://github.com/nodemailer/nodemailer/compare/v7.0.4...v7.0.5) (2025-07-07)
+
+
+### Bug Fixes
+
+* updated well known delivery service list ([fa2724b](https://github.com/nodemailer/nodemailer/commit/fa2724b337eb8d8fdcdd788fe903980b061316b8))
+
 ## [7.0.4](https://github.com/nodemailer/nodemailer/compare/v7.0.3...v7.0.4) (2025-06-29)
 
 

package/lib/base64/index.js

@@ -35,15 +35,12 @@ function wrap(str, lineLength) {
     let pos = 0;
     let chunkLength = lineLength * 1024;
     while (pos < str.length) {
-        let wrappedLines = str
-            .substr(pos, chunkLength)
-            .replace(new RegExp('.{' + lineLength + '}', 'g'), '$&\r\n')
-            .trim();
+        let wrappedLines = str.substr(pos, chunkLength).replace(new RegExp('.{' + lineLength + '}', 'g'), '$&\r\n');
         result.push(wrappedLines);
         pos += chunkLength;
     }
 
-    return result.join('\r\n').trim();
+    return result.join('');
 }
 
 /**
@@ -56,7 +53,6 @@ function wrap(str, lineLength) {
 class Encoder extends Transform {
     constructor(options) {
         super();
-        // init Transform
         this.options = options || {};
 
         if (this.options.lineLength !== false) {
@@ -98,17 +94,20 @@ class Encoder extends Transform {
         if (this.options.lineLength) {
             b64 = wrap(b64, this.options.lineLength);
 
-            // remove last line as it is still most probably incomplete
             let lastLF = b64.lastIndexOf('\n');
             if (lastLF < 0) {
                 this._curLine = b64;
                 b64 = '';
-            } else if (lastLF === b64.length - 1) {
-                this._curLine = '';
             } else {
-                this._curLine = b64.substr(lastLF + 1);
-                b64 = b64.substr(0, lastLF + 1);
+                this._curLine = b64.substring(lastLF + 1);
+                b64 = b64.substring(0, lastLF + 1);
+
+                if (b64 && !b64.endsWith('\r\n')) {
+                    b64 += '\r\n';
+                }
             }
+        } else {
+            this._curLine = '';
         }
 
         if (b64) {
@@ -125,16 +124,14 @@ class Encoder extends Transform {
         }
 
         if (this._curLine) {
-            this._curLine = wrap(this._curLine, this.options.lineLength);
             this.outputBytes += this._curLine.length;
-            this.push(this._curLine, 'ascii');
+            this.push(Buffer.from(this._curLine, 'ascii'));
             this._curLine = '';
         }
         done();
     }
 }
 
-// expose to the world
 module.exports = {
     encode,
     wrap,

package/lib/mail-composer/index.js

@@ -550,9 +550,33 @@ class MailComposer {
      * @return {Object} Parsed element
      */
     _processDataUrl(element) {
+        const dataUrl = element.path || element.href;
+
+        // Early validation to prevent ReDoS
+        if (!dataUrl || typeof dataUrl !== 'string') {
+            return element;
+        }
+
+        if (!dataUrl.startsWith('data:')) {
+            return element;
+        }
+
+        if (dataUrl.length > 100000) {
+            // 100KB limit for data URL string
+            // Return empty content for excessively long data URLs
+            return Object.assign({}, element, {
+                path: false,
+                href: false,
+                content: Buffer.alloc(0),
+                contentType: element.contentType || 'application/octet-stream'
+            });
+        }
+
         let parsedDataUri;
-        if ((element.path || element.href).match(/^data:/)) {
-            parsedDataUri = parseDataURI(element.path || element.href);
+        try {
+            parsedDataUri = parseDataURI(dataUrl);
+        } catch (err) {
+            return element;
         }
 
         if (!parsedDataUri) {

package/lib/mime-funcs/index.js

@@ -269,7 +269,7 @@ module.exports = {
 
             // first line includes the charset and language info and needs to be encoded
             // even if it does not contain any unicode characters
-            line = 'utf-8\x27\x27';
+            line = "utf-8''";
             let encoded = true;
             startPos = 0;
 

package/lib/shared/index.js

@@ -419,52 +419,74 @@ module.exports.callbackPromise = (resolve, reject) =>
     };
 
 module.exports.parseDataURI = uri => {
-    let input = uri;
-    let commaPos = input.indexOf(',');
-    if (!commaPos) {
-        return uri;
+    if (typeof uri !== 'string') {
+        return null;
     }
 
-    let data = input.substring(commaPos + 1);
-    let metaStr = input.substring('data:'.length, commaPos);
+    // Early return for non-data URIs to avoid unnecessary processing
+    if (!uri.startsWith('data:')) {
+        return null;
+    }
 
-    let encoding;
+    // Find the first comma safely - this prevents ReDoS
+    const commaPos = uri.indexOf(',');
+    if (commaPos === -1) {
+        return null;
+    }
 
-    let metaEntries = metaStr.split(';');
-    let lastMetaEntry = metaEntries.length > 1 ? metaEntries[metaEntries.length - 1] : false;
-    if (lastMetaEntry && lastMetaEntry.indexOf('=') < 0) {
-        encoding = lastMetaEntry.toLowerCase();
-        metaEntries.pop();
+    const data = uri.substring(commaPos + 1);
+    const metaStr = uri.substring('data:'.length, commaPos);
+
+    let encoding;
+    const metaEntries = metaStr.split(';');
+
+    if (metaEntries.length > 0) {
+        const lastEntry = metaEntries[metaEntries.length - 1].toLowerCase().trim();
+        // Only recognize valid encoding types to prevent manipulation
+        if (['base64', 'utf8', 'utf-8'].includes(lastEntry) && lastEntry.indexOf('=') === -1) {
+            encoding = lastEntry;
+            metaEntries.pop();
+        }
     }
 
-    let contentType = metaEntries.shift() || 'application/octet-stream';
-    let params = {};
-    for (let entry of metaEntries) {
-        let sep = entry.indexOf('=');
-        if (sep >= 0) {
-            let key = entry.substring(0, sep);
-            let value = entry.substring(sep + 1);
-            params[key] = value;
+    const contentType = metaEntries.length > 0 ? metaEntries.shift() : 'application/octet-stream';
+    const params = {};
+
+    for (let i = 0; i < metaEntries.length; i++) {
+        const entry = metaEntries[i];
+        const sepPos = entry.indexOf('=');
+        if (sepPos > 0) {
+            // Ensure there's a key before the '='
+            const key = entry.substring(0, sepPos).trim();
+            const value = entry.substring(sepPos + 1).trim();
+            if (key) {
+                params[key] = value;
+            }
         }
     }
 
-    switch (encoding) {
-        case 'base64':
-            data = Buffer.from(data, 'base64');
-            break;
-        case 'utf8':
-            data = Buffer.from(data);
-            break;
-        default:
+    // Decode data based on encoding with proper error handling
+    let bufferData;
+    try {
+        if (encoding === 'base64') {
+            bufferData = Buffer.from(data, 'base64');
+        } else {
             try {
-                data = Buffer.from(decodeURIComponent(data));
-            } catch (err) {
-                data = Buffer.from(data);
+                bufferData = Buffer.from(decodeURIComponent(data));
+            } catch (decodeError) {
+                bufferData = Buffer.from(data);
             }
-            data = Buffer.from(data);
+        }
+    } catch (bufferError) {
+        bufferData = Buffer.alloc(0);
     }
 
-    return { data, encoding, contentType, params };
+    return {
+        data: bufferData,
+        encoding: encoding || null,
+        contentType: contentType || 'application/octet-stream',
+        params
+    };
 };
 
 /**

package/lib/smtp-connection/index.js

@@ -1619,7 +1619,7 @@ class SMTPConnection extends EventEmitter {
         }
 
         if (!this._envelope.rcptQueue.length) {
-            return callback(this._formatError('Can\x27t send mail - no recipients defined', 'EENVELOPE', false, 'API'));
+            return callback(this._formatError("Can't send mail - no recipients defined", 'EENVELOPE', false, 'API'));
         } else {
             this._recipientQueue = [];
 
@@ -1675,7 +1675,7 @@ class SMTPConnection extends EventEmitter {
                 });
                 this._sendCommand('DATA');
             } else {
-                err = this._formatError('Can\x27t send mail - all recipients were rejected', 'EENVELOPE', str, 'RCPT TO');
+                err = this._formatError("Can't send mail - all recipients were rejected", 'EENVELOPE', str, 'RCPT TO');
                 err.rejected = this._envelope.rejected;
                 err.rejectedErrors = this._envelope.rejectedErrors;
                 return callback(err);

package/lib/well-known/services.json

@@ -1,12 +1,28 @@
 {
     "1und1": {
+        "description": "1&1 Mail (German hosting provider)",
         "host": "smtp.1und1.de",
         "port": 465,
         "secure": true,
         "authMethod": "LOGIN"
     },
 
+    "126": {
+        "description": "126 Mail (NetEase)",
+        "host": "smtp.126.com",
+        "port": 465,
+        "secure": true
+    },
+
+    "163": {
+        "description": "163 Mail (NetEase)",
+        "host": "smtp.163.com",
+        "port": 465,
+        "secure": true
+    },
+
     "Aliyun": {
+        "description": "Alibaba Cloud Mail",
         "domains": ["aliyun.com"],
         "host": "smtp.aliyun.com",
         "port": 465,
@@ -14,56 +30,91 @@
     },
 
     "AliyunQiye": {
+        "description": "Alibaba Cloud Enterprise Mail",
         "host": "smtp.qiye.aliyun.com",
         "port": 465,
         "secure": true
     },
 
     "AOL": {
+        "description": "AOL Mail",
         "domains": ["aol.com"],
         "host": "smtp.aol.com",
         "port": 587
     },
 
+    "Aruba": {
+        "description": "Aruba PEC (Italian email provider)",
+        "domains": ["aruba.it", "pec.aruba.it"],
+        "aliases": ["Aruba PEC"],
+        "host": "smtps.aruba.it",
+        "port": 465,
+        "secure": true,
+        "authMethod": "LOGIN"
+    },
+
     "Bluewin": {
+        "description": "Bluewin (Swiss email provider)",
         "host": "smtpauths.bluewin.ch",
         "domains": ["bluewin.ch"],
         "port": 465
     },
 
+    "BOL": {
+        "description": "BOL Mail (Brazilian provider)",
+        "domains": ["bol.com.br"],
+        "host": "smtp.bol.com.br",
+        "port": 587,
+        "requireTLS": true
+    },
+
     "DebugMail": {
+        "description": "DebugMail (email testing service)",
         "host": "debugmail.io",
         "port": 25
     },
 
+    "Disroot": {
+        "description": "Disroot (privacy-focused provider)",
+        "domains": ["disroot.org"],
+        "host": "disroot.org",
+        "port": 587,
+        "secure": false,
+        "authMethod": "LOGIN"
+    },
+
     "DynectEmail": {
+        "description": "Dyn Email Delivery",
         "aliases": ["Dynect"],
         "host": "smtp.dynect.net",
         "port": 25
     },
 
+    "ElasticEmail": {
+        "description": "Elastic Email",
+        "aliases": ["Elastic Email"],
+        "host": "smtp.elasticemail.com",
+        "port": 465,
+        "secure": true
+    },
+
     "Ethereal": {
+        "description": "Ethereal Email (email testing service)",
         "aliases": ["ethereal.email"],
         "host": "smtp.ethereal.email",
         "port": 587
     },
 
     "FastMail": {
+        "description": "FastMail",
         "domains": ["fastmail.fm"],
         "host": "smtp.fastmail.com",
         "port": 465,
         "secure": true
     },
 
-    "Forward Email": {
-        "aliases": ["FE", "ForwardEmail"],
-        "domains": ["forwardemail.net"],
-        "host": "smtp.forwardemail.net",
-        "port": 465,
-        "secure": true
-    },
-
     "Feishu Mail": {
+        "description": "Feishu Mail (Lark)",
         "aliases": ["Feishu", "FeishuMail"],
         "domains": ["www.feishu.cn"],
         "host": "smtp.feishu.cn",
@@ -71,13 +122,24 @@
         "secure": true
     },
 
+    "Forward Email": {
+        "description": "Forward Email (email forwarding service)",
+        "aliases": ["FE", "ForwardEmail"],
+        "domains": ["forwardemail.net"],
+        "host": "smtp.forwardemail.net",
+        "port": 465,
+        "secure": true
+    },
+
     "GandiMail": {
+        "description": "Gandi Mail",
         "aliases": ["Gandi", "Gandi Mail"],
         "host": "mail.gandi.net",
         "port": 587
     },
 
     "Gmail": {
+        "description": "Gmail",
         "aliases": ["Google Mail"],
         "domains": ["gmail.com", "googlemail.com"],
         "host": "smtp.gmail.com",
@@ -85,26 +147,38 @@
         "secure": true
     },
 
+    "GMX": {
+        "description": "GMX Mail",
+        "domains": ["gmx.com", "gmx.net", "gmx.de"],
+        "host": "mail.gmx.com",
+        "port": 587
+    },
+
     "Godaddy": {
+        "description": "GoDaddy Email (US)",
         "host": "smtpout.secureserver.net",
         "port": 25
     },
 
     "GodaddyAsia": {
+        "description": "GoDaddy Email (Asia)",
         "host": "smtp.asia.secureserver.net",
         "port": 25
     },
 
     "GodaddyEurope": {
+        "description": "GoDaddy Email (Europe)",
         "host": "smtp.europe.secureserver.net",
         "port": 25
     },
 
     "hot.ee": {
+        "description": "Hot.ee (Estonian email provider)",
         "host": "mail.hot.ee"
     },
 
     "Hotmail": {
+        "description": "Outlook.com / Hotmail",
         "aliases": ["Outlook", "Outlook.com", "Hotmail.com"],
         "domains": ["hotmail.com", "outlook.com"],
         "host": "smtp-mail.outlook.com",
@@ -112,6 +186,7 @@
     },
 
     "iCloud": {
+        "description": "iCloud Mail",
         "aliases": ["Me", "Mac"],
         "domains": ["me.com", "mac.com"],
         "host": "smtp.mail.me.com",
@@ -119,72 +194,117 @@
     },
 
     "Infomaniak": {
+        "description": "Infomaniak Mail (Swiss hosting provider)",
         "host": "mail.infomaniak.com",
         "domains": ["ik.me", "ikmail.com", "etik.com"],
         "port": 587
     },
+
+    "KolabNow": {
+        "description": "KolabNow (secure email service)",
+        "domains": ["kolabnow.com"],
+        "aliases": ["Kolab"],
+        "host": "smtp.kolabnow.com",
+        "port": 465,
+        "secure": true,
+        "authMethod": "LOGIN"
+    },
+
     "Loopia": {
+        "description": "Loopia (Swedish hosting provider)",
         "host": "mailcluster.loopia.se",
         "port": 465
     },
+
+    "Loops": {
+        "description": "Loops",
+        "host": "smtp.loops.so",
+        "port": 587
+    },
+
     "mail.ee": {
+        "description": "Mail.ee (Estonian email provider)",
         "host": "smtp.mail.ee"
     },
 
     "Mail.ru": {
+        "description": "Mail.ru",
         "host": "smtp.mail.ru",
         "port": 465,
         "secure": true
     },
 
     "Mailcatch.app": {
+        "description": "Mailcatch (email testing service)",
         "host": "sandbox-smtp.mailcatch.app",
         "port": 2525
     },
 
     "Maildev": {
+        "description": "MailDev (local email testing)",
         "port": 1025,
         "ignoreTLS": true
     },
 
+    "MailerSend": {
+        "description": "MailerSend",
+        "host": "smtp.mailersend.net",
+        "port": 587
+    },
+
     "Mailgun": {
+        "description": "Mailgun",
         "host": "smtp.mailgun.org",
         "port": 465,
         "secure": true
     },
 
     "Mailjet": {
+        "description": "Mailjet",
         "host": "in.mailjet.com",
         "port": 587
     },
 
     "Mailosaur": {
+        "description": "Mailosaur (email testing service)",
         "host": "mailosaur.io",
         "port": 25
     },
 
     "Mailtrap": {
+        "description": "Mailtrap",
         "host": "live.smtp.mailtrap.io",
         "port": 587
     },
 
     "Mandrill": {
+        "description": "Mandrill (by Mailchimp)",
         "host": "smtp.mandrillapp.com",
         "port": 587
     },
 
     "Naver": {
+        "description": "Naver Mail (Korean email provider)",
         "host": "smtp.naver.com",
         "port": 587
     },
 
+    "OhMySMTP": {
+        "description": "OhMySMTP (email delivery service)",
+        "host": "smtp.ohmysmtp.com",
+        "port": 587,
+        "secure": false
+    },
+
     "One": {
+        "description": "One.com Email",
         "host": "send.one.com",
         "port": 465,
         "secure": true
     },
 
     "OpenMailBox": {
+        "description": "OpenMailBox",
         "aliases": ["OMB", "openmailbox.org"],
         "host": "smtp.openmailbox.org",
         "port": 465,
@@ -192,24 +312,21 @@
     },
 
     "Outlook365": {
+        "description": "Microsoft 365 / Office 365",
         "host": "smtp.office365.com",
         "port": 587,
         "secure": false
     },
 
-    "OhMySMTP": {
-        "host": "smtp.ohmysmtp.com",
-        "port": 587,
-        "secure": false
-    },
-
     "Postmark": {
+        "description": "Postmark",
         "aliases": ["PostmarkApp"],
         "host": "smtp.postmarkapp.com",
         "port": 2525
     },
 
     "Proton": {
+        "description": "Proton Mail",
         "aliases": ["ProtonMail", "Proton.me", "Protonmail.com", "Protonmail.ch"],
         "domains": ["proton.me", "protonmail.com", "pm.me", "protonmail.ch"],
         "host": "smtp.protonmail.ch",
@@ -218,12 +335,14 @@
     },
 
     "qiye.aliyun": {
+        "description": "Alibaba Mail Enterprise Edition",
         "host": "smtp.mxhichina.com",
         "port": "465",
         "secure": true
     },
 
     "QQ": {
+        "description": "QQ Mail",
         "domains": ["qq.com"],
         "host": "smtp.qq.com",
         "port": 465,
@@ -231,6 +350,7 @@
     },
 
     "QQex": {
+        "description": "QQ Enterprise Mail",
         "aliases": ["QQ Enterprise"],
         "domains": ["exmail.qq.com"],
         "host": "smtp.exmail.qq.com",
@@ -238,89 +358,189 @@
         "secure": true
     },
 
+    "Resend": {
+        "description": "Resend",
+        "host": "smtp.resend.com",
+        "port": 465,
+        "secure": true
+    },
+
+    "Runbox": {
+        "description": "Runbox (Norwegian email provider)",
+        "domains": ["runbox.com"],
+        "host": "smtp.runbox.com",
+        "port": 465,
+        "secure": true
+    },
+
     "SendCloud": {
+        "description": "SendCloud (Chinese email delivery)",
         "host": "smtp.sendcloud.net",
         "port": 2525
     },
 
     "SendGrid": {
+        "description": "SendGrid",
         "host": "smtp.sendgrid.net",
         "port": 587
     },
 
     "SendinBlue": {
+        "description": "Brevo (formerly Sendinblue)",
         "aliases": ["Brevo"],
         "host": "smtp-relay.brevo.com",
         "port": 587
     },
 
     "SendPulse": {
+        "description": "SendPulse",
         "host": "smtp-pulse.com",
         "port": 465,
         "secure": true
     },
 
     "SES": {
+        "description": "AWS SES US East (N. Virginia)",
         "host": "email-smtp.us-east-1.amazonaws.com",
         "port": 465,
         "secure": true
     },
 
-    "SES-US-EAST-1": {
-        "host": "email-smtp.us-east-1.amazonaws.com",
+    "SES-AP-NORTHEAST-1": {
+        "description": "AWS SES Asia Pacific (Tokyo)",
+        "host": "email-smtp.ap-northeast-1.amazonaws.com",
         "port": 465,
         "secure": true
     },
 
-    "SES-US-WEST-2": {
-        "host": "email-smtp.us-west-2.amazonaws.com",
+    "SES-AP-NORTHEAST-2": {
+        "description": "AWS SES Asia Pacific (Seoul)",
+        "host": "email-smtp.ap-northeast-2.amazonaws.com",
         "port": 465,
         "secure": true
     },
 
-    "SES-EU-WEST-1": {
-        "host": "email-smtp.eu-west-1.amazonaws.com",
+    "SES-AP-NORTHEAST-3": {
+        "description": "AWS SES Asia Pacific (Osaka)",
+        "host": "email-smtp.ap-northeast-3.amazonaws.com",
         "port": 465,
         "secure": true
     },
 
     "SES-AP-SOUTH-1": {
+        "description": "AWS SES Asia Pacific (Mumbai)",
         "host": "email-smtp.ap-south-1.amazonaws.com",
         "port": 465,
         "secure": true
     },
 
-    "SES-AP-NORTHEAST-1": {
-        "host": "email-smtp.ap-northeast-1.amazonaws.com",
+    "SES-AP-SOUTHEAST-1": {
+        "description": "AWS SES Asia Pacific (Singapore)",
+        "host": "email-smtp.ap-southeast-1.amazonaws.com",
         "port": 465,
         "secure": true
     },
 
-    "SES-AP-NORTHEAST-2": {
-        "host": "email-smtp.ap-northeast-2.amazonaws.com",
+    "SES-AP-SOUTHEAST-2": {
+        "description": "AWS SES Asia Pacific (Sydney)",
+        "host": "email-smtp.ap-southeast-2.amazonaws.com",
         "port": 465,
         "secure": true
     },
 
-    "SES-AP-NORTHEAST-3": {
-        "host": "email-smtp.ap-northeast-3.amazonaws.com",
+    "SES-CA-CENTRAL-1": {
+        "description": "AWS SES Canada (Central)",
+        "host": "email-smtp.ca-central-1.amazonaws.com",
         "port": 465,
         "secure": true
     },
 
-    "SES-AP-SOUTHEAST-1": {
-        "host": "email-smtp.ap-southeast-1.amazonaws.com",
+    "SES-EU-CENTRAL-1": {
+        "description": "AWS SES Europe (Frankfurt)",
+        "host": "email-smtp.eu-central-1.amazonaws.com",
         "port": 465,
         "secure": true
     },
 
-    "SES-AP-SOUTHEAST-2": {
-        "host": "email-smtp.ap-southeast-2.amazonaws.com",
+    "SES-EU-NORTH-1": {
+        "description": "AWS SES Europe (Stockholm)",
+        "host": "email-smtp.eu-north-1.amazonaws.com",
+        "port": 465,
+        "secure": true
+    },
+
+    "SES-EU-WEST-1": {
+        "description": "AWS SES Europe (Ireland)",
+        "host": "email-smtp.eu-west-1.amazonaws.com",
+        "port": 465,
+        "secure": true
+    },
+
+    "SES-EU-WEST-2": {
+        "description": "AWS SES Europe (London)",
+        "host": "email-smtp.eu-west-2.amazonaws.com",
+        "port": 465,
+        "secure": true
+    },
+
+    "SES-EU-WEST-3": {
+        "description": "AWS SES Europe (Paris)",
+        "host": "email-smtp.eu-west-3.amazonaws.com",
+        "port": 465,
+        "secure": true
+    },
+
+    "SES-SA-EAST-1": {
+        "description": "AWS SES South America (São Paulo)",
+        "host": "email-smtp.sa-east-1.amazonaws.com",
+        "port": 465,
+        "secure": true
+    },
+
+    "SES-US-EAST-1": {
+        "description": "AWS SES US East (N. Virginia)",
+        "host": "email-smtp.us-east-1.amazonaws.com",
+        "port": 465,
+        "secure": true
+    },
+
+    "SES-US-EAST-2": {
+        "description": "AWS SES US East (Ohio)",
+        "host": "email-smtp.us-east-2.amazonaws.com",
+        "port": 465,
+        "secure": true
+    },
+
+    "SES-US-GOV-EAST-1": {
+        "description": "AWS SES GovCloud (US-East)",
+        "host": "email-smtp.us-gov-east-1.amazonaws.com",
+        "port": 465,
+        "secure": true
+    },
+
+    "SES-US-GOV-WEST-1": {
+        "description": "AWS SES GovCloud (US-West)",
+        "host": "email-smtp.us-gov-west-1.amazonaws.com",
+        "port": 465,
+        "secure": true
+    },
+
+    "SES-US-WEST-1": {
+        "description": "AWS SES US West (N. California)",
+        "host": "email-smtp.us-west-1.amazonaws.com",
+        "port": 465,
+        "secure": true
+    },
+
+    "SES-US-WEST-2": {
+        "description": "AWS SES US West (Oregon)",
+        "host": "email-smtp.us-west-2.amazonaws.com",
         "port": 465,
         "secure": true
     },
 
     "Seznam": {
+        "description": "Seznam Email (Czech email provider)",
         "aliases": ["Seznam Email"],
         "domains": ["seznam.cz", "email.cz", "post.cz", "spoluzaci.cz"],
         "host": "smtp.seznam.cz",
@@ -328,7 +548,14 @@
         "secure": true
     },
 
+    "SMTP2GO": {
+        "description": "SMTP2GO",
+        "host": "mail.smtp2go.com",
+        "port": 2525
+    },
+
     "Sparkpost": {
+        "description": "SparkPost",
         "aliases": ["SparkPost", "SparkPost Mail"],
         "domains": ["sparkpost.com"],
         "host": "smtp.sparkpostmail.com",
@@ -337,11 +564,21 @@
     },
 
     "Tipimail": {
+        "description": "Tipimail (email delivery service)",
         "host": "smtp.tipimail.com",
         "port": 587
     },
 
+    "Tutanota": {
+        "description": "Tutanota (Tuta Mail)",
+        "domains": ["tutanota.com", "tuta.com", "tutanota.de", "tuta.io"],
+        "host": "smtp.tutanota.com",
+        "port": 465,
+        "secure": true
+    },
+
     "Yahoo": {
+        "description": "Yahoo Mail",
         "domains": ["yahoo.com"],
         "host": "smtp.mail.yahoo.com",
         "port": 465,
@@ -349,28 +586,26 @@
     },
 
     "Yandex": {
+        "description": "Yandex Mail",
         "domains": ["yandex.ru"],
         "host": "smtp.yandex.ru",
         "port": 465,
         "secure": true
     },
 
+    "Zimbra": {
+        "description": "Zimbra Mail Server",
+        "aliases": ["Zimbra Collaboration"],
+        "host": "smtp.zimbra.com",
+        "port": 587,
+        "requireTLS": true
+    },
+
     "Zoho": {
+        "description": "Zoho Mail",
         "host": "smtp.zoho.com",
         "port": 465,
         "secure": true,
         "authMethod": "LOGIN"
-    },
-
-    "126": {
-        "host": "smtp.126.com",
-        "port": 465,
-        "secure": true
-    },
-
-    "163": {
-        "host": "smtp.163.com",
-        "port": 465,
-        "secure": true
     }
 }

package/lib/xoauth2/index.js

@@ -72,6 +72,9 @@ class XOAuth2 extends Stream {
             let timeout = Math.max(Number(this.options.timeout) || 0, 0);
             this.expires = (timeout && Date.now() + timeout * 1000) || 0;
         }
+
+        this.renewing = false; // Track if renewal is in progress
+        this.renewalQueue = []; // Queue for pending requests during renewal
     }
 
     /**
@@ -82,14 +85,61 @@ class XOAuth2 extends Stream {
      */
     getToken(renew, callback) {
         if (!renew && this.accessToken && (!this.expires || this.expires > Date.now())) {
+            this.logger.debug(
+                {
+                    tnx: 'OAUTH2',
+                    user: this.options.user,
+                    action: 'reuse'
+                },
+                'Reusing existing access token for %s',
+                this.options.user
+            );
             return callback(null, this.accessToken);
         }
 
-        let generateCallback = (...args) => {
-            if (args[0]) {
+        // check if it is possible to renew, if not, return the current token or error
+        if (!this.provisionCallback && !this.options.refreshToken && !this.options.serviceClient) {
+            if (this.accessToken) {
+                this.logger.debug(
+                    {
+                        tnx: 'OAUTH2',
+                        user: this.options.user,
+                        action: 'reuse'
+                    },
+                    'Reusing existing access token (no refresh capability) for %s',
+                    this.options.user
+                );
+                return callback(null, this.accessToken);
+            }
+            this.logger.error(
+                {
+                    tnx: 'OAUTH2',
+                    user: this.options.user,
+                    action: 'renew'
+                },
+                'Cannot renew access token for %s: No refresh mechanism available',
+                this.options.user
+            );
+            return callback(new Error("Can't create new access token for user"));
+        }
+
+        // If renewal already in progress, queue this request instead of starting another
+        if (this.renewing) {
+            return this.renewalQueue.push({ renew, callback });
+        }
+
+        this.renewing = true;
+
+        // Handles token renewal completion - processes queued requests and cleans up
+        const generateCallback = (err, accessToken) => {
+            this.renewalQueue.forEach(item => item.callback(err, accessToken));
+            this.renewalQueue = [];
+            this.renewing = false;
+
+            if (err) {
                 this.logger.error(
                     {
-                        err: args[0],
+                        err,
                         tnx: 'OAUTH2',
                         user: this.options.user,
                         action: 'renew'
@@ -108,7 +158,8 @@ class XOAuth2 extends Stream {
                     this.options.user
                 );
             }
-            callback(...args);
+            // Complete original request
+            callback(err, accessToken);
         };
 
         if (this.provisionCallback) {
@@ -167,7 +218,7 @@ class XOAuth2 extends Stream {
             try {
                 token = this.jwtSignRS256(tokenData);
             } catch (err) {
-                return callback(new Error('Can\x27t generate token. Check your auth options'));
+                return callback(new Error("Can't generate token. Check your auth options"));
             }
 
             urlOptions = {
@@ -181,7 +232,7 @@ class XOAuth2 extends Stream {
             };
         } else {
             if (!this.options.refreshToken) {
-                return callback(new Error('Can\x27t create new access token for user'));
+                return callback(new Error("Can't create new access token for user"));
             }
 
             // web app - https://developers.google.com/identity/protocols/OAuth2WebServer

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "7.0.4",
+    "version": "7.0.6",
     "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-sesv2": "3.839.0",
+        "@aws-sdk/client-sesv2": "3.876.0",
         "bunyan": "1.8.15",
         "c8": "10.1.3",
         "eslint": "8.57.0",