@mavogel/awscdk-rootmail 0.0.307 → 0.0.309

package/node_modules/nodemailer/README.md

@@ -42,7 +42,7 @@ It's either a firewall issue, or your SMTP server blocks authentication attempts
 -   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
 
-```
+```js
 let configOptions = {
     host: "smtp.example.com",
     port: 587,
@@ -57,7 +57,7 @@ let configOptions = {
 
 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.
 
-```
+```js
 let configOptions = {
     host: "1.2.3.4",
     port: 465,

package/node_modules/nodemailer/lib/dkim/index.js

@@ -12,7 +12,7 @@ const path = require('path');
 const crypto = require('crypto');
 
 const DKIM_ALGO = 'sha256';
-const MAX_MESSAGE_SIZE = 128 * 1024; // buffer messages larger than this to disk
+const MAX_MESSAGE_SIZE = 2 * 1024 * 1024; // buffer messages larger than this to disk
 
 /*
 // Usage:

package/node_modules/nodemailer/lib/mail-composer/index.js

@@ -86,20 +86,32 @@ class MailComposer {
         let icalEvent, eventObject;
         let attachments = [].concat(this.mail.attachments || []).map((attachment, i) => {
             let data;
-            let isMessageNode = /^message\//i.test(attachment.contentType);
 
             if (/^data:/i.test(attachment.path || attachment.href)) {
                 attachment = this._processDataUrl(attachment);
             }
 
             let contentType = attachment.contentType || mimeFuncs.detectMimeType(attachment.filename || attachment.path || attachment.href || 'bin');
+
             let isImage = /^image\//i.test(contentType);
+            let isMessageNode = /^message\//i.test(contentType);
+
             let contentDisposition = attachment.contentDisposition || (isMessageNode || (isImage && attachment.cid) ? 'inline' : 'attachment');
 
+            let contentTransferEncoding;
+            if ('contentTransferEncoding' in attachment) {
+                // also contains `false`, to set
+                contentTransferEncoding = attachment.contentTransferEncoding;
+            } else if (isMessageNode) {
+                contentTransferEncoding = '7bit';
+            } else {
+                contentTransferEncoding = 'base64'; // the default
+            }
+
             data = {
                 contentType,
                 contentDisposition,
-                contentTransferEncoding: 'contentTransferEncoding' in attachment ? attachment.contentTransferEncoding : 'base64'
+                contentTransferEncoding
             };
 
             if (attachment.filename) {

package/node_modules/nodemailer/lib/nodemailer.js

@@ -45,6 +45,11 @@ module.exports.createTransport = function (transporter, defaults) {
         } else if (options.jsonTransport) {
             transporter = new JSONTransport(options);
         } else if (options.SES) {
+            if (options.SES.ses && options.SES.aws) {
+                let error = new Error('Using legacy SES configuration, expecting @aws-sdk/client-sesv2, see https://nodemailer.com/transports/ses/');
+                error.code = 'LegacyConfig';
+                throw error;
+            }
             transporter = new SESTransport(options);
         } else {
             transporter = new SMTPTransport(options);

package/node_modules/nodemailer/lib/ses-transport/index.js

@@ -4,15 +4,11 @@ const EventEmitter = require('events');
 const packageData = require('../../package.json');
 const shared = require('../shared');
 const LeWindows = require('../mime-node/le-windows');
+const MimeNode = require('../mime-node');
 
 /**
  * Generates a Transport object for AWS SES
  *
- * Possible options can be the following:
- *
- *  * **sendingRate** optional Number specifying how many messages per second should be delivered to SES
- *  * **maxConnections** optional Number specifying max number of parallel connections to SES
- *
  * @constructor
  * @param {Object} optional config parameter
  */
@@ -30,119 +26,17 @@ class SESTransport extends EventEmitter {
         this.logger = shared.getLogger(this.options, {
             component: this.options.component || 'ses-transport'
         });
-
-        // parallel sending connections
-        this.maxConnections = Number(this.options.maxConnections) || Infinity;
-        this.connections = 0;
-
-        // max messages per second
-        this.sendingRate = Number(this.options.sendingRate) || Infinity;
-        this.sendingRateTTL = null;
-        this.rateInterval = 1000; // milliseconds
-        this.rateMessages = [];
-
-        this.pending = [];
-
-        this.idling = true;
-
-        setImmediate(() => {
-            if (this.idling) {
-                this.emit('idle');
-            }
-        });
-    }
-
-    /**
-     * Schedules a sending of a message
-     *
-     * @param {Object} emailMessage MailComposer object
-     * @param {Function} callback Callback function to run when the sending is completed
-     */
-    send(mail, callback) {
-        if (this.connections >= this.maxConnections) {
-            this.idling = false;
-            return this.pending.push({
-                mail,
-                callback
-            });
-        }
-
-        if (!this._checkSendingRate()) {
-            this.idling = false;
-            return this.pending.push({
-                mail,
-                callback
-            });
-        }
-
-        this._send(mail, (...args) => {
-            setImmediate(() => callback(...args));
-            this._sent();
-        });
     }
 
-    _checkRatedQueue() {
-        if (this.connections >= this.maxConnections || !this._checkSendingRate()) {
-            return;
+    getRegion(cb) {
+        if (this.ses.sesClient.config && typeof this.ses.sesClient.config.region === 'function') {
+            // promise
+            return this.ses.sesClient.config
+                .region()
+                .then(region => cb(null, region))
+                .catch(err => cb(err));
         }
-
-        if (!this.pending.length) {
-            if (!this.idling) {
-                this.idling = true;
-                this.emit('idle');
-            }
-            return;
-        }
-
-        let next = this.pending.shift();
-        this._send(next.mail, (...args) => {
-            setImmediate(() => next.callback(...args));
-            this._sent();
-        });
-    }
-
-    _checkSendingRate() {
-        clearTimeout(this.sendingRateTTL);
-
-        let now = Date.now();
-        let oldest = false;
-        // delete older messages
-        for (let i = this.rateMessages.length - 1; i >= 0; i--) {
-            if (this.rateMessages[i].ts >= now - this.rateInterval && (!oldest || this.rateMessages[i].ts < oldest)) {
-                oldest = this.rateMessages[i].ts;
-            }
-
-            if (this.rateMessages[i].ts < now - this.rateInterval && !this.rateMessages[i].pending) {
-                this.rateMessages.splice(i, 1);
-            }
-        }
-
-        if (this.rateMessages.length < this.sendingRate) {
-            return true;
-        }
-
-        let delay = Math.max(oldest + 1001, now + 20);
-        this.sendingRateTTL = setTimeout(() => this._checkRatedQueue(), now - delay);
-
-        try {
-            this.sendingRateTTL.unref();
-        } catch (E) {
-            // Ignore. Happens on envs with non-node timer implementation
-        }
-
-        return false;
-    }
-
-    _sent() {
-        this.connections--;
-        this._checkRatedQueue();
-    }
-
-    /**
-     * Returns true if there are free slots in the queue
-     */
-    isIdle() {
-        return this.idling;
+        return cb(null, false);
     }
 
     /**
@@ -151,13 +45,17 @@ class SESTransport extends EventEmitter {
      * @param {Object} emailMessage MailComposer object
      * @param {Function} callback Callback function to run when the sending is completed
      */
-    _send(mail, callback) {
+    send(mail, callback) {
         let statObject = {
             ts: Date.now(),
             pending: true
         };
-        this.connections++;
-        this.rateMessages.push(statObject);
+
+        let fromHeader = mail.message._headers.find(header => /^from$/i.test(header.key));
+        if (fromHeader) {
+            let mimeNode = new MimeNode('text/plain');
+            fromHeader = mimeNode._convertAddresses(mimeNode._parseAddresses(fromHeader.value));
+        }
 
         let envelope = mail.data.envelope || mail.message.getEnvelope();
         let messageId = mail.message.messageId();
@@ -227,45 +125,29 @@ class SESTransport extends EventEmitter {
                 }
 
                 let sesMessage = {
-                    RawMessage: {
-                        // required
-                        Data: raw // required
+                    Content: {
+                        Raw: {
+                            // required
+                            Data: raw // required
+                        }
                     },
-                    Source: envelope.from,
-                    Destinations: envelope.to
+                    FromEmailAddress: fromHeader ? fromHeader : envelope.from,
+                    Destination: {
+                        ToAddresses: envelope.to
+                    }
                 };
 
                 Object.keys(mail.data.ses || {}).forEach(key => {
                     sesMessage[key] = mail.data.ses[key];
                 });
 
-                let ses = (this.ses.aws ? this.ses.ses : this.ses) || {};
-                let aws = this.ses.aws || {};
-
-                let getRegion = cb => {
-                    if (ses.config && typeof ses.config.region === 'function') {
-                        // promise
-                        return ses.config
-                            .region()
-                            .then(region => cb(null, region))
-                            .catch(err => cb(err));
-                    }
-                    return cb(null, (ses.config && ses.config.region) || 'us-east-1');
-                };
-
-                getRegion((err, region) => {
+                this.getRegion((err, region) => {
                     if (err || !region) {
                         region = 'us-east-1';
                     }
 
-                    let sendPromise;
-                    if (typeof ses.send === 'function' && aws.SendRawEmailCommand) {
-                        // v3 API
-                        sendPromise = ses.send(new aws.SendRawEmailCommand(sesMessage));
-                    } else {
-                        // v2 API
-                        sendPromise = ses.sendRawEmail(sesMessage).promise();
-                    }
+                    const command = new this.ses.SendEmailCommand(sesMessage);
+                    const sendPromise = this.ses.sesClient.send(command);
 
                     sendPromise
                         .then(data => {
@@ -273,7 +155,7 @@ class SESTransport extends EventEmitter {
                                 region = 'email';
                             }
 
-                            statObject.pending = false;
+                            statObject.pending = true;
                             callback(null, {
                                 envelope: {
                                     from: envelope.from,
@@ -309,38 +191,41 @@ class SESTransport extends EventEmitter {
      */
     verify(callback) {
         let promise;
-        let ses = (this.ses.aws ? this.ses.ses : this.ses) || {};
-        let aws = this.ses.aws || {};
-
-        const sesMessage = {
-            RawMessage: {
-                // required
-                Data: 'From: invalid@invalid\r\nTo: invalid@invalid\r\n Subject: Invalid\r\n\r\nInvalid'
-            },
-            Source: 'invalid@invalid',
-            Destinations: ['invalid@invalid']
-        };
-
         if (!callback) {
             promise = new Promise((resolve, reject) => {
                 callback = shared.callbackPromise(resolve, reject);
             });
         }
+
         const cb = err => {
-            if (err && (err.code || err.Code) !== 'InvalidParameterValue') {
+            if (err && !['InvalidParameterValue', 'MessageRejected'].includes(err.code || err.Code || err.name)) {
                 return callback(err);
             }
             return callback(null, true);
         };
 
-        if (typeof ses.send === 'function' && aws.SendRawEmailCommand) {
-            // v3 API
-            sesMessage.RawMessage.Data = Buffer.from(sesMessage.RawMessage.Data);
-            ses.send(new aws.SendRawEmailCommand(sesMessage), cb);
-        } else {
-            // v2 API
-            ses.sendRawEmail(sesMessage, cb);
-        }
+        const sesMessage = {
+            Content: {
+                Raw: {
+                    Data: Buffer.from('From: <invalid@invalid>\r\nTo: <invalid@invalid>\r\n Subject: Invalid\r\n\r\nInvalid')
+                }
+            },
+            FromEmailAddress: 'invalid@invalid',
+            Destination: {
+                ToAddresses: ['invalid@invalid']
+            }
+        };
+
+        this.getRegion((err, region) => {
+            if (err || !region) {
+                region = 'us-east-1';
+            }
+
+            const command = new this.ses.SendEmailCommand(sesMessage);
+            const sendPromise = this.ses.sesClient.send(command);
+
+            sendPromise.then(data => cb(null, data)).catch(err => cb(err));
+        });
 
         return promise;
     }

package/node_modules/nodemailer/lib/smtp-connection/index.js

@@ -243,6 +243,8 @@ class SMTPConnection extends EventEmitter {
         if (this.options.connection) {
             // connection is already opened
             this._socket = this.options.connection;
+            setupConnectionHandlers();
+
             if (this.secureConnection && !this.alreadySecured) {
                 setImmediate(() =>
                     this._upgradeConnection(err => {
@@ -412,7 +414,7 @@ class SMTPConnection extends EventEmitter {
 
         if (socket && !socket.destroyed) {
             try {
-                this._socket[closeMethod]();
+                socket[closeMethod]();
             } catch (E) {
                 // just ignore
             }
@@ -636,7 +638,7 @@ class SMTPConnection extends EventEmitter {
                     stream.write(message);
                     stream.end();
                 }
-                
+
                 return callback(err);
             }
             let envelopeTime = Date.now();

package/node_modules/nodemailer/lib/well-known/services.json

@@ -203,6 +203,14 @@
         "port": 2525
     },
 
+    "Proton": {
+        "aliases": ["ProtonMail", "Proton.me", "Protonmail.com", "Protonmail.ch"],
+        "domains": ["proton.me", "protonmail.com", "pm.me", "protonmail.ch"],
+        "host": "smtp.protonmail.ch",
+        "port": 587,
+        "requireTLS": true
+    },
+
     "qiye.aliyun": {
         "host": "smtp.mxhichina.com",
         "port": "465",
@@ -306,6 +314,14 @@
         "secure": true
     },
 
+    "Seznam": {
+        "aliases": ["Seznam Email"],
+        "domains": ["seznam.cz", "email.cz", "post.cz", "spoluzaci.cz"],
+        "host": "smtp.seznam.cz",
+        "port": 465,
+        "secure": true
+    },
+
     "Sparkpost": {
         "aliases": ["SparkPost", "SparkPost Mail"],
         "domains": ["sparkpost.com"],

package/node_modules/nodemailer/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "6.9.16",
+    "version": "7.0.3",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -23,15 +23,15 @@
     },
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
-        "@aws-sdk/client-ses": "3.679.0",
+        "@aws-sdk/client-sesv2": "3.804.0",
         "bunyan": "1.8.15",
-        "c8": "10.1.2",
+        "c8": "10.1.3",
         "eslint": "8.57.0",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "9.1.0",
         "libbase64": "1.3.0",
-        "libmime": "5.3.5",
-        "libqp": "2.1.0",
+        "libmime": "5.3.6",
+        "libqp": "2.1.1",
         "nodemailer-ntlm-auth": "1.0.4",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",

package/node_modules/tlds/index.json

@@ -118,7 +118,6 @@
   "beats",
   "beauty",
   "beer",
-  "bentley",
   "berlin",
   "best",
   "bestbuy",
@@ -627,7 +626,6 @@
   "kddi",
   "ke",
   "kerryhotels",
-  "kerrylogistics",
   "kerryproperties",
   "kfh",
   "kg",
@@ -659,7 +657,6 @@
   "lacaixa",
   "lamborghini",
   "lamer",
-  "lancaster",
   "land",
   "landrover",
   "lanxess",
@@ -691,7 +688,6 @@
   "limo",
   "lincoln",
   "link",
-  "lipsy",
   "live",
   "living",
   "lk",
@@ -916,7 +912,6 @@
   "porn",
   "post",
   "pr",
-  "pramerica",
   "praxi",
   "press",
   "prime",

package/node_modules/tlds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tlds",
-  "version": "1.255.0",
+  "version": "1.259.0",
   "description": "A list of TLDs.",
   "repository": "https://github.com/stephenmathieson/node-tlds.git",
   "author": "Stephen Mathieson",

package/package.json

@@ -120,7 +120,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.307",
+  "version": "0.0.309",
   "jest": {
     "coverageProvider": "v8",
     "testMatch": [