mirror of
https://github.com/node-red/node-red.git
synced 2023-10-10 13:36:53 +02:00
Merge branch 'pr_2551' into dev
This commit is contained in:
Nick O'Leary
commit
1b497b340b
@ -47,7 +47,14 @@
|
||||
"now-running": "Server now running at __listenpath__",
|
||||
"failed-to-start": "Failed to start server:",
|
||||
"headless-mode": "Running in headless mode",
|
||||
"httpadminauth-deprecated": "use of httpAdminAuth is deprecated. Use adminAuth instead"
|
||||
"httpadminauth-deprecated": "use of httpAdminAuth is deprecated. Use adminAuth instead",
|
||||
"https": {
|
||||
"refresh-interval": "Refreshing https settings every __interval__ hours",
|
||||
"settings-refreshed": "Server https settings have been refreshed",
|
||||
"refresh-failed": "Failed to refresh https settings: __message__",
|
||||
"nodejs-version": "httpsRefreshInterval requires Node.js 11 or later",
|
||||
"function-required": "httpsRefreshInterval requires https property to be a function"
|
||||
}
|
||||
},
|
||||
|
||||
"api": {
|
||||
|
||||
441
packages/node_modules/node-red/red.js
vendored
441
packages/node_modules/node-red/red.js
vendored
@ -175,208 +175,265 @@ if (process.env.NODE_RED_ENABLE_PROJECTS) {
|
||||
settings.editorTheme.projects.enabled = !/^false$/i.test(process.env.NODE_RED_ENABLE_PROJECTS);
|
||||
}
|
||||
|
||||
if (settings.https) {
|
||||
server = https.createServer(settings.https,function(req,res) {app(req,res);});
|
||||
} else {
|
||||
server = http.createServer(function(req,res) {app(req,res);});
|
||||
}
|
||||
server.setMaxListeners(0);
|
||||
// Delay logging of (translated) messages until the RED object has been initialized
|
||||
var delayedLogItems = [];
|
||||
|
||||
function formatRoot(root) {
|
||||
if (root[0] != "/") {
|
||||
root = "/" + root;
|
||||
}
|
||||
if (root.slice(-1) != "/") {
|
||||
root = root + "/";
|
||||
}
|
||||
return root;
|
||||
var startupHttps = settings.https;
|
||||
if (typeof startupHttps === "function") {
|
||||
// Get the result of the function, because createServer doesn't accept functions as input
|
||||
startupHttps = startupHttps();
|
||||
}
|
||||
var httpsPromise = Promise.resolve(startupHttps);
|
||||
|
||||
if (settings.httpRoot === false) {
|
||||
settings.httpAdminRoot = false;
|
||||
settings.httpNodeRoot = false;
|
||||
} else {
|
||||
settings.httpRoot = settings.httpRoot||"/";
|
||||
settings.disableEditor = settings.disableEditor||false;
|
||||
}
|
||||
httpsPromise.then(function(startupHttps) {
|
||||
if (startupHttps) {
|
||||
server = https.createServer(startupHttps,function(req,res) {app(req,res);});
|
||||
|
||||
if (settings.httpAdminRoot !== false) {
|
||||
settings.httpAdminRoot = formatRoot(settings.httpAdminRoot || settings.httpRoot || "/");
|
||||
settings.httpAdminAuth = settings.httpAdminAuth || settings.httpAuth;
|
||||
} else {
|
||||
settings.disableEditor = true;
|
||||
}
|
||||
|
||||
if (settings.httpNodeRoot !== false) {
|
||||
settings.httpNodeRoot = formatRoot(settings.httpNodeRoot || settings.httpRoot || "/");
|
||||
settings.httpNodeAuth = settings.httpNodeAuth || settings.httpAuth;
|
||||
}
|
||||
|
||||
// if we got a port from command line, use it (even if 0)
|
||||
// replicate (settings.uiPort = parsedArgs.port||settings.uiPort||1880;) but allow zero
|
||||
if (parsedArgs.port !== undefined){
|
||||
settings.uiPort = parsedArgs.port;
|
||||
} else {
|
||||
if (settings.uiPort === undefined){
|
||||
settings.uiPort = 1880;
|
||||
}
|
||||
}
|
||||
|
||||
settings.uiHost = settings.uiHost||"0.0.0.0";
|
||||
|
||||
if (flowFile) {
|
||||
settings.flowFile = flowFile;
|
||||
}
|
||||
if (parsedArgs.userDir) {
|
||||
settings.userDir = parsedArgs.userDir;
|
||||
}
|
||||
|
||||
try {
|
||||
RED.init(server,settings);
|
||||
} catch(err) {
|
||||
if (err.code == "unsupported_version") {
|
||||
console.log("Unsupported version of Node.js:",process.version);
|
||||
console.log("Node-RED requires Node.js v8.9.0 or later");
|
||||
} else {
|
||||
console.log("Failed to start server:");
|
||||
if (err.stack) {
|
||||
console.log(err.stack);
|
||||
} else {
|
||||
console.log(err);
|
||||
}
|
||||
}
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
function basicAuthMiddleware(user,pass) {
|
||||
var basicAuth = require('basic-auth');
|
||||
var checkPassword;
|
||||
var localCachedPassword;
|
||||
if (pass.length == "32") {
|
||||
// Assume its a legacy md5 password
|
||||
checkPassword = function(p) {
|
||||
return crypto.createHash('md5').update(p,'utf8').digest('hex') === pass;
|
||||
}
|
||||
} else {
|
||||
checkPassword = function(p) {
|
||||
return bcrypt.compareSync(p,pass);
|
||||
}
|
||||
}
|
||||
|
||||
var checkPasswordAndCache = function(p) {
|
||||
// For BasicAuth routes we know the password cannot change without
|
||||
// a restart of Node-RED. This means we can cache the provided crypted
|
||||
// version to save recalculating each time.
|
||||
if (localCachedPassword === p) {
|
||||
return true;
|
||||
}
|
||||
var result = checkPassword(p);
|
||||
if (result) {
|
||||
localCachedPassword = p;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
return function(req,res,next) {
|
||||
if (req.method === 'OPTIONS') {
|
||||
return next();
|
||||
}
|
||||
var requestUser = basicAuth(req);
|
||||
if (!requestUser || requestUser.name !== user || !checkPasswordAndCache(requestUser.pass)) {
|
||||
res.set('WWW-Authenticate', 'Basic realm="Authorization Required"');
|
||||
return res.sendStatus(401);
|
||||
}
|
||||
next();
|
||||
}
|
||||
}
|
||||
|
||||
if (settings.httpAdminRoot !== false && settings.httpAdminAuth) {
|
||||
RED.log.warn(RED.log._("server.httpadminauth-deprecated"));
|
||||
app.use(settings.httpAdminRoot, basicAuthMiddleware(settings.httpAdminAuth.user,settings.httpAdminAuth.pass));
|
||||
}
|
||||
|
||||
if (settings.httpAdminRoot !== false) {
|
||||
app.use(settings.httpAdminRoot,RED.httpAdmin);
|
||||
}
|
||||
if (settings.httpNodeRoot !== false && settings.httpNodeAuth) {
|
||||
app.use(settings.httpNodeRoot,basicAuthMiddleware(settings.httpNodeAuth.user,settings.httpNodeAuth.pass));
|
||||
}
|
||||
if (settings.httpNodeRoot !== false) {
|
||||
app.use(settings.httpNodeRoot,RED.httpNode);
|
||||
}
|
||||
if (settings.httpStatic) {
|
||||
settings.httpStaticAuth = settings.httpStaticAuth || settings.httpAuth;
|
||||
if (settings.httpStaticAuth) {
|
||||
app.use("/",basicAuthMiddleware(settings.httpStaticAuth.user,settings.httpStaticAuth.pass));
|
||||
}
|
||||
app.use("/",express.static(settings.httpStatic));
|
||||
}
|
||||
|
||||
function getListenPath() {
|
||||
var port = settings.serverPort;
|
||||
if (port === undefined){
|
||||
port = settings.uiPort;
|
||||
}
|
||||
|
||||
var listenPath = 'http'+(settings.https?'s':'')+'://'+
|
||||
(settings.uiHost == '::'?'localhost':(settings.uiHost == '0.0.0.0'?'127.0.0.1':settings.uiHost))+
|
||||
':'+port;
|
||||
if (settings.httpAdminRoot !== false) {
|
||||
listenPath += settings.httpAdminRoot;
|
||||
} else if (settings.httpStatic) {
|
||||
listenPath += "/";
|
||||
}
|
||||
return listenPath;
|
||||
}
|
||||
|
||||
RED.start().then(function() {
|
||||
if (settings.httpAdminRoot !== false || settings.httpNodeRoot !== false || settings.httpStatic) {
|
||||
server.on('error', function(err) {
|
||||
if (err.errno === "EADDRINUSE") {
|
||||
RED.log.error(RED.log._("server.unable-to-listen", {listenpath:getListenPath()}));
|
||||
RED.log.error(RED.log._("server.port-in-use"));
|
||||
} else {
|
||||
RED.log.error(RED.log._("server.uncaught-exception"));
|
||||
if (err.stack) {
|
||||
RED.log.error(err.stack);
|
||||
if (settings.httpsRefreshInterval) {
|
||||
var httpsRefreshInterval = parseFloat(settings.httpsRefreshInterval)||12;
|
||||
if (httpsRefreshInterval > 596) {
|
||||
// Max value based on (2^31-1)ms - the max that setInterval can accept
|
||||
httpsRefreshInterval = 596;
|
||||
}
|
||||
// Check whether setSecureContext is available (Node.js 11+)
|
||||
if (server.setSecureContext) {
|
||||
// Check whether `http` is a callable function
|
||||
if (typeof settings.https === "function") {
|
||||
delayedLogItems.push({type:"info", id:"server.https.refresh-interval", params:{interval:httpsRefreshInterval}});
|
||||
setInterval(function () {
|
||||
try {
|
||||
// Get the result of the function, because createServer doesn't accept functions as input
|
||||
Promise.resolve(settings.https()).then(function(refreshedHttps) {
|
||||
if (refreshedHttps) {
|
||||
// Only update the credentials in the server when key or cert has changed
|
||||
if(!server.key || !server.cert || !server.key.equals(refreshedHttps.key) || !server.cert.equals(refreshedHttps.cert)) {
|
||||
server.setSecureContext(refreshedHttps);
|
||||
RED.log.info(RED.log._("server.https.settings-refreshed"));
|
||||
}
|
||||
}
|
||||
}).catch(function(err) {
|
||||
RED.log.error(RED.log._("server.https.refresh-failed",{message:err}));
|
||||
});
|
||||
} catch(err) {
|
||||
RED.log.error(RED.log._("server.https.refresh-failed",{message:err}));
|
||||
}
|
||||
}, httpsRefreshInterval*60*60*1000);
|
||||
} else {
|
||||
RED.log.error(err);
|
||||
delayedLogItems.push({type:"warn", id:"server.https.function-required"});
|
||||
}
|
||||
} else {
|
||||
delayedLogItems.push({type:"warn", id:"server.https.nodejs-version"});
|
||||
}
|
||||
process.exit(1);
|
||||
});
|
||||
server.listen(settings.uiPort,settings.uiHost,function() {
|
||||
if (settings.httpAdminRoot === false) {
|
||||
RED.log.info(RED.log._("server.admin-ui-disabled"));
|
||||
}
|
||||
} else {
|
||||
server = http.createServer(function(req,res) {app(req,res);});
|
||||
}
|
||||
server.setMaxListeners(0);
|
||||
|
||||
function formatRoot(root) {
|
||||
if (root[0] != "/") {
|
||||
root = "/" + root;
|
||||
}
|
||||
if (root.slice(-1) != "/") {
|
||||
root = root + "/";
|
||||
}
|
||||
return root;
|
||||
}
|
||||
|
||||
if (settings.httpRoot === false) {
|
||||
settings.httpAdminRoot = false;
|
||||
settings.httpNodeRoot = false;
|
||||
} else {
|
||||
settings.httpRoot = settings.httpRoot||"/";
|
||||
settings.disableEditor = settings.disableEditor||false;
|
||||
}
|
||||
|
||||
if (settings.httpAdminRoot !== false) {
|
||||
settings.httpAdminRoot = formatRoot(settings.httpAdminRoot || settings.httpRoot || "/");
|
||||
settings.httpAdminAuth = settings.httpAdminAuth || settings.httpAuth;
|
||||
} else {
|
||||
settings.disableEditor = true;
|
||||
}
|
||||
|
||||
if (settings.httpNodeRoot !== false) {
|
||||
settings.httpNodeRoot = formatRoot(settings.httpNodeRoot || settings.httpRoot || "/");
|
||||
settings.httpNodeAuth = settings.httpNodeAuth || settings.httpAuth;
|
||||
}
|
||||
|
||||
// if we got a port from command line, use it (even if 0)
|
||||
// replicate (settings.uiPort = parsedArgs.port||settings.uiPort||1880;) but allow zero
|
||||
if (parsedArgs.port !== undefined){
|
||||
settings.uiPort = parsedArgs.port;
|
||||
} else {
|
||||
if (settings.uiPort === undefined){
|
||||
settings.uiPort = 1880;
|
||||
}
|
||||
}
|
||||
|
||||
settings.uiHost = settings.uiHost||"0.0.0.0";
|
||||
|
||||
if (flowFile) {
|
||||
settings.flowFile = flowFile;
|
||||
}
|
||||
if (parsedArgs.userDir) {
|
||||
settings.userDir = parsedArgs.userDir;
|
||||
}
|
||||
|
||||
try {
|
||||
RED.init(server,settings);
|
||||
} catch(err) {
|
||||
if (err.code == "unsupported_version") {
|
||||
console.log("Unsupported version of Node.js:",process.version);
|
||||
console.log("Node-RED requires Node.js v8.9.0 or later");
|
||||
} else {
|
||||
console.log("Failed to start server:");
|
||||
if (err.stack) {
|
||||
console.log(err.stack);
|
||||
} else {
|
||||
console.log(err);
|
||||
}
|
||||
settings.serverPort = server.address().port;
|
||||
process.title = parsedArgs.title || 'node-red';
|
||||
RED.log.info(RED.log._("server.now-running", {listenpath:getListenPath()}));
|
||||
});
|
||||
} else {
|
||||
RED.log.info(RED.log._("server.headless-mode"));
|
||||
}
|
||||
process.exit(1);
|
||||
}
|
||||
}).otherwise(function(err) {
|
||||
RED.log.error(RED.log._("server.failed-to-start"));
|
||||
if (err.stack) {
|
||||
RED.log.error(err.stack);
|
||||
} else {
|
||||
RED.log.error(err);
|
||||
}
|
||||
});
|
||||
|
||||
process.on('uncaughtException',function(err) {
|
||||
util.log('[red] Uncaught Exception:');
|
||||
if (err.stack) {
|
||||
util.log(err.stack);
|
||||
} else {
|
||||
util.log(err);
|
||||
}
|
||||
process.exit(1);
|
||||
});
|
||||
function basicAuthMiddleware(user,pass) {
|
||||
var basicAuth = require('basic-auth');
|
||||
var checkPassword;
|
||||
var localCachedPassword;
|
||||
if (pass.length == "32") {
|
||||
// Assume its a legacy md5 password
|
||||
checkPassword = function(p) {
|
||||
return crypto.createHash('md5').update(p,'utf8').digest('hex') === pass;
|
||||
}
|
||||
} else {
|
||||
checkPassword = function(p) {
|
||||
return bcrypt.compareSync(p,pass);
|
||||
}
|
||||
}
|
||||
|
||||
process.on('SIGINT', function () {
|
||||
RED.stop().then(function() {
|
||||
process.exit();
|
||||
var checkPasswordAndCache = function(p) {
|
||||
// For BasicAuth routes we know the password cannot change without
|
||||
// a restart of Node-RED. This means we can cache the provided crypted
|
||||
// version to save recalculating each time.
|
||||
if (localCachedPassword === p) {
|
||||
return true;
|
||||
}
|
||||
var result = checkPassword(p);
|
||||
if (result) {
|
||||
localCachedPassword = p;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
return function(req,res,next) {
|
||||
if (req.method === 'OPTIONS') {
|
||||
return next();
|
||||
}
|
||||
var requestUser = basicAuth(req);
|
||||
if (!requestUser || requestUser.name !== user || !checkPasswordAndCache(requestUser.pass)) {
|
||||
res.set('WWW-Authenticate', 'Basic realm="Authorization Required"');
|
||||
return res.sendStatus(401);
|
||||
}
|
||||
next();
|
||||
}
|
||||
}
|
||||
|
||||
if (settings.httpAdminRoot !== false && settings.httpAdminAuth) {
|
||||
RED.log.warn(RED.log._("server.httpadminauth-deprecated"));
|
||||
app.use(settings.httpAdminRoot, basicAuthMiddleware(settings.httpAdminAuth.user,settings.httpAdminAuth.pass));
|
||||
}
|
||||
|
||||
if (settings.httpAdminRoot !== false) {
|
||||
app.use(settings.httpAdminRoot,RED.httpAdmin);
|
||||
}
|
||||
if (settings.httpNodeRoot !== false && settings.httpNodeAuth) {
|
||||
app.use(settings.httpNodeRoot,basicAuthMiddleware(settings.httpNodeAuth.user,settings.httpNodeAuth.pass));
|
||||
}
|
||||
if (settings.httpNodeRoot !== false) {
|
||||
app.use(settings.httpNodeRoot,RED.httpNode);
|
||||
}
|
||||
if (settings.httpStatic) {
|
||||
settings.httpStaticAuth = settings.httpStaticAuth || settings.httpAuth;
|
||||
if (settings.httpStaticAuth) {
|
||||
app.use("/",basicAuthMiddleware(settings.httpStaticAuth.user,settings.httpStaticAuth.pass));
|
||||
}
|
||||
app.use("/",express.static(settings.httpStatic));
|
||||
}
|
||||
|
||||
function getListenPath() {
|
||||
var port = settings.serverPort;
|
||||
if (port === undefined){
|
||||
port = settings.uiPort;
|
||||
}
|
||||
|
||||
var listenPath = 'http'+(settings.https?'s':'')+'://'+
|
||||
(settings.uiHost == '::'?'localhost':(settings.uiHost == '0.0.0.0'?'127.0.0.1':settings.uiHost))+
|
||||
':'+port;
|
||||
if (settings.httpAdminRoot !== false) {
|
||||
listenPath += settings.httpAdminRoot;
|
||||
} else if (settings.httpStatic) {
|
||||
listenPath += "/";
|
||||
}
|
||||
return listenPath;
|
||||
}
|
||||
|
||||
RED.start().then(function() {
|
||||
if (settings.httpAdminRoot !== false || settings.httpNodeRoot !== false || settings.httpStatic) {
|
||||
server.on('error', function(err) {
|
||||
if (err.errno === "EADDRINUSE") {
|
||||
RED.log.error(RED.log._("server.unable-to-listen", {listenpath:getListenPath()}));
|
||||
RED.log.error(RED.log._("server.port-in-use"));
|
||||
} else {
|
||||
RED.log.error(RED.log._("server.uncaught-exception"));
|
||||
if (err.stack) {
|
||||
RED.log.error(err.stack);
|
||||
} else {
|
||||
RED.log.error(err);
|
||||
}
|
||||
}
|
||||
process.exit(1);
|
||||
});
|
||||
|
||||
// Log all the delayed messages, since they can be translated at this point
|
||||
delayedLogItems.forEach(function (delayedLogItem, index) {
|
||||
RED.log[delayedLogItem.type](RED.log._(delayedLogItem.id, delayedLogItem.params||{}));
|
||||
});
|
||||
|
||||
server.listen(settings.uiPort,settings.uiHost,function() {
|
||||
if (settings.httpAdminRoot === false) {
|
||||
RED.log.info(RED.log._("server.admin-ui-disabled"));
|
||||
}
|
||||
settings.serverPort = server.address().port;
|
||||
process.title = parsedArgs.title || 'node-red';
|
||||
RED.log.info(RED.log._("server.now-running", {listenpath:getListenPath()}));
|
||||
});
|
||||
} else {
|
||||
RED.log.info(RED.log._("server.headless-mode"));
|
||||
}
|
||||
}).otherwise(function(err) {
|
||||
RED.log.error(RED.log._("server.failed-to-start"));
|
||||
if (err.stack) {
|
||||
RED.log.error(err.stack);
|
||||
} else {
|
||||
RED.log.error(err);
|
||||
}
|
||||
});
|
||||
|
||||
process.on('uncaughtException',function(err) {
|
||||
util.log('[red] Uncaught Exception:');
|
||||
if (err.stack) {
|
||||
util.log(err.stack);
|
||||
} else {
|
||||
util.log(err);
|
||||
}
|
||||
process.exit(1);
|
||||
});
|
||||
|
||||
process.on('SIGINT', function () {
|
||||
RED.stop().then(function() {
|
||||
process.exit();
|
||||
});
|
||||
});
|
||||
}).catch(function(err) {
|
||||
console.log("Failed to get https settings: " + err);
|
||||
});
|
||||
|
||||
33
packages/node_modules/node-red/settings.js
vendored
33
packages/node_modules/node-red/settings.js
vendored
@ -139,13 +139,36 @@ module.exports = {
|
||||
// The following property can be used to enable HTTPS
|
||||
// See http://nodejs.org/api/https.html#https_https_createserver_options_requestlistener
|
||||
// for details on its contents.
|
||||
// See the comment at the top of this file on how to load the `fs` module used by
|
||||
// this setting.
|
||||
//
|
||||
// See the comment at the top of this file on how to load the `fs` module used by this setting.
|
||||
// This property can be either an object, containing both a (private) key and a (public) certificate,
|
||||
// or a function that returns such an object:
|
||||
//// https object:
|
||||
//https: {
|
||||
// key: fs.readFileSync('privatekey.pem'),
|
||||
// cert: fs.readFileSync('certificate.pem')
|
||||
// key: fs.readFileSync('privkey.pem'),
|
||||
// cert: fs.readFileSync('cert.pem')
|
||||
//},
|
||||
////https synchronous function:
|
||||
//https: function() {
|
||||
// return {
|
||||
// key: fs.readFileSync('privkey.pem'),
|
||||
// cert: fs.readFileSync('cert.pem')
|
||||
// }
|
||||
//},
|
||||
//// https asynchronous function:
|
||||
//https: function() {
|
||||
// return Promise.resolve({
|
||||
// key: fs.readFileSync('privkey.pem'),
|
||||
// cert: fs.readFileSync('cert.pem')
|
||||
// });
|
||||
//},
|
||||
|
||||
// The following property can be used to refresh the https settings at a
|
||||
// regular time interval in hours.
|
||||
// This requires:
|
||||
// - the `https` setting to be a function that can be called to get
|
||||
// the refreshed settings.
|
||||
// - Node.js 11 or later.
|
||||
//httpsRefreshInterval : 12,
|
||||
|
||||
// The following property can be used to cause insecure HTTP connections to
|
||||
// be redirected to HTTPS.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user