Ensure key_path is quoted in GIT_SSH_COMMAND in case of spaces in pathname

Merge pull request #3886 from kazuhitoyokoi/master2
Limit number of ports in function node
2025-03-01 10:36:34 +00:00 · 2022-10-04 15:44:29 +01:00 · 2022-10-04 11:00:18 +01:00 · 2022-10-04 10:28:04 +01:00 · 2022-09-19 19:43:06 +01:00 · 2022-09-18 02:22:52 +09:00
5 changed files with 10 additions and 26 deletions
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.html
@@ -451,11 +451,13 @@
            tabs.activateTab("func-tab-body");

            $( "#node-input-outputs" ).spinner({
-                min:0,
+                min: 0,
+                max: 500,
                change: function(event, ui) {
-                    var value = this.value;
-                    if (!value.match(/^\d+$/)) { value = 1;  }
-                    else if (value < this.min) { value = this.min; }
+                    var value = parseInt(this.value);
+                    value = isNaN(value) ? 1 : value;
+                    value = Math.max(value, parseInt($(this).attr("aria-valuemin")));
+                    value = Math.min(value, parseInt($(this).attr("aria-valuemax")));
                    if (value !== this.value) { $(this).spinner("value", value); }
                }
            });
--- a/packages/node_modules/@node-red/nodes/core/function/15-change.js
+++ b/packages/node_modules/@node-red/nodes/core/function/15-change.js
@@ -318,7 +318,7 @@ module.exports = function(RED) {
            }
            var r = node.rules[currentRule];
            if (r.t === "move") {
-                if ((r.tot !== r.pt) || (r.p.indexOf(r.to) !== -1) && (r.p !== r.to)) {
+                if ((r.tot !== r.pt) || (r.p.indexOf(r.to) !== -1)) {
                    applyRule(msg,{t:"set", p:r.to, pt:r.tot, to:r.p, tot:r.pt},(err,msg) => {
                        applyRule(msg,{t:"delete", p:r.p, pt:r.pt}, (err,msg) => {
                            completeApplyingRules(msg,currentRule,done);
--- a/packages/node_modules/@node-red/nodes/core/network/21-httpin.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httpin.js
@@ -282,7 +282,7 @@ module.exports = function(RED) {
        RED.nodes.createNode(this,n);
        var node = this;
        this.headers = n.headers||{};
-        this.statusCode = n.statusCode;
+        this.statusCode = parseInt(n.statusCode);
        this.on("input",function(msg,_send,done) {
            if (msg.res) {
                var headers = RED.util.cloneMessage(node.headers);
@@ -323,7 +323,7 @@ module.exports = function(RED) {
                        }
                    }
                }
-                var statusCode = node.statusCode || msg.statusCode || 200;
+                var statusCode = node.statusCode || parseInt(msg.statusCode) || 200;
                if (typeof msg.payload == "object" && !Buffer.isBuffer(msg.payload)) {
                    msg.res._res.status(statusCode).jsonp(msg.payload);
                } else {
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
@@ -106,7 +106,7 @@ function runGitCommandWithSSHCommand(args,cwd,auth,emit) {
        commandEnv.GIT_SSH = path.join(__dirname,"node-red-ssh.sh");
        commandEnv.NODE_RED_KEY_FILE=auth.key_path;
        // GIT_SSH_COMMAND - added in git 2.3.0
-        commandEnv.GIT_SSH_COMMAND = "ssh -i " + auth.key_path + " -F /dev/null";
+        commandEnv.GIT_SSH_COMMAND = "ssh -i \"" + auth.key_path + "\" -F /dev/null";
        // console.log('commandEnv:', commandEnv);
        return runGitCommand(args,cwd,commandEnv,emit).then( result => {
            rs.close();
--- a/test/nodes/core/function/15-change_spec.js
+++ b/test/nodes/core/function/15-change_spec.js
@@ -1717,24 +1717,6 @@ describe('change Node', function() {
                changeNode1.receive({topic:{foo:{bar:1}}, payload:"String"});
            });
        });
-        it('moves the value of a message property object to itself', function(done) {
-            var flow = [{"id":"changeNode1","type":"change","rules":[{"t":"move","p":"payload","pt":"msg","to":"payload","tot":"msg"}],"name":"changeNode","wires":[["helperNode1"]]},
-                        {id:"helperNode1", type:"helper", wires:[]}];
-            helper.load(changeNode, flow, function() {
-                var changeNode1 = helper.getNode("changeNode1");
-                var helperNode1 = helper.getNode("helperNode1");
-                helperNode1.on("input", function(msg) {
-                    try {
-                        msg.should.have.property('payload');
-                        msg.payload.should.equal("bar");
-                        done();
-                    } catch(err) {
-                        done(err);
-                    }
-                });
-                changeNode1.receive({payload:"bar"});
-            });
-        });
        it('moves the value of a message property object to a sub-property', function(done) {
            var flow = [{"id":"changeNode1","type":"change","rules":[{"t":"move","p":"payload","pt":"msg","to":"payload.foo","tot":"msg"}],"name":"changeNode","wires":[["helperNode1"]]},
                        {id:"helperNode1", type:"helper", wires:[]}];
Author	SHA1	Message	Date
Nick O'Leary	24b055b1b8	Ensure key_path is quoted in GIT_SSH_COMMAND in case of spaces in pathname	2022-10-04 15:44:29 +01:00
Nick O'Leary	93c1600980	Merge pull request #3886 from kazuhitoyokoi/master2 Limit number of ports in function node	2022-10-04 11:00:18 +01:00
Nick O'Leary	c3d1e6181f	Merge pull request #3894 from hardillb/http-response-status-number Ensure statusCode is a number	2022-10-04 10:28:04 +01:00
Ben Hardill	4115c13a65	Ensure statusCode is a number Fixes #3893 Used parseInt instead of the suggested fix so that we don't end up with statusCode = 200.5	2022-09-19 19:43:06 +01:00
Kazuhito Yokoi	ce31edc803	Fix handling of max and min values in function outputs	2022-09-18 02:22:52 +09:00
Kazuhito Yokoi	199caccbc3	Change the maximum number of ports to 500	2022-09-17 00:25:46 +09:00
Kazuhito Yokoi	7507a7b459	Limit number of ports in function node	2022-09-16 02:10:14 +09:00