frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure global-config credential env vars are merged on deploy

Browse Source 
Fixes #4508
This commit is contained in:
Nick O'Leary 2024-01-15 16:44:43 +00:00
parent 282bb6c414
commit 58e2fcbeee
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/editor-client/src/js/ui/env-var.js vendored
View File

@ -71,7 +71,7 @@ RED.envVar = (function() {
}; };
if (item.name.trim() !== "") { if (item.name.trim() !== "") {
new_env.push(item); new_env.push(item);
if ((item.type === "cred") && (item.value !== "__PWRD__")) { if (item.type === "cred") {
credentials.map[item.name] = item.value; credentials.map[item.name] = item.value;
credentials.map["has_"+item.name] = (item.value !== ""); credentials.map["has_"+item.name] = (item.value !== "");
item.value = "__PWRD__"; item.value = "__PWRD__";

23
packages/node_modules/@node-red/runtime/lib/nodes/credentials.js vendored
View File

@ -384,10 +384,27 @@ var api = module.exports = {
} }
} }
} else if (nodeType === "global-config") { } else if (nodeType === "global-config") {
if (JSON.stringify(savedCredentials.map) !== JSON.stringify(newCreds.map)) { const existingCredentialKeys = Object.keys(savedCredentials?.map || [])
savedCredentials.map = newCreds.map; const newCredentialKeys = Object.keys(newCreds?.map || [])
dirty = true; existingCredentialKeys.forEach(key => {
if (!newCreds.map?.[key]) {
// This key doesn't exist in the new credentials list - remove
delete savedCredentials.map[key]
delete savedCredentials.map[`has_${key}`]
dirty = true
} }
})
newCredentialKeys.forEach(key => {
if (!/^has_/.test(key)) {
if (!savedCredentials.map?.[key] || newCreds.map[key] !== '__PWRD__') {
// This key either doesn't exist in current saved, or the
// value has been changed
savedCredentials.map[key] = newCreds.map[key]
savedCredentials.map[`has_${key}`] = newCreds.map[`has_${key}`]
dirty = true
}
}
})
} else { } else {
var dashedType = nodeType.replace(/\s+/g, '-'); var dashedType = nodeType.replace(/\s+/g, '-');
var definition = credentialsDef[dashedType]; var definition = credentialsDef[dashedType];