@nocobase/plugin-workflow-mailer 2.2.17 → 2.2.18

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

@@ -6,13 +6,14 @@
 const MessageParser = require('./message-parser');
 const RelaxedBody = require('./relaxed-body');
 const sign = require('./sign');
-const PassThrough = require('stream').PassThrough;
+const { PassThrough } = require('stream');
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
+const { copyOwnKeys } = require('../shared/objects');
 
 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:
@@ -42,7 +43,9 @@ class DKIMSigner {
         this.chunks = [];
         this.chunklen = 0;
         this.readPos = 0;
-        this.cachePath = this.cacheDir ? path.join(this.cacheDir, 'message.' + Date.now() + '-' + crypto.randomBytes(14).toString('hex')) : false;
+        this.cachePath = this.cacheDir
+            ? path.join(this.cacheDir, 'message.' + Date.now() + '-' + crypto.randomBytes(14).toString('hex'))
+            : false;
         this.cache = false;
 
         this.headers = false;
@@ -94,7 +97,7 @@ class DKIMSigner {
             }
             return this.createReadCache();
         }
-        let chunk = this.chunks[this.readPos++];
+        const chunk = this.chunks[this.readPos++];
         if (this.output.write(chunk) === false) {
             return this.output.once('drain', () => {
                 this.sendNextChunk();
@@ -105,13 +108,13 @@ class DKIMSigner {
 
     sendSignedOutput() {
         let keyPos = 0;
-        let signNextKey = () => {
+        const signNextKey = () => {
             if (keyPos >= this.keys.length) {
                 this.output.write(this.parser.rawHeaders);
                 return setImmediate(() => this.sendNextChunk());
             }
-            let key = this.keys[keyPos++];
-            let dkimField = sign(this.headers, this.hashAlgo, this.bodyHash, {
+            const key = this.keys[keyPos++];
+            const dkimField = sign(this.headers, this.hashAlgo, this.bodyHash, {
                 domainName: key.domainName,
                 keySelector: key.keySelector,
                 privateKey: key.privateKey,
@@ -209,7 +212,7 @@ class DKIM {
     }
 
     sign(input, extraOptions) {
-        let output = new PassThrough();
+        const output = new PassThrough();
         let inputStream = input;
         let writeValue = false;
 
@@ -223,18 +226,14 @@ class DKIM {
 
         let options = this.options;
         if (extraOptions && Object.keys(extraOptions).length) {
-            options = {};
-            Object.keys(this.options || {}).forEach(key => {
-                options[key] = this.options[key];
-            });
-            Object.keys(extraOptions || {}).forEach(key => {
-                if (!(key in options)) {
-                    options[key] = extraOptions[key];
-                }
-            });
+            // extraOptions is mail.data._dkim, caller supplied message data. An own
+            // "__proto__" key there would let every option this signer reads and the
+            // transport did not set, such as skipFields, answer from the caller
+            options = copyOwnKeys({}, extraOptions);
+            copyOwnKeys(options, this.options);
         }
 
-        let signer = new DKIMSigner(options, this.keys, inputStream, output);
+        const signer = new DKIMSigner(options, this.keys, inputStream, output);
         setImmediate(() => {
             signer.signStream();
             if (writeValue) {

package/dist/node_modules/nodemailer/lib/dkim/message-parser.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Transform = require('stream').Transform;
+const { Transform } = require('stream');
 
 /**
  * MessageParser instance is a transform stream that separates message headers
@@ -24,8 +24,8 @@ class MessageParser extends Transform {
      * @param {Buffer} data Next data chunk from the stream
      */
     updateLastBytes(data) {
-        let lblen = this.lastBytes.length;
-        let nblen = Math.min(data.length, lblen);
+        const lblen = this.lastBytes.length;
+        const nblen = Math.min(data.length, lblen);
 
         // shift existing bytes
         for (let i = 0, len = lblen - nblen; i < len; i++) {
@@ -50,9 +50,8 @@ class MessageParser extends Transform {
             return true;
         }
 
-        let lblen = this.lastBytes.length;
+        const lblen = this.lastBytes.length;
         let headerPos = 0;
-        this.curLinePos = 0;
         for (let i = 0, len = this.lastBytes.length + data.length; i < len; i++) {
             let chr;
             if (i < lblen) {
@@ -61,8 +60,8 @@ class MessageParser extends Transform {
                 chr = data[i - lblen];
             }
             if (chr === 0x0a && i) {
-                let pr1 = i - 1 < lblen ? this.lastBytes[i - 1] : data[i - 1 - lblen];
-                let pr2 = i > 1 ? (i - 2 < lblen ? this.lastBytes[i - 2] : data[i - 2 - lblen]) : false;
+                const pr1 = i - 1 < lblen ? this.lastBytes[i - 1] : data[i - 1 - lblen];
+                const pr2 = i > 1 ? (i - 2 < lblen ? this.lastBytes[i - 2] : data[i - 2 - lblen]) : false;
                 if (pr1 === 0x0a) {
                     this.headersParsed = true;
                     headerPos = i - lblen + 1;
@@ -83,17 +82,17 @@ class MessageParser extends Transform {
             this.headerChunks = null;
             this.emit('headers', this.parseHeaders());
             if (data.length - 1 > headerPos) {
-                let chunk = data.slice(headerPos);
+                const chunk = data.slice(headerPos);
                 this.bodySize += chunk.length;
                 // this would be the first chunk of data sent downstream
                 setImmediate(() => this.push(chunk));
             }
             return false;
-        } else {
-            this.headerBytes += data.length;
-            this.headerChunks.push(data);
         }
 
+        this.headerBytes += data.length;
+        this.headerChunks.push(data);
+
         // store last 4 bytes to catch header break
         this.updateLastBytes(data);
 
@@ -127,7 +126,7 @@ class MessageParser extends Transform {
 
     _flush(callback) {
         if (this.headerChunks) {
-            let chunk = Buffer.concat(this.headerChunks, this.headerBytes);
+            const chunk = Buffer.concat(this.headerChunks, this.headerBytes);
             this.bodySize += chunk.length;
             this.push(chunk);
             this.headerChunks = null;
@@ -136,7 +135,7 @@ class MessageParser extends Transform {
     }
 
     parseHeaders() {
-        let lines = (this.rawHeaders || '').toString().split(/\r?\n/);
+        const lines = (this.rawHeaders || '').toString().split(/\r?\n/);
         for (let i = lines.length - 1; i > 0; i--) {
             if (/^\s/.test(lines[i])) {
                 lines[i - 1] += '\n' + lines[i];

package/dist/node_modules/nodemailer/lib/dkim/relaxed-body.js

@@ -2,7 +2,7 @@
 
 // streams through a message body and calculates relaxed body hash
 
-const Transform = require('stream').Transform;
+const { Transform } = require('stream');
 const crypto = require('crypto');
 
 class RelaxedBody extends Transform {
@@ -11,7 +11,7 @@ class RelaxedBody extends Transform {
         options = options || {};
         this.chunkBuffer = [];
         this.chunkBufferLen = 0;
-        this.bodyHash = crypto.createHash(options.hashAlgo || 'sha1');
+        this.bodyHash = crypto.createHash(options.hashAlgo || 'sha256');
         this.remainder = '';
         this.byteLength = 0;
 
@@ -29,7 +29,7 @@ class RelaxedBody extends Transform {
         // If we get another chunk that does not match this description then we can restore the previously processed data
         let state = 'file';
         for (let i = chunk.length - 1; i >= 0; i--) {
-            let c = chunk[i];
+            const c = chunk[i];
 
             if (state === 'file' && (c === 0x0a || c === 0x0d)) {
                 // do nothing, found \n or \r at the end of chunk, stil end of file

package/dist/node_modules/nodemailer/lib/dkim/sign.js

@@ -20,7 +20,7 @@ module.exports = (headers, hashAlgo, bodyHash, options) => {
     options = options || {};
 
     // all listed fields from RFC4871 #5.5
-    let defaultFieldNames =
+    const defaultFieldNames =
         'From:Sender:Reply-To:Subject:Date:Message-ID:To:' +
         'Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:' +
         'Content-Description:Resent-Date:Resent-From:Resent-Sender:' +
@@ -28,20 +28,19 @@ module.exports = (headers, hashAlgo, bodyHash, options) => {
         'List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:' +
         'List-Owner:List-Archive';
 
-    let fieldNames = options.headerFieldNames || defaultFieldNames;
+    const fieldNames = options.headerFieldNames || defaultFieldNames;
 
-    let canonicalizedHeaderData = relaxedHeaders(headers, fieldNames, options.skipFields);
-    let dkimHeader = generateDKIMHeader(options.domainName, options.keySelector, canonicalizedHeaderData.fieldNames, hashAlgo, bodyHash);
-
-    let signer, signature;
+    const canonicalizedHeaderData = relaxedHeaders(headers, fieldNames, options.skipFields);
+    const dkimHeader = generateDKIMHeader(options.domainName, options.keySelector, canonicalizedHeaderData.fieldNames, hashAlgo, bodyHash);
 
     canonicalizedHeaderData.headers += 'dkim-signature:' + relaxedHeaderLine(dkimHeader);
 
-    signer = crypto.createSign(('rsa-' + hashAlgo).toUpperCase());
+    const signer = crypto.createSign(('rsa-' + hashAlgo).toUpperCase());
     signer.update(canonicalizedHeaderData.headers);
+    let signature;
     try {
         signature = signer.sign(options.privateKey, 'base64');
-    } catch (E) {
+    } catch (_E) {
         return false;
     }
 
@@ -51,24 +50,29 @@ module.exports = (headers, hashAlgo, bodyHash, options) => {
 module.exports.relaxedHeaders = relaxedHeaders;
 
 function generateDKIMHeader(domainName, keySelector, fieldNames, hashAlgo, bodyHash) {
-    let dkim = [
+    // the caller supplied tag values are interpolated straight into the tag list, and none of
+    // them has any way to carry a control char, DEL, or one of the delimiters that would close
+    // the value and open a tag of its own
+    const cleanTagValue = value => (value || '').toString().replace(/[\x00-\x1f\x7f;=]/g, '');
+
+    const dkim = [
         'v=1',
         'a=rsa-' + hashAlgo,
         'c=relaxed/relaxed',
-        'd=' + punycode.toASCII(domainName),
+        'd=' + punycode.toASCII(cleanTagValue(domainName)),
         'q=dns/txt',
-        's=' + keySelector,
+        's=' + cleanTagValue(keySelector),
         'bh=' + bodyHash,
-        'h=' + fieldNames
+        'h=' + cleanTagValue(fieldNames)
     ].join('; ');
 
     return mimeFuncs.foldLines('DKIM-Signature: ' + dkim, 76) + ';\r\n b=';
 }
 
 function relaxedHeaders(headers, fieldNames, skipFields) {
-    let includedFields = new Set();
-    let skip = new Set();
-    let headerFields = new Map();
+    const includedFields = new Set();
+    const skip = new Set();
+    const headerFields = new Map();
 
     (skipFields || '')
         .toLowerCase()
@@ -86,15 +90,15 @@ function relaxedHeaders(headers, fieldNames, skipFields) {
         });
 
     for (let i = headers.length - 1; i >= 0; i--) {
-        let line = headers[i];
+        const line = headers[i];
         // only include the first value from bottom to top
         if (includedFields.has(line.key) && !headerFields.has(line.key)) {
             headerFields.set(line.key, relaxedHeaderLine(line.line));
         }
     }
 
-    let headersList = [];
-    let fields = [];
+    const headersList = [];
+    const fields = [];
     includedFields.forEach(field => {
         if (headerFields.has(field)) {
             fields.push(field);

package/dist/node_modules/nodemailer/lib/errors.js

@@ -0,0 +1,59 @@
+'use strict';
+
+/**
+ * Nodemailer Error Codes
+ *
+ * Centralized error code definitions for consistent error handling.
+ *
+ * Usage:
+ *   const errors = require('./errors');
+ *   let err = new Error('Connection closed');
+ *   err.code = errors.ECONNECTION;
+ */
+
+/**
+ * Error code descriptions for documentation and debugging
+ */
+const ERROR_CODES = {
+    // Connection errors
+    ECONNECTION: 'Connection closed unexpectedly',
+    ETIMEDOUT: 'Connection or operation timed out',
+    ESOCKET: 'Socket-level error',
+    EDNS: 'DNS resolution failed',
+
+    // TLS/Security errors
+    ETLS: 'TLS handshake or STARTTLS failed',
+    EREQUIRETLS: 'REQUIRETLS not supported by server (RFC 8689)',
+
+    // Protocol errors
+    EPROTOCOL: 'Invalid SMTP server response',
+    EENVELOPE: 'Invalid mail envelope (sender or recipients)',
+    EMESSAGE: 'Message delivery error',
+    ESTREAM: 'Stream processing error',
+
+    // Authentication errors
+    EAUTH: 'Authentication failed',
+    ENOAUTH: 'Authentication credentials not provided',
+    EOAUTH2: 'OAuth2 token generation or refresh error',
+
+    // Resource errors
+    EMAXLIMIT: 'Pool resource limit reached (max messages per connection)',
+    EMAXRECIPIENTS: 'Recipient count exceeds maxRecipients',
+
+    // Transport-specific errors
+    ESENDMAIL: 'Sendmail command error',
+    ESES: 'AWS SES transport error',
+
+    // Configuration and access errors
+    ECONFIG: 'Invalid configuration',
+    EPROXY: 'Proxy connection error',
+    EFILEACCESS: 'File access rejected (disableFileAccess is set)',
+    EURLACCESS: 'URL access rejected (disableUrlAccess is set)',
+    EFETCH: 'HTTP fetch error'
+};
+
+// Export error codes as string constants and the full definitions object
+module.exports = { ERROR_CODES };
+for (const code of Object.keys(ERROR_CODES)) {
+    module.exports[code] = code;
+}

package/dist/node_modules/nodemailer/lib/fetch/cookies.js

@@ -2,7 +2,7 @@
 
 // module to handle cookies
 
-const urllib = require('url');
+const urllib = require('../shared/url');
 
 const SESSION_TIMEOUT = 1800; // 30 min
 
@@ -25,8 +25,8 @@ class Cookies {
      * @param {String} url Current URL
      */
     set(cookieStr, url) {
-        let urlparts = urllib.parse(url || '');
-        let cookie = this.parse(cookieStr);
+        const urlparts = urllib.parse(url || '');
+        const cookie = this.parse(cookieStr);
         let domain;
 
         if (cookie.domain) {
@@ -76,15 +76,13 @@ class Cookies {
      * @returns {Array} An array of cookie objects
      */
     list(url) {
-        let result = [];
-        let i;
-        let cookie;
+        const result = [];
 
-        for (i = this.cookies.length - 1; i >= 0; i--) {
-            cookie = this.cookies[i];
+        for (let i = this.cookies.length - 1; i >= 0; i--) {
+            const cookie = this.cookies[i];
 
             if (this.isExpired(cookie)) {
-                this.cookies.splice(i, i);
+                this.cookies.splice(i, 1);
                 continue;
             }
 
@@ -103,14 +101,14 @@ class Cookies {
      * @returns {Object} Cookie object
      */
     parse(cookieStr) {
-        let cookie = {};
+        const cookie = {};
 
         (cookieStr || '')
             .toString()
             .split(';')
             .forEach(cookiePart => {
-                let valueParts = cookiePart.split('=');
-                let key = valueParts.shift().trim().toLowerCase();
+                const valueParts = cookiePart.split('=');
+                const key = valueParts.shift().trim().toLowerCase();
                 let value = valueParts.join('=').trim();
                 let domain;
 
@@ -171,7 +169,7 @@ class Cookies {
      * @returns {Boolean} true if cookie is valid for specifiec URL
      */
     match(cookie, url) {
-        let urlparts = urllib.parse(url || '');
+        const urlparts = urllib.parse(url || '');
 
         // check if hostname matches
         // .foo.com also matches subdomains, foo.com does not
@@ -183,7 +181,7 @@ class Cookies {
         }
 
         // check if path matches
-        let path = this.getPath(urlparts.pathname);
+        const path = this.getPath(urlparts.pathname);
         if (path.substr(0, cookie.path.length) !== cookie.path) {
             return false;
         }
@@ -202,16 +200,13 @@ class Cookies {
      * @param {Object} cookie Cookie value to be stored
      */
     add(cookie) {
-        let i;
-        let len;
-
         // nothing to do here
         if (!cookie || !cookie.name) {
             return false;
         }
 
         // overwrite if has same params
-        for (i = 0, len = this.cookies.length; i < len; i++) {
+        for (let i = 0, len = this.cookies.length; i < len; i++) {
             if (this.compare(this.cookies[i], cookie)) {
                 // check if the cookie needs to be removed instead
                 if (this.isExpired(cookie)) {
@@ -240,7 +235,7 @@ class Cookies {
      * @returns {Boolean} True, if the cookies are the same
      */
     compare(a, b) {
-        return a.name === b.name && a.path === b.path && a.domain === b.domain && a.secure === b.secure && a.httponly === a.httponly;
+        return a.name === b.name && a.path === b.path && a.domain === b.domain && a.secure === b.secure && a.httponly === b.httponly;
     }
 
     /**