1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary 2018-12-13 11:14:58 +00:00
commit c283224000
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 5 additions and 2 deletions

View File

@ -458,7 +458,10 @@ RED.library = (function() {
click: function() { click: function() {
//TODO: move this to RED.library //TODO: move this to RED.library
var flowName = $("#node-input-library-filename").val(); var flowName = $("#node-input-library-filename").val();
if (!/^\s*$/.test(flowName)) { flowName = flowName.trim();
if(flowName === "" || flowName.endsWith("/")) {
RED.notify(RED._("library.invalidFilename"),"warning");
} else {
$.ajax({ $.ajax({
url:'library/flows/'+flowName, url:'library/flows/'+flowName,
type: "POST", type: "POST",

View File

@ -247,7 +247,7 @@ function basicAuthMiddleware(user,pass) {
} }
var requestUser = basicAuth(req); var requestUser = basicAuth(req);
if (!requestUser || requestUser.name !== user || !checkPasswordAndCache(requestUser.pass)) { if (!requestUser || requestUser.name !== user || !checkPasswordAndCache(requestUser.pass)) {
res.set('WWW-Authenticate', 'Basic realm=Authorization Required'); res.set('WWW-Authenticate', 'Basic realm="Authorization Required"');
return res.sendStatus(401); return res.sendStatus(401);
} }
next(); next();