@mavogel/awscdk-rootmail 0.1.4 → 0.1.6

package/node_modules/nodemailer/dist/esm/shared/index.js

@@ -14,7 +14,9 @@ const DNS_TTL = 5 * 60 * 1000;
 const CACHE_CLEANUP_INTERVAL = 30 * 1000; // Minimum 30 seconds between cleanups
 const MAX_CACHE_SIZE = 1000; // Maximum number of entries in cache
 let lastCacheCleanup = 0;
+/** @internal */
 export const _lastCacheCleanup = () => lastCacheCleanup;
+/** @internal */
 export const _resetCacheCleanup = () => {
     lastCacheCleanup = 0;
 };
@@ -66,7 +68,6 @@ const formatDNSValue = (value, extra) => {
     // Select a random address from available addresses, or null if none
     const host = addresses.length > 0 ? addresses[Math.floor(Math.random() * addresses.length)] : null;
     return Object.assign({
-        servername: value.servername,
         host,
         // Include all addresses for connection fallback support
         _addresses: addresses
@@ -80,14 +81,19 @@ export const resolveHostname = (options, callback) => {
     if (!options.host || net.isIP(options.host)) {
         // nothing to do here
         const value = {
-            addresses: [options.host],
-            servername: options.servername || false
+            addresses: [options.host]
         };
         return callback(null, formatDNSValue(value, {
+            servername: options.servername || false,
             cached: false
         }));
     }
     const host = options.host;
+    // The TLS server name belongs to the connection asking, not to the host it resolves. The
+    // cache is shared by every transport of the process and keyed by host alone, so a server
+    // name stored in it would be the one of whichever transport resolved the host first, and a
+    // later transport with its own tls.servername would present and verify that name instead
+    const servername = options.servername || host;
     let cached;
     if (dnsCache.has(options.host)) {
         cached = dnsCache.get(options.host);
@@ -110,6 +116,7 @@ export const resolveHostname = (options, callback) => {
         }
         if (!cached.expires || cached.expires >= now) {
             return callback(null, formatDNSValue(cached.value, {
+                servername,
                 cached: true
             }));
         }
@@ -137,14 +144,14 @@ export const resolveHostname = (options, callback) => {
             const allAddresses = ipv4Addresses.concat(ipv6Addresses);
             if (allAddresses.length) {
                 const value = {
-                    addresses: allAddresses,
-                    servername: options.servername || host
+                    addresses: allAddresses
                 };
                 dnsCache.set(host, {
                     value,
                     expires: Date.now() + (options.dnsTtl || DNS_TTL)
                 });
                 return callback(null, formatDNSValue(value, {
+                    servername,
                     cached: false
                 }));
             }
@@ -157,6 +164,7 @@ export const resolveHostname = (options, callback) => {
                         expires: Date.now() + (options.dnsTtl || DNS_TTL)
                     });
                     return callback(null, formatDNSValue(cached.value, {
+                        servername,
                         cached: true,
                         error: ipv4Error
                     }));
@@ -171,6 +179,7 @@ export const resolveHostname = (options, callback) => {
                                 expires: Date.now() + (options.dnsTtl || DNS_TTL)
                             });
                             return callback(null, formatDNSValue(cached.value, {
+                                servername,
                                 cached: true,
                                 error: err
                             }));
@@ -188,18 +197,19 @@ export const resolveHostname = (options, callback) => {
                     if (!supportedAddresses.length && cached) {
                         // nothing was found, fallback to cached value
                         return callback(null, formatDNSValue(cached.value, {
+                            servername,
                             cached: true
                         }));
                     }
                     const value = {
-                        addresses: supportedAddresses.length ? supportedAddresses : [host],
-                        servername: options.servername || host
+                        addresses: supportedAddresses.length ? supportedAddresses : [host]
                     };
                     dnsCache.set(host, {
                         value,
                         expires: Date.now() + (options.dnsTtl || DNS_TTL)
                     });
                     return callback(null, formatDNSValue(value, {
+                        servername,
                         cached: false
                     }));
                 });
@@ -211,6 +221,7 @@ export const resolveHostname = (options, callback) => {
                         expires: Date.now() + (options.dnsTtl || DNS_TTL)
                     });
                     return callback(null, formatDNSValue(cached.value, {
+                        servername,
                         cached: true,
                         error: lookupErr
                     }));
@@ -288,6 +299,7 @@ export const parseConnectionUrl = (str) => {
     });
     return options;
 };
+/** @internal */
 export const _logFunc = (logger, level, defaults, data, message, ...args) => {
     const entry = Object.assign({}, defaults || {}, data || {});
     delete entry.level;

package/node_modules/nodemailer/dist/esm/smtp-connection/data-stream.d.ts

@@ -1,4 +1,4 @@
-import { Transform, type TransformCallback, type TransformOptions } from 'node:stream';
+import { Transform, type TransformOptions } from 'node:stream';
 /**
  * Escapes dots in the beginning of lines. Ends the stream with <CR><LF>.<CR><LF>
  * Also makes sure that only <CR><LF> sequences are used for linebreaks
@@ -11,12 +11,4 @@ export default class DataStream extends Transform {
     outByteCount: number;
     lastByte: number | false;
     constructor(options?: TransformOptions);
-    /**
-     * Escapes dots
-     */
-    _transform(chunk: Buffer | string, encoding: BufferEncoding, done: TransformCallback): void;
-    /**
-     * Finalizes the stream with a dot on a single line
-     */
-    _flush(done: TransformCallback): void;
 }

package/node_modules/nodemailer/dist/esm/smtp-connection/data-stream.js

@@ -15,6 +15,7 @@ export default class DataStream extends Transform {
     }
     /**
      * Escapes dots
+     * @internal
      */
     _transform(chunk, encoding, done) {
         const chunks = [];
@@ -74,6 +75,7 @@ export default class DataStream extends Transform {
     }
     /**
      * Finalizes the stream with a dot on a single line
+     * @internal
      */
     _flush(done) {
         let buf;

package/node_modules/nodemailer/dist/esm/smtp-connection/http-proxy-client.d.ts

@@ -8,7 +8,7 @@ import type { NodemailerError } from '../errors.js';
  */
 export interface HttpProxyClientOptions {
     /** Set to false to accept a proxy certificate that fails validation (e.g. self-signed) */
-    rejectUnauthorized?: boolean;
+    rejectUnauthorized?: boolean | undefined;
 }
 /**
  * Receives the proxied socket once the CONNECT handshake has succeeded, or the error that prevented it