@node-red/runtime 1.3.3 → 1.3.7

package/lib/api/nodes.js

@@ -272,7 +272,7 @@ var api = module.exports = {
         } catch(error) {
             runtime.log.audit({event: "nodes.remove",module:opts.module,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
             error.status = 400;
-            throw err;
+            throw error;
         }
     },
 
@@ -319,7 +319,7 @@ var api = module.exports = {
         } catch(error) {
             runtime.log.audit({event: "nodes.module.set",module:mod,enabled:opts.enabled,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
             error.status = 400;
-            throw err;
+            throw error;
         }
     },
 
@@ -366,7 +366,7 @@ var api = module.exports = {
         } catch(error) {
             runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
             error.status = 400;
-            throw err;
+            throw error;
         }
     },
 

package/lib/api/plugins.js

@@ -58,7 +58,7 @@ var api = module.exports = {
     * @memberof @node-red/runtime_plugins
     */
     getPluginConfigs: async function(opts) {
-        if (/[^a-z\-]/i.test(opts.lang)) {
+        if (/[^0-9a-z=\-\*]/i.test(opts.lang)) {
             throw new Error("Invalid language: "+opts.lang)
             return;
         }

package/lib/flows/Flow.js

@@ -369,12 +369,12 @@ class Flow {
             return undefined;
         }
         // console.log((new Error().stack).toString().split("\n").slice(1,3).join("\n"))
-        if ((this.flow.configs && this.flow.configs[id]) || (this.flow.nodes && this.flow.nodes[id])) {
+        if ((this.flow.configs && this.flow.configs[id]) || (this.flow.nodes && this.flow.nodes[id] && this.flow.nodes[id].type.substring(0,8) != "subflow:")) {
             // This is a node owned by this flow, so return whatever we have got
             // During a stop/restart, activeNodes could be null for this id
             return this.activeNodes[id];
         } else if (this.activeNodes[id]) {
-            // TEMP: this is a subflow internal node within this flow
+            // TEMP: this is a subflow internal node within this flow or subflow instance node
             return this.activeNodes[id];
         } else if (this.subflowInstanceNodes[id]) {
             return this.subflowInstanceNodes[id];

package/lib/flows/index.js

@@ -697,7 +697,9 @@ async function updateFlow(id,newFlow, user) {
 
         nodes = [tabNode].concat(newFlow.nodes||[]).concat(newFlow.configs||[]);
         nodes.forEach(function(n) {
-            n.z = id;
+            if (n.type !== 'tab') {
+                n.z = id;
+            }
         });
     }
 

package/lib/flows/util.js

@@ -95,6 +95,9 @@ function createNode(flow,config) {
         } else if (nodeTypeConstructor) {
             // console.log(nodeTypeConstructor)
             var subflowConfig = parseConfig([nodeTypeConstructor.subflow].concat(nodeTypeConstructor.subflow.flow));
+            var subflowInstanceConfig = subflowConfig.subflows[nodeTypeConstructor.subflow.id];
+            delete subflowConfig.subflows[nodeTypeConstructor.subflow.id];
+            subflowInstanceConfig.subflows = subflowConfig.subflows;
             var instanceConfig = clone(config);
             instanceConfig.env = clone(nodeTypeConstructor.subflow.env);
 
@@ -107,7 +110,7 @@ function createNode(flow,config) {
                     switch(typeof config[nodeProp.name]) {
                         case "string": nodePropType = "str"; break;
                         case "number": nodePropType = "num"; break;
-                        case "boolean": nodePropType = "bool"; nodePropValue = nodeProp?"true":"false"; break;
+                        case "boolean": nodePropType = "bool"; nodePropValue == nodeProp?"true":"false"; break;
                         default:
                             nodePropType = config[nodeProp.name].type;
                             nodePropValue = config[nodeProp.name].value;
@@ -124,7 +127,7 @@ function createNode(flow,config) {
                 nodeTypeConstructor.type,
                 flow,
                 flow.global,
-                subflowConfig.subflows[nodeTypeConstructor.subflow.id],
+                subflowInstanceConfig,
                 instanceConfig
             );
             subflow.start();

package/lib/index.js

@@ -64,6 +64,27 @@ var server;
  */
 function init(userSettings,httpServer,_adminApi) {
     server = httpServer;
+
+    if (server && server.on) {
+        // Add a listener to the upgrade event so that we can properly timeout connection
+        // attempts that do not get handled by any nodes in the user's flow.
+        // See #2956
+        server.on('upgrade',(request, socket, head) => {
+            // Add a no-op handler to the error event in case nothing upgrades this socket
+            // before the remote end closes it. This ensures we don't get as uncaughtException
+            socket.on("error", err => {})
+            setTimeout(function() {
+                // If this request has been handled elsewhere, the upgrade will have
+                // been completed and bytes written back to the client.
+                // If nothing has been written on the socket, nothing has handled the
+                // upgrade, so we can consider this an unhandled upgrade.
+                if (socket.bytesWritten === 0) {
+                    socket.destroy();
+                }
+            },userSettings.inboundWebSocketTimeout || 5000)
+        });
+    }
+
     userSettings.version = getVersion();
     settings.init(userSettings);
 
@@ -197,7 +218,7 @@ var reinstallTimeout;
 function reinstallModules(moduleList) {
     const promises = [];
     const reinstallList = [];
-    const installRetry = 30000;
+    var installRetry = 30000;
     if (settings.hasOwnProperty('autoInstallModulesRetry')) {
         log.warn(log._("server.deprecatedOption",{old:"autoInstallModulesRetry", new:"externalModules.autoInstallRetry"}));
         installRetry = settings.autoInstallModulesRetry;

package/lib/nodes/context/index.js

@@ -215,6 +215,22 @@ function followParentContext(parent, key) {
     return null;
 }
 
+function validateContextKey(key) {
+    try {
+        const keys =  Array.isArray(key) ? key : [key];
+        if(!keys.length) { return false }; //no key to get/set
+        for (let index = 0; index < keys.length; index++) {
+            const k = keys[index];
+            if (typeof k !== "string" || !k.length) {
+                return false; //not string or zero-length
+            }
+        }
+    } catch (error) {
+        return false;
+    }
+    return true;
+}
+
 function createContext(id,seed,parent) {
     // Seed is only set for global context - sourced from functionGlobalContext
     var scope = id;
@@ -251,11 +267,11 @@ function createContext(id,seed,parent) {
             }
         }
     }
+
     Object.defineProperties(obj, {
         get: {
             value: function(key, storage, callback) {
                 var context;
-
                 if (!callback && typeof storage === 'function') {
                     callback = storage;
                     storage = undefined;
@@ -263,7 +279,14 @@ function createContext(id,seed,parent) {
                 if (callback && typeof callback !== 'function'){
                     throw new Error("Callback must be a function");
                 }
-
+                if (!validateContextKey(key)) {
+                    var err = Error("Invalid context key");
+                    if(callback) {
+                        return callback(err);
+                    } else {
+                        throw err;
+                    }
+                }
                 if (!Array.isArray(key)) {
                     var keyParts = util.parseContextStore(key);
                     key = keyParts.key;
@@ -337,7 +360,6 @@ function createContext(id,seed,parent) {
         set: {
             value: function(key, value, storage, callback) {
                 var context;
-
                 if (!callback && typeof storage === 'function') {
                     callback = storage;
                     storage = undefined;
@@ -345,7 +367,14 @@ function createContext(id,seed,parent) {
                 if (callback && typeof callback !== 'function'){
                     throw new Error("Callback must be a function");
                 }
-
+                if (!validateContextKey(key)) {
+                    var err = Error("Invalid context key");
+                    if(callback) {
+                        return callback(err);
+                    } else {
+                        throw err;
+                    }
+                }
                 if (!Array.isArray(key)) {
                     var keyParts = util.parseContextStore(key);
                     key = keyParts.key;

package/lib/nodes/credentials.js

@@ -343,7 +343,11 @@ var api = module.exports = {
         if (newCreds) {
             delete node.credentials;
             var savedCredentials = credentialCache[nodeID] || {};
-            if (/^subflow(:|$)/.test(nodeType)) {
+            // Need to check the type of constructor for this node.
+            // - Function : regular node
+            // - !Function: subflow module
+
+            if (/^subflow(:|$)/.test(nodeType) || typeof runtime.nodes.getType(nodeType) !== 'function') {
                 for (cred in newCreds) {
                     if (newCreds.hasOwnProperty(cred)) {
                         if (newCreds[cred] === "__PWRD__") {

package/lib/storage/localfilesystem/projects/git/index.js

@@ -291,7 +291,7 @@ function parseLog(log) {
             currentCommit = {}
             return;
         }
-        var m = /^(.*): (.*)$/.exec(l);
+        var m = /^(.*?): (.*)$/.exec(l);
         if (m) {
             // git 2.1.4 (Debian Stable) doesn't support %D for refs - so filter out
             if (m[1] === 'refs' && m[2]) {

package/lib/storage/localfilesystem/projects/index.js

@@ -608,8 +608,15 @@ async function saveFlows(flows, user) {
             var workflowMode = (gitSettings.workflow||{}).mode || settings.editorTheme.projects.workflow.mode;
             if (workflowMode === 'auto') {
                 return activeProject.stageFile([flowsFullPath, credentialsFile]).then(() => {
-                    return activeProject.commit(user,{message:"Update flow files"})
-                })
+                    return activeProject.status(user, false).then((result) => {
+                        const items = Object.values(result.files || {});
+                        // check if saved flow make modification to repository
+                        if (items.findIndex((item) => (item.status === "M ")) < 0) {
+                            return Promise.resolve();
+                        }
+                        return activeProject.commit(user,{message:"Update flow files"})
+                    });
+                });
             }
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "1.3.3",
+    "version": "1.3.7",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "1.3.3",
-        "@node-red/util": "1.3.3",
+        "@node-red/registry": "1.3.7",
+        "@node-red/util": "1.3.7",
         "async-mutex": "0.3.1",
         "clone": "2.1.2",
         "express": "4.17.1",