frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

change error to warn for moving from unencrypted to encrypted

Browse Source
This commit is contained in:
Sam Machin 2022-03-21 09:29:41 +00:00
parent c7f48a83c0
commit d9bd736159
No known key found for this signature in database
GPG Key ID: C77A61AE4B88F6C3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,9 +241,8 @@ var api = module.exports = {
} else { } else {
if (encryptionEnabled) { if (encryptionEnabled) {
// Our config expects the credentials to be encrypted but the encrypted object is not found // Our config expects the credentials to be encrypted but the encrypted object is not found
var error = new Error("Encrypted credentials not found"); log.warn(log._("nodes.credentials.encryptednotfound",{message:err.toString()}))
error.code = "credentials_load_failed"; credentialCache = credentials;
throw error
} else { } else {
// credentialSecret is set to False // credentialSecret is set to False
log.warn(log._("nodes.credentials.unencrypted",{message:err.toString()})) log.warn(log._("nodes.credentials.unencrypted",{message:err.toString()}))

3
packages/node_modules/@node-red/runtime/locales/en-US/runtime.json vendored
View File

@ -105,7 +105,8 @@
"error-saving":"Error saving credentials: __message__", "error-saving":"Error saving credentials: __message__",
"not-registered": "Credential type '__type__' is not registered", "not-registered": "Credential type '__type__' is not registered",
"system-key-warning": "\n\n---------------------------------------------------------------------\nYour flow credentials file is encrypted using a system-generated key.\n\nIf the system-generated key is lost for any reason, your credentials\nfile will not be recoverable, you will have to delete it and re-enter\nyour credentials.\n\nYou should set your own key using the 'credentialSecret' option in\nyour settings file. Node-RED will then re-encrypt your credentials\nfile using your chosen key the next time you deploy a change.\n---------------------------------------------------------------------\n", "system-key-warning": "\n\n---------------------------------------------------------------------\nYour flow credentials file is encrypted using a system-generated key.\n\nIf the system-generated key is lost for any reason, your credentials\nfile will not be recoverable, you will have to delete it and re-enter\nyour credentials.\n\nYou should set your own key using the 'credentialSecret' option in\nyour settings file. Node-RED will then re-encrypt your credentials\nfile using your chosen key the next time you deploy a change.\n---------------------------------------------------------------------\n",
"unencrypted" : "Using Unecrypted credentials" "unencrypted" : "Using unecrypted credentials",
"encryptednotfound" : "Encrypted crededntials not found"
}, },
"flows": { "flows": {
"safe-mode": "Flows stopped in safe mode. Deploy to start.", "safe-mode": "Flows stopped in safe mode. Deploy to start.",

4
test/unit/@node-red/runtime/lib/nodes/credentials_spec.js
View File

@ -379,7 +379,6 @@ describe('red/runtime/nodes/credentials', function() {
credentials.export().then(function(result) { credentials.export().then(function(result) {
result.should.have.a.property("$"); result.should.have.a.property("$");
settings.should.not.have.a.property("_credentialSecret"); settings.should.not.have.a.property("_credentialSecret");
// reset everything - but with _credentialSecret still set // reset everything - but with _credentialSecret still set
credentials.init(runtime); credentials.init(runtime);
// load the freshly encrypted version // load the freshly encrypted version
@ -444,12 +443,13 @@ describe('red/runtime/nodes/credentials', function() {
done(); done();
}); });
}); });
it('handles bad credentials object - resets credentials', function(done) { it('handles bad credentials object - resets credentials', function(done) {
settings = { settings = {
credentialSecret: "e3a36f47f005bf2aaa51ce3fc6fcaafd79da8d03f2b1a9281f8fb0a285e6255a" credentialSecret: "e3a36f47f005bf2aaa51ce3fc6fcaafd79da8d03f2b1a9281f8fb0a285e6255a"
}; };
// {"node":{user1:"abc",password1:"123"}} // {"node":{user1:"abc",password1:"123"}}
var cryptedFlows = {"FOO":"5b89d8209b5158a3c313675561b1a5b5phN1gDBe81Zv98KqS/hVDmc9EKvaKqRIvcyXYvBlFNzzzJtvN7qfw06i"}; var cryptedFlows = {"BADKEY":"5b89d8209b5158a3c313675561b1a5b5phN1gDBe81Zv98KqS/hVDmc9EKvaKqRIvcyXYvBlFNzzzJtvN7qfw06i"};
credentials.init(runtime); credentials.init(runtime);
credentials.load(cryptedFlows).then(function() { credentials.load(cryptedFlows).then(function() {
done(); done();