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

Fixup all the tests

Browse Source
This commit is contained in:
Nick O'Leary
2018-04-24 15:01:49 +01:00
parent 34832d5942
commit 5d064aa1d7
50 changed files with 3480 additions and 1762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
red/api/editor/comms.js
View File

@@ -28,6 +28,8 @@ var runtimeAPI;
var wsServer;
var activeConnections = [];
var anonymousUser;
var retained = {};
var heartbeatTimer;
@@ -173,7 +175,8 @@ CommsConnection.prototype.subscribe = function(topic) {
function start() {
if (!settings.disableEditor) {
Users.default().then(function(anonymousUser) {
Users.default().then(function(_anonymousUser) {
anonymousUser = _anonymousUser;
var webSocketKeepAliveTime = settings.webSocketKeepAliveTime || 15000;
var path = settings.httpAdminRoot || "/";
path = (path.slice(0,1) != "/" ? "/":"") + path + (path.slice(-1) == "/" ? "":"/") + "comms";

3
red/api/editor/index.js
View File

@@ -89,7 +89,6 @@ module.exports = {
// Library
var library = require("./library");
library.init(runtimeAPI);
editorApp.get("/library/flows",needsPermission("library.read"),library.getAll,apiUtil.errorHandler);
editorApp.get(/library\/([^\/]+)(?:$|\/(.*))/,needsPermission("library.read"),library.getEntry);
editorApp.post(/library\/([^\/]+)\/(.*)/,needsPermission("library.write"),library.saveEntry);
@@ -107,7 +106,7 @@ module.exports = {
// User Settings
editorApp.post("/settings/user",needsPermission("settings.write"),info.updateUserSettings,apiUtil.errorHandler);
// SSH keys
editorApp.use("/settings/user/keys",info.sshkeys());
editorApp.use("/settings/user/keys",needsPermission("settings.write"),info.sshkeys());
return editorApp;
}

18
red/api/editor/sshkeys.js
View File

@@ -14,9 +14,9 @@
* limitations under the License.
**/
var apiUtils = require("../util");
var express = require("express");
var runtimeAPI;
var needsPermission = require("../auth").needsPermission;
function getUsername(userObj) {
var username = '__default';
@@ -34,7 +34,7 @@ module.exports = {
var app = express();
// List all SSH keys
app.get("/", needsPermission("settings.read"), function(req,res) {
app.get("/", function(req,res) {
var opts = {
user: req.user
}
@@ -48,7 +48,7 @@ module.exports = {
});
// Get SSH key detail
app.get("/:id", needsPermission("settings.read"), function(req,res) {
app.get("/:id", function(req,res) {
var opts = {
user: req.user,
id: req.params.id
@@ -63,11 +63,17 @@ module.exports = {
});
// Generate a SSH key
app.post("/", needsPermission("settings.write"), function(req,res) {
app.post("/", function(req,res) {
var opts = {
user: req.user,
id: req.params.id
}
// TODO: validate params
opts.name = req.body.name;
opts.password = req.body.password;
opts.comment = req.body.comment;
opts.size = req.body.size;
runtimeAPI.settings.generateUserKey(opts).then(function(name) {
res.json({
name: name
@@ -78,12 +84,12 @@ module.exports = {
});
// Delete a SSH key
app.delete("/:id", needsPermission("settings.write"), function(req,res) {
app.delete("/:id", function(req,res) {
var opts = {
user: req.user,
id: req.params.id
}
runtimeAPI.settings.generateUserKey(opts).then(function(name) {
runtimeAPI.settings.removeUserKey(opts).then(function(name) {
res.status(204).end();
}).catch(function(err) {
apiUtils.rejectHandler(req,res,err);