diff --git a/SECURITY.md b/SECURITY.md index 816ac507b..eac86a2e5 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -3,3 +3,9 @@ ## Reporting a Vulnerability Please report any potential security issues to `team@nodered.org`. This will notify the core project team who will respond accordingly. + +## Escalation + +If you do not receive an acknowledgement of your report within 6 business days, or if you cannot find a private security contact for the project, you may escalate to the OpenJS Foundation CNA at `security@lists.openjsf.org`. + +If the project acknowledges your report but does not provide any further response or engagement within 14 days, escalation is also appropriate. diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json index 57b9e681e..c1c9316d8 100644 --- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json @@ -164,6 +164,7 @@ } }, "actions": { + "open-event-log": "Open event log", "toggle-navigator": "Toggle navigator", "zoom-out": "Zoom out", "zoom-reset": "Reset zoom", diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json index 1653662c2..1ff8b4653 100644 --- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json @@ -164,6 +164,7 @@ } }, "actions": { + "open-event-log": "イベントログを開く", "toggle-navigator": "ナビゲータの表示/非表示を切替", "zoom-out": "縮小", "zoom-reset": "拡大/縮小を初期化", diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js b/packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js index 2918cacf1..dabb8f1d5 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js @@ -51,6 +51,7 @@ RED.eventLog = (function() { align: "right", element: statusWidget }); + RED.popover.tooltip(statusWidget, RED._('actions.open-event-log')); RED.statusBar.hide("red-ui-event-log-status"); }, diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js index 5cc1faddc..c8e62890f 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js @@ -336,6 +336,16 @@ RED.palette.editor = (function() { const moduleInfo = nodeEntries[module].info; const nodeEntry = nodeEntries[module].elements; + + if (!moduleInfo.url) { + if (loadedIndex[module] && loadedIndex[module].url) { + // Add the link to the node documentation if the catalog contains it + moduleInfo.url = loadedIndex[module].url; + const titleRow = $(nodeEntry.container).find("div.red-ui-palette-module-header > div.red-ui-palette-module-meta.red-ui-palette-module-name"); + $('').attr('href', moduleInfo.url).appendTo(titleRow); + } + } + if (nodeEntry) { const setCount = []; diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js index 0a3ac2560..33d9c3044 100644 --- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js +++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js @@ -152,7 +152,9 @@ in your Node-RED user directory (${RED.settings.userDir}). const asLowercase = name.toLowercase(); return headersObject[Object.keys(headersObject).find(k => k.toLowerCase() === asLowercase)]; } + this.count = 0; this.on("input",function(msg,nodeSend,nodeDone) { + node.count++; checkNodeAgentPatch(); //reset redirectList on each request redirectList = []; @@ -658,7 +660,10 @@ in your Node-RED user directory (${RED.settings.userDir}). catch(e) { node.warn(RED._("httpin.errors.json-error")); } } } - node.status({}); + node.count--; + if (node.count === 0) { + node.status({}); + } nodeSend(msg); nodeDone(); }).catch(err => { diff --git a/packages/node_modules/@node-red/nodes/core/sequence/17-split.js b/packages/node_modules/@node-red/nodes/core/sequence/17-split.js index 5fe6b3c4e..de1b716dc 100644 --- a/packages/node_modules/@node-red/nodes/core/sequence/17-split.js +++ b/packages/node_modules/@node-red/nodes/core/sequence/17-split.js @@ -146,16 +146,16 @@ module.exports = function(RED) { var pos = 0; var data = value; msg.parts.len = node.arraySplt; + const newmsg = RED.util.cloneMessage(msg) for (var i=0; i