Merge branch 'dev' into pr_2971

This commit is contained in:
Nick O'Leary
2021-05-18 16:30:13 +01:00
74 changed files with 1036 additions and 368 deletions

View File

@@ -272,7 +272,7 @@ var api = module.exports = {
} catch(error) {
runtime.log.audit({event: "nodes.remove",module:opts.module,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
error.status = 400;
throw err;
throw error;
}
},
@@ -319,7 +319,7 @@ var api = module.exports = {
} catch(error) {
runtime.log.audit({event: "nodes.module.set",module:mod,enabled:opts.enabled,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
error.status = 400;
throw err;
throw error;
}
},
@@ -366,7 +366,7 @@ var api = module.exports = {
} catch(error) {
runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
error.status = 400;
throw err;
throw error;
}
},

View File

@@ -58,7 +58,7 @@ var api = module.exports = {
* @memberof @node-red/runtime_plugins
*/
getPluginConfigs: async function(opts) {
if (/[^a-z\-]/i.test(opts.lang)) {
if (/[^0-9a-z=\-\*]/i.test(opts.lang)) {
throw new Error("Invalid language: "+opts.lang)
return;
}