Merge branch 'master' into dev

CHANGELOG.md

@@ -50,6 +50,13 @@ Nodes
  - Let debug node status msg length be settable via settings (#4402) @dceejay
  - Feat: Add ability to set headers for WebSocket client (#4436) @marcus-j-davies
 
+#### 3.1.9: Maintenance Release
+
+ - Prevent subflow being added to itself (#4654) @knolleary
+ - Fix use of spawn on windows with cmd files (#4652) @knolleary
+ - Guard refresh of unknown subflow (#4640) @knolleary
+ - Fix subflow module sending messages to debug sidebar (#4642) @knolleary
+
 #### 3.1.8: Maintenance Release
 
  - Add validation and error handling on subflow instance properties (#4632) @knolleary

package.json

@@ -74,7 +74,7 @@
         "passport-oauth2-client-password": "0.1.2",
         "raw-body": "2.5.2",
         "semver": "7.5.4",
-        "tar": "6.1.13",
+        "tar": "6.2.1",
         "tough-cookie": "4.1.3",
         "uglify-js": "3.17.4",
         "uuid": "9.0.0",

packages/node_modules/@node-red/editor-client/src/js/ui/view.js

@@ -646,6 +646,7 @@ RED.view = (function() {
                 }
                 d3.event = event;
                 var selected_tool = $(ui.draggable[0]).attr("data-palette-type");
+                try {
                     var result = createNode(selected_tool);
                     if (!result) {
                         return;
@@ -761,6 +762,13 @@ RED.view = (function() {
                     if (nn._def.autoedit) {
                         RED.editor.edit(nn);
                     }
+                } catch (error) {
+                    if (error.code != "NODE_RED") {
+                        RED.notify(RED._("notification.error",{message:error.toString()}),"error");
+                    } else {
+                        RED.notify(RED._("notification.error",{message:error.message}),"error");
+                    }
+                }
             }
         });
         chart.on("focus", function() {
@@ -6063,14 +6071,19 @@ RED.view = (function() {
      function createNode(type, x, y, z) {
         const wasDirty = RED.nodes.dirty()
         var m = /^subflow:(.+)$/.exec(type);
-        var activeSubflow = z ? RED.nodes.subflow(z) : null;
+        var activeSubflow = (z || RED.workspaces.active()) ? RED.nodes.subflow(z || RED.workspaces.active()) : null;
+
         if (activeSubflow && m) {
             var subflowId = m[1];
+            let err
             if (subflowId === activeSubflow.id) {
-                throw new Error(RED._("notification.error", { message: RED._("notification.errors.cannotAddSubflowToItself") }))
+                err = new Error(RED._("notification.errors.cannotAddSubflowToItself"))
+            } else if (RED.nodes.subflowContains(m[1], activeSubflow.id)) {
+                err = new Error(RED._("notification.errors.cannotAddCircularReference"))
             }
-            if (RED.nodes.subflowContains(m[1], activeSubflow.id)) {
+            if (err) {
-                throw new Error(RED._("notification.error", { message: RED._("notification.errors.cannotAddCircularReference") }))
+                err.code = 'NODE_RED'
+                throw err
             }
         }
 

packages/node_modules/@node-red/nodes/core/function/90-exec.js

@@ -20,6 +20,7 @@ module.exports = function(RED) {
     var exec = require('child_process').exec;
     var fs = require('fs');
     var isUtf8 = require('is-utf8');
+    const isWindows = process.platform === 'win32'
 
     function ExecNode(n) {
         RED.nodes.createNode(this,n);
@@ -85,9 +86,12 @@ module.exports = function(RED) {
                         }
                     });
                     var cmd = arg.shift();
+                    // Since 18.20.2/20.12.2, it is invalid to call spawn on Windows with a .bat/.cmd file
+                    // without using shell: true. 
+                    const opts = isWindows ? { ...node.spawnOpt, shell: true } : node.spawnOpt
                     /* istanbul ignore else  */
                     node.debug(cmd+" ["+arg+"]");
-                    child = spawn(cmd,arg,node.spawnOpt);
+                    child = spawn(cmd,arg,opts);
                     node.status({fill:"blue",shape:"dot",text:"pid:"+child.pid});
                     var unknownCommand = (child.pid === undefined);
                     if (node.timer !== 0) {

packages/node_modules/@node-red/registry/lib/externalModules.js

@@ -273,7 +273,7 @@ async function installModule(moduleDetails) {
                 let extraArgs = triggerPayload.args || [];
                 let args = ['install', ...extraArgs, installSpec]
                 log.trace(NPM_COMMAND + JSON.stringify(args));
-                return exec.run(NPM_COMMAND, args, { cwd: installDir },true)
+                return exec.run(NPM_COMMAND, args, { cwd: installDir, shell: true },true)
             } else {
                 log.trace("skipping npm install");
             }

packages/node_modules/@node-red/registry/lib/installer.js

@@ -25,14 +25,17 @@ const registryUtil = require("./util");
 const library = require("./library");
 const {exec,log,events,hooks} = require("@node-red/util");
 const child_process = require('child_process');
-const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-let installerEnabled = false;
 
 const plugins = require("./plugins");
 
+const isWindows = process.platform === 'win32'
+const npmCommand =  isWindows ? 'npm.cmd' : 'npm';
+
+let installerEnabled = false;
 let settings;
+
 const moduleRe = /^(@[^/@]+?[/])?[^/@]+?$/;
-const slashRe = process.platform === "win32" ? /\\|[/]/ : /[/]/;
+const slashRe = isWindows ? /\\|[/]/ : /[/]/;
 const pkgurlRe = /^(https?|git(|\+https?|\+ssh|\+file)):\/\//;
 const localtgzRe = /^([a-zA-Z]:|\/).+tgz$/;
 
@@ -227,7 +230,7 @@ async function installModule(module,version,url) {
                 let extraArgs = triggerPayload.args || [];
                 let args = ['install', ...extraArgs, installName]
                 log.trace(npmCommand + JSON.stringify(args));
-                return exec.run(npmCommand,args,{ cwd: installDir}, true)
+                return exec.run(npmCommand,args,{ cwd: installDir, shell: true }, true)
             } else {
                 log.trace("skipping npm install");
             }
@@ -262,7 +265,7 @@ async function installModule(module,version,url) {
                 log.warn("------------------------------------------");
                 e = new Error(log._("server.install.install-failed")+": "+err.toString());
                 if (err.hook === "postInstall") {
-                    return exec.run(npmCommand,["remove",module],{ cwd: installDir}, false).finally(() => {
+                    return exec.run(npmCommand,["remove",module],{ cwd: installDir, shell: true }, false).finally(() => {
                         throw e;
                     })
                 }
@@ -366,7 +369,7 @@ async function getModuleVersionFromNPM(module, version) {
     }
 
     return new Promise((resolve, reject) => {
-        child_process.execFile(npmCommand,['info','--json',installName],function(err,stdout,stderr) {
+        child_process.execFile(npmCommand,['info','--json',installName],{ shell: true },function(err,stdout,stderr) {
             try {
                 if (!stdout) {
                     log.warn(log._("server.install.install-failed-not-found",{name:module}));
@@ -525,7 +528,7 @@ function uninstallModule(module) {
                     let extraArgs = triggerPayload.args || [];
                     let args = ['remove', ...extraArgs, module]
                     log.trace(npmCommand + JSON.stringify(args));
-                    return exec.run(npmCommand,args,{ cwd: installDir}, true)
+                    return exec.run(npmCommand,args,{ cwd: installDir, shell: true }, true)
                 } else {
                     log.trace("skipping npm uninstall");
                 }
@@ -592,7 +595,7 @@ async function checkPrereq() {
         installerEnabled = false;
     } else {
         return new Promise(resolve => {
-            child_process.execFile(npmCommand,['-v'],function(err,stdout) {
+            child_process.execFile(npmCommand,['-v'],{ shell: true },function(err,stdout) {
                 if (err) {
                     log.info(log._("server.palette-editor.npm-not-found"));
                     installerEnabled = false;

packages/node_modules/@node-red/registry/package.json

@@ -20,7 +20,7 @@
         "clone": "2.1.2",
         "fs-extra": "11.1.1",
         "semver": "7.5.4",
-        "tar": "6.1.13",
+        "tar": "6.2.1",
         "uglify-js": "3.17.4"
     }
 }