From afaf077aca517b1de15a2e3e95277853a0b64549 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 21 Aug 2019 11:12:15 +0100 Subject: [PATCH 1/3] Pass httpServer to runtime even when httpAdmin disabled Fixes #2272 --- packages/node_modules/node-red/lib/red.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/node-red/lib/red.js b/packages/node_modules/node-red/lib/red.js index 4d7269518..9a4d77862 100644 --- a/packages/node_modules/node-red/lib/red.js +++ b/packages/node_modules/node-red/lib/red.js @@ -76,7 +76,7 @@ module.exports = { apiEnabled = true; server = httpServer; } else { - runtime.init(userSettings); + runtime.init(userSettings, httpServer); apiEnabled = false; if (httpServer) { server = httpServer; From 30c3004f27e86377613c06649f939e7f32746ca5 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 6 Sep 2019 10:25:30 +0100 Subject: [PATCH 2/3] Sanitize tab name in edit dialog --- .../@node-red/editor-client/src/js/ui/workspaces.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js index 32196a4c4..1e1597e7a 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js @@ -63,7 +63,7 @@ RED.workspaces = (function() { RED.view.state(RED.state.EDITING); var tabflowEditor; var trayOptions = { - title: RED._("workspace.editFlow",{name:workspace.label}), + title: RED._("workspace.editFlow",{name:RED.utils.sanitize(workspace.label)}), buttons: [ { id: "node-dialog-delete", From f7e9c109f627a1fd2de76b9e5b070bab274cdac1 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 6 Sep 2019 10:28:52 +0100 Subject: [PATCH 3/3] Bump for 0.20.8 --- CHANGELOG.md | 5 +++++ package.json | 2 +- .../node_modules/@node-red/editor-api/package.json | 6 +++--- .../node_modules/@node-red/editor-client/package.json | 2 +- packages/node_modules/@node-red/nodes/package.json | 2 +- packages/node_modules/@node-red/registry/package.json | 4 ++-- packages/node_modules/@node-red/runtime/package.json | 6 +++--- packages/node_modules/@node-red/util/package.json | 2 +- packages/node_modules/node-red/package.json | 10 +++++----- 9 files changed, 22 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1bdc154c..3948938d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +#### 0.20.8: Maintenance Release + + - Sanitize tab name in edit dialog + - Pass httpServer to runtime even when httpAdmin disabled Fixes #2272 + #### 0.20.7: Maintenance Release - Update jsonata to 1.6.5 which should fix #2183 diff --git a/package.json b/package.json index 9f2770acb..431b70125 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-red", - "version": "0.20.7", + "version": "0.20.8", "description": "A visual tool for wiring the Internet of Things", "homepage": "http://nodered.org", "license": "Apache-2.0", diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json index 60322caeb..ebb831234 100644 --- a/packages/node_modules/@node-red/editor-api/package.json +++ b/packages/node_modules/@node-red/editor-api/package.json @@ -1,6 +1,6 @@ { "name": "@node-red/editor-api", - "version": "0.20.7", + "version": "0.20.8", "license": "Apache-2.0", "main": "./lib/index.js", "repository": { @@ -16,8 +16,8 @@ } ], "dependencies": { - "@node-red/util": "0.20.7", - "@node-red/editor-client": "0.20.7", + "@node-red/util": "0.20.8", + "@node-red/editor-client": "0.20.8", "bcryptjs": "2.4.3", "body-parser": "1.19.0", "clone": "2.1.2", diff --git a/packages/node_modules/@node-red/editor-client/package.json b/packages/node_modules/@node-red/editor-client/package.json index 5c04db292..dbff58e8c 100644 --- a/packages/node_modules/@node-red/editor-client/package.json +++ b/packages/node_modules/@node-red/editor-client/package.json @@ -1,6 +1,6 @@ { "name": "@node-red/editor-client", - "version": "0.20.7", + "version": "0.20.8", "license": "Apache-2.0", "repository": { "type": "git", diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json index 7750cb826..09c697501 100644 --- a/packages/node_modules/@node-red/nodes/package.json +++ b/packages/node_modules/@node-red/nodes/package.json @@ -1,6 +1,6 @@ { "name": "@node-red/nodes", - "version": "0.20.7", + "version": "0.20.8", "license": "Apache-2.0", "repository": { "type": "git", diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json index 5ce8b5b5b..99c3b4a8b 100644 --- a/packages/node_modules/@node-red/registry/package.json +++ b/packages/node_modules/@node-red/registry/package.json @@ -1,6 +1,6 @@ { "name": "@node-red/registry", - "version": "0.20.7", + "version": "0.20.8", "license": "Apache-2.0", "main": "./lib/index.js", "repository": { @@ -16,7 +16,7 @@ } ], "dependencies": { - "@node-red/util": "0.20.7", + "@node-red/util": "0.20.8", "semver": "6.2.0", "uglify-js": "3.6.0", "when": "3.7.8" diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json index 9ba954154..6696a2f62 100644 --- a/packages/node_modules/@node-red/runtime/package.json +++ b/packages/node_modules/@node-red/runtime/package.json @@ -1,6 +1,6 @@ { "name": "@node-red/runtime", - "version": "0.20.7", + "version": "0.20.8", "license": "Apache-2.0", "main": "./lib/index.js", "repository": { @@ -16,8 +16,8 @@ } ], "dependencies": { - "@node-red/registry": "0.20.7", - "@node-red/util": "0.20.7", + "@node-red/registry": "0.20.8", + "@node-red/util": "0.20.8", "clone": "2.1.2", "express": "4.17.1", "fs-extra": "8.1.0", diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json index 03386f063..a65ffe28d 100644 --- a/packages/node_modules/@node-red/util/package.json +++ b/packages/node_modules/@node-red/util/package.json @@ -1,6 +1,6 @@ { "name": "@node-red/util", - "version": "0.20.7", + "version": "0.20.8", "license": "Apache-2.0", "repository": { "type": "git", diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json index e7dcdceb4..2c62c8982 100644 --- a/packages/node_modules/node-red/package.json +++ b/packages/node_modules/node-red/package.json @@ -1,6 +1,6 @@ { "name": "node-red", - "version": "0.20.7", + "version": "0.20.8", "description": "A visual tool for wiring the Internet of Things", "homepage": "http://nodered.org", "license": "Apache-2.0", @@ -31,10 +31,10 @@ "flow" ], "dependencies": { - "@node-red/editor-api": "0.20.7", - "@node-red/runtime": "0.20.7", - "@node-red/util": "0.20.7", - "@node-red/nodes": "0.20.7", + "@node-red/editor-api": "0.20.8", + "@node-red/runtime": "0.20.8", + "@node-red/util": "0.20.8", + "@node-red/nodes": "0.20.8", "basic-auth": "2.0.1", "bcryptjs": "2.4.3", "express": "4.17.1",