@nocobase/plugin-workflow-mailer 2.2.17 → 2.2.18

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

@@ -250,7 +250,7 @@ const decode = function (input) {
     // Main decoding loop: start just after the last delimiter if any basic code
     // points were copied; start at the beginning otherwise.
 
-    for (let index = basic > 0 ? basic + 1 : 0; index < inputLength /* no final expression */; ) {
+    for (let index = basic > 0 ? basic + 1 : 0; index < inputLength /* no final expression */;) {
         // `index` is the index of the next character to be consumed.
         // Decode a generalized variable-length integer into `delta`,
         // which gets added to `i`. The overflow checking is easier

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

@@ -1,6 +1,6 @@
 'use strict';
 
-const Transform = require('stream').Transform;
+const { Transform } = require('stream');
 
 /**
  * Encodes a Buffer into a Quoted-Printable encoded string
@@ -8,27 +8,31 @@ const Transform = require('stream').Transform;
  * @param {Buffer} buffer Buffer to convert
  * @returns {String} Quoted-Printable encoded string
  */
+// usable characters that do not need encoding
+// https://tools.ietf.org/html/rfc2045#section-6.7
+const QP_RANGES = [
+    [0x09], // <TAB>
+    [0x0a], // <LF>
+    [0x0d], // <CR>
+    [0x20, 0x3c], // <SP>!"#$%&'()*+,-./0123456789:;
+    [0x3e, 0x7e] // >?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}
+];
+
 function encode(buffer) {
     if (typeof buffer === 'string') {
         buffer = Buffer.from(buffer, 'utf-8');
     }
 
-    // usable characters that do not need encoding
-    let ranges = [
-        // https://tools.ietf.org/html/rfc2045#section-6.7
-        [0x09], // <TAB>
-        [0x0a], // <LF>
-        [0x0d], // <CR>
-        [0x20, 0x3c], // <SP>!"#$%&'()*+,-./0123456789:;
-        [0x3e, 0x7e] // >?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}
-    ];
     let result = '';
     let ord;
 
     for (let i = 0, len = buffer.length; i < len; i++) {
         ord = buffer[i];
         // if the char is in allowed range, then keep as is, unless it is a WS in the end of a line
-        if (checkRanges(ord, ranges) && !((ord === 0x20 || ord === 0x09) && (i === len - 1 || buffer[i + 1] === 0x0a || buffer[i + 1] === 0x0d))) {
+        if (
+            checkRanges(ord, QP_RANGES) &&
+            !((ord === 0x20 || ord === 0x09) && (i === len - 1 || buffer[i + 1] === 0x0a || buffer[i + 1] === 0x0d))
+        ) {
             result += String.fromCharCode(ord);
             continue;
         }
@@ -54,9 +58,9 @@ function wrap(str, lineLength) {
     }
 
     let pos = 0;
-    let len = str.length;
+    const len = str.length;
     let match, code, line;
-    let lineMargin = Math.floor(lineLength / 3);
+    const lineMargin = Math.floor(lineLength / 3);
     let result = '';
 
     // insert soft linebreaks where needed
@@ -70,17 +74,20 @@ function wrap(str, lineLength) {
         }
 
         if (line.substr(-1) === '\n') {
-            // nothing to change here
             result += line;
             pos += line.length;
             continue;
-        } else if ((match = line.substr(-lineMargin).match(/\n.*?$/))) {
+        }
+
+        if ((match = line.substr(-lineMargin).match(/\n.*?$/))) {
             // truncate to nearest line break
             line = line.substr(0, line.length - (match[0].length - 1));
             result += line;
             pos += line.length;
             continue;
-        } else if (line.length > lineLength - lineMargin && (match = line.substr(-lineMargin).match(/[ \t.,!?][^ \t.,!?]*$/))) {
+        }
+
+        if (line.length > lineLength - lineMargin && (match = line.substr(-lineMargin).match(/[ \t.,!?][^ \t.,!?]*$/))) {
             // truncate to nearest space
             line = line.substr(0, line.length - (match[0].length - 1));
         } else if (line.match(/[=][\da-f]{0,2}$/i)) {
@@ -90,7 +97,12 @@ function wrap(str, lineLength) {
             }
 
             // ensure that utf-8 sequences are not split
-            while (line.length > 3 && line.length < len - pos && !line.match(/^(?:=[\da-f]{2}){1,4}$/i) && (match = line.match(/[=][\da-f]{2}$/gi))) {
+            while (
+                line.length > 3 &&
+                line.length < len - pos &&
+                !line.match(/^(?:=[\da-f]{2}){1,4}$/i) &&
+                (match = line.match(/[=][\da-f]{2}$/gi))
+            ) {
                 code = parseInt(match[0].substr(1, 2), 16);
                 if (code < 128) {
                     break;
@@ -131,13 +143,14 @@ function wrap(str, lineLength) {
  */
 function checkRanges(nr, ranges) {
     for (let i = ranges.length - 1; i >= 0; i--) {
-        if (!ranges[i].length) {
+        const range = ranges[i];
+        if (!range.length) {
             continue;
         }
-        if (ranges[i].length === 1 && nr === ranges[i][0]) {
+        if (range.length === 1 && nr === range[0]) {
             return true;
         }
-        if (ranges[i].length === 2 && nr >= ranges[i][0] && nr <= ranges[i][1]) {
+        if (range.length === 2 && nr >= range[0] && nr <= range[1]) {
             return true;
         }
     }
@@ -155,7 +168,6 @@ class Encoder extends Transform {
     constructor(options) {
         super();
 
-        // init Transform
         this.options = options || {};
 
         if (this.options.lineLength !== false) {
@@ -211,7 +223,6 @@ class Encoder extends Transform {
     }
 }
 
-// expose to the world
 module.exports = {
     encode,
     wrap,

package/dist/node_modules/nodemailer/lib/sendmail-transport/index.js

@@ -1,8 +1,11 @@
 'use strict';
 
-const spawn = require('child_process').spawn;
+const { spawn } = require('child_process');
 const packageData = require('../../package.json');
 const shared = require('../shared');
+const errors = require('../errors');
+const LeWindows = require('../mime-node/le-windows');
+const LeUnix = require('../mime-node/le-unix');
 
 /**
  * Generates a Transport object for Sendmail
@@ -23,32 +26,30 @@ class SendmailTransport {
         // use a reference to spawn for mocking purposes
         this._spawn = spawn;
 
-        this.options = options || {};
+        this.options = options;
 
         this.name = 'Sendmail';
         this.version = packageData.version;
 
         this.path = 'sendmail';
         this.args = false;
-        this.winbreak = false;
 
         this.logger = shared.getLogger(this.options, {
             component: this.options.component || 'sendmail'
         });
 
-        if (options) {
-            if (typeof options === 'string') {
-                this.path = options;
-            } else if (typeof options === 'object') {
-                if (options.path) {
-                    this.path = options.path;
-                }
-                if (Array.isArray(options.args)) {
-                    this.args = options.args;
-                }
-                this.winbreak = ['win', 'windows', 'dos', '\r\n'].includes((options.newline || '').toString().toLowerCase());
+        if (typeof options === 'string') {
+            this.path = options;
+        } else if (typeof options === 'object') {
+            if (options.path) {
+                this.path = options.path;
+            }
+            if (Array.isArray(options.args)) {
+                this.args = options.args;
             }
         }
+
+        this.winbreak = ['win', 'windows', 'dos', '\r\n'].includes((options.newline || '').toString().toLowerCase());
     }
 
     /**
@@ -61,28 +62,29 @@ class SendmailTransport {
         // Sendmail strips this header line by itself
         mail.message.keepBcc = true;
 
-        let envelope = mail.data.envelope || mail.message.getEnvelope();
-        let messageId = mail.message.messageId();
-        let args;
-        let sendmail;
+        const envelope = mail.message.getEnvelope();
+        const messageId = mail.message.messageId();
         let returned;
 
         const hasInvalidAddresses = []
             .concat(envelope.from || [])
             .concat(envelope.to || [])
-            .some(addr => /^-/.test(addr));
+            // a local part is either a dot-atom or a quoted-string, so a leading dash sits at
+            // offset 0 or, behind the opening quote, at offset 1. Only the first shape is read
+            // as an option by sendmail, but both are the address this guard keeps out of argv
+            .some(addr => /^"?-/.test(addr));
         if (hasInvalidAddresses) {
-            return done(new Error('Can not send mail. Invalid envelope addresses.'));
+            const err = new Error('Can not send mail. Invalid envelope addresses.');
+            err.code = errors.ESENDMAIL;
+            return done(err);
         }
 
-        if (this.args) {
-            // force -i to keep single dots
-            args = ['-i'].concat(this.args).concat(envelope.to);
-        } else {
-            args = ['-i'].concat(envelope.from ? ['-f', envelope.from] : []).concat(envelope.to);
-        }
+        // force -i to keep single dots
+        const args = this.args
+            ? ['-i'].concat(this.args).concat(envelope.to)
+            : ['-i'].concat(envelope.from ? ['-f', envelope.from] : []).concat(envelope.to);
 
-        let callback = err => {
+        const callback = err => {
             if (returned) {
                 // ignore any additional responses, already done
                 return;
@@ -91,16 +93,16 @@ class SendmailTransport {
             if (typeof done === 'function') {
                 if (err) {
                     return done(err);
-                } else {
-                    return done(null, {
-                        envelope: mail.data.envelope || mail.message.getEnvelope(),
-                        messageId,
-                        response: 'Messages queued for delivery'
-                    });
                 }
+                return done(null, {
+                    envelope,
+                    messageId,
+                    response: 'Messages queued for delivery'
+                });
             }
         };
 
+        let sendmail;
         try {
             sendmail = this._spawn(this.path, args);
         } catch (E) {
@@ -135,12 +137,10 @@ class SendmailTransport {
                 if (!code) {
                     return callback();
                 }
-                let err;
-                if (code === 127) {
-                    err = new Error('Sendmail command not found, process exited with code ' + code);
-                } else {
-                    err = new Error('Sendmail exited with code ' + code);
-                }
+                const err = new Error(
+                    code === 127 ? 'Sendmail command not found, process exited with code ' + code : 'Sendmail exited with code ' + code
+                );
+                err.code = errors.ESENDMAIL;
 
                 this.logger.error(
                     {
@@ -170,7 +170,7 @@ class SendmailTransport {
                 callback(err);
             });
 
-            let recipients = [].concat(envelope.to || []);
+            const recipients = [].concat(envelope.to || []);
             if (recipients.length > 3) {
                 recipients.push('...and ' + recipients.splice(2).length + ' more');
             }
@@ -184,8 +184,16 @@ class SendmailTransport {
                 recipients.join(', ')
             );
 
-            let sourceStream = mail.message.createReadStream();
-            sourceStream.once('error', err => {
+            const sourceStream = mail.message.createReadStream();
+            let stream = sourceStream;
+            if (this.options.newline) {
+                // apply the transport-level line ending transform; the message-level
+                // `newline` option is handled by MimeNode in createReadStream()
+                stream = sourceStream.pipe(this.winbreak ? new LeWindows() : new LeUnix());
+                sourceStream.once('error', err => stream.emit('error', err));
+            }
+
+            stream.once('error', err => {
                 this.logger.error(
                     {
                         err,
@@ -200,9 +208,11 @@ class SendmailTransport {
                 callback(err);
             });
 
-            sourceStream.pipe(sendmail.stdin);
+            stream.pipe(sendmail.stdin);
         } else {
-            return callback(new Error('sendmail was not found'));
+            const err = new Error('sendmail was not found');
+            err.code = errors.ESENDMAIL;
+            return callback(err);
         }
     }
 }