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

Better permission handling in editor

Browse Source
This commit is contained in:
Nick O'Leary 2018-01-12 21:00:11 +00:00
parent bb168d35a8
commit 1204cf1ba0
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
10 changed files with 240 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
editor/js/main.js
View File

@ -104,42 +104,48 @@
} }
if (notificationId === "runtime-state") { if (notificationId === "runtime-state") {
if (msg.error === "credentials_load_failed") { if (msg.error === "credentials_load_failed") {
options.buttons = [ if (RED.user.hasPermission("projects.write")) {
{ options.buttons = [
text: "Setup credentials", {
click: function() { text: "Setup credentials",
RED.projects.showCredentialsPrompt(); click: function() {
RED.projects.showCredentialsPrompt();
}
} }
} ]
] }
} else if (msg.error === "missing_flow_file") { } else if (msg.error === "missing_flow_file") {
options.buttons = [ if (RED.user.hasPermission("projects.write")) {
{ options.buttons = [
text: "Setup project files", {
click: function() { text: "Setup project files",
persistentNotifications[notificationId].close(); click: function() {
delete persistentNotifications[notificationId]; persistentNotifications[notificationId].close();
RED.projects.showFilesPrompt(); delete persistentNotifications[notificationId];
RED.projects.showFilesPrompt();
}
} }
} ]
] }
} else if (msg.error === "project_empty") { } else if (msg.error === "project_empty") {
options.buttons = [ if (RED.user.hasPermission("projects.write")) {
{ options.buttons = [
text: "No thanks", {
click: function() { text: "No thanks",
persistentNotifications[notificationId].close(); click: function() {
delete persistentNotifications[notificationId]; persistentNotifications[notificationId].close();
delete persistentNotifications[notificationId];
}
}, {
text: "Create default project files",
click: function() {
persistentNotifications[notificationId].close();
delete persistentNotifications[notificationId];
RED.projects.createDefaultFileSet();
}
} }
}, { ]
text: "Create default project files", }
click: function() {
persistentNotifications[notificationId].close();
delete persistentNotifications[notificationId];
RED.projects.createDefaultFileSet();
}
}
]
} }
} }
if (!persistentNotifications.hasOwnProperty(notificationId)) { if (!persistentNotifications.hasOwnProperty(notificationId)) {

36
editor/js/settings.js
View File

@ -63,7 +63,7 @@ RED.settings = (function () {
if (!hasLocalStorage()) { if (!hasLocalStorage()) {
return; return;
} }
if (key === "auth_tokens") { if (key === "auth-tokens") {
localStorage.removeItem(key); localStorage.removeItem(key);
} else { } else {
delete userSettings[key]; delete userSettings[key];
@ -161,23 +161,25 @@ RED.settings = (function () {
} }
function saveUserSettings() { function saveUserSettings() {
if (pendingSave) { if (RED.user.hasPermission("settings.write")) {
clearTimeout(pendingSave); if (pendingSave) {
clearTimeout(pendingSave);
}
pendingSave = setTimeout(function() {
pendingSave = null;
$.ajax({
method: 'POST',
contentType: 'application/json',
url: 'settings/user',
data: JSON.stringify(userSettings),
success: function (data) {
},
error: function(jqXHR,textStatus,errorThrown) {
console.log("Unexpected error saving user settings:",jqXHR.status,textStatus);
}
});
},300);
} }
pendingSave = setTimeout(function() {
pendingSave = null;
$.ajax({
method: 'POST',
contentType: 'application/json',
url: 'settings/user',
data: JSON.stringify(userSettings),
success: function (data) {
},
error: function(jqXHR,textStatus,errorThrown) {
console.log("Unexpected error saving user settings:",jqXHR.status,textStatus);
}
});
},300);
} }
function theme(property,defaultValue) { function theme(property,defaultValue) {

4
editor/js/ui/deploy.js
View File

@ -286,6 +286,10 @@ RED.deploy = (function() {
function save(skipValidation,force) { function save(skipValidation,force) {
if (!$("#btn-deploy").hasClass("disabled")) { if (!$("#btn-deploy").hasClass("disabled")) {
if (!RED.user.hasPermission("flows.write")) {
RED.notify(RED._("user.errors.deploy"),"error");
return;
}
if (!skipValidation) { if (!skipValidation) {
var hasUnknown = false; var hasUnknown = false;
var hasInvalid = false; var hasInvalid = false;

131
editor/js/ui/projects/projectSettings.js
View File

@ -40,6 +40,11 @@ RED.projects.settings = (function() {
if (settingsVisible) { if (settingsVisible) {
return; return;
} }
if (!RED.user.hasPermission("projects.write")) {
RED.notify(RED._("user.errors.notAuthorized"),"error");
return;
}
settingsVisible = true; settingsVisible = true;
var tabContainer; var tabContainer;
@ -226,12 +231,14 @@ RED.projects.settings = (function() {
var summary = $('<div style="position: relative">').appendTo(pane); var summary = $('<div style="position: relative">').appendTo(pane);
var summaryContent = $('<div></div>',{style:"color: #999"}).appendTo(summary); var summaryContent = $('<div></div>',{style:"color: #999"}).appendTo(summary);
updateProjectSummary(activeProject.summary, summaryContent); updateProjectSummary(activeProject.summary, summaryContent);
$('<button class="editor-button editor-button-small" style="float: right;">edit</button>') if (RED.user.hasPermission("projects.write")) {
.prependTo(summary) $('<button class="editor-button editor-button-small" style="float: right;">edit</button>')
.click(function(evt) { .prependTo(summary)
evt.preventDefault(); .click(function(evt) {
editSummary(activeProject, activeProject.summary, summaryContent); evt.preventDefault();
}); editSummary(activeProject, activeProject.summary, summaryContent);
});
}
$('<hr>').appendTo(pane); $('<hr>').appendTo(pane);
var description = $('<div class="node-help" style="position: relative"></div>').appendTo(pane); var description = $('<div class="node-help" style="position: relative"></div>').appendTo(pane);
@ -239,13 +246,14 @@ RED.projects.settings = (function() {
updateProjectDescription(activeProject, descriptionContent); updateProjectDescription(activeProject, descriptionContent);
$('<button class="editor-button editor-button-small" style="float: right;">edit</button>') if (RED.user.hasPermission("projects.write")) {
.prependTo(description) $('<button class="editor-button editor-button-small" style="float: right;">edit</button>')
.click(function(evt) { .prependTo(description)
evt.preventDefault(); .click(function(evt) {
editDescription(activeProject, descriptionContent); evt.preventDefault();
}); editDescription(activeProject, descriptionContent);
});
}
return pane; return pane;
} }
function updateProjectDependencies(activeProject,depsList) { function updateProjectDependencies(activeProject,depsList) {
@ -349,12 +357,14 @@ RED.projects.settings = (function() {
function createDependenciesPane(activeProject) { function createDependenciesPane(activeProject) {
var pane = $('<div id="project-settings-tab-deps" class="project-settings-tab-pane node-help"></div>'); var pane = $('<div id="project-settings-tab-deps" class="project-settings-tab-pane node-help"></div>');
$('<button class="editor-button editor-button-small" style="margin-top:10px;float: right;">edit</button>') if (RED.user.hasPermission("projects.write")) {
.appendTo(pane) $('<button class="editor-button editor-button-small" style="margin-top:10px;float: right;">edit</button>')
.click(function(evt) { .appendTo(pane)
evt.preventDefault(); .click(function(evt) {
editDependencies(activeProject,null,pane,depsList) evt.preventDefault();
}); editDependencies(activeProject,null,pane,depsList)
});
}
var depsList = $("<ol>",{style:"position: absolute;top: 60px;bottom: 20px;left: 20px;right: 20px;"}).appendTo(pane); var depsList = $("<ol>",{style:"position: absolute;top: 60px;bottom: 20px;left: 20px;right: 20px;"}).appendTo(pane);
depsList.editableList({ depsList.editableList({
addButton: false, addButton: false,
@ -368,28 +378,30 @@ RED.projects.settings = (function() {
row.parent().addClass("palette-module-section"); row.parent().addClass("palette-module-section");
} }
headerRow.text(entry.label); headerRow.text(entry.label);
if (entry.index === 1) { if (RED.user.hasPermission("projects.write")) {
var addButton = $('<button class="editor-button editor-button-small palette-module-button">add to project</button>').appendTo(headerRow).click(function(evt) { if (entry.index === 1) {
evt.preventDefault(); var addButton = $('<button class="editor-button editor-button-small palette-module-button">add to project</button>').appendTo(headerRow).click(function(evt) {
var deps = $.extend(true, {}, activeProject.dependencies); evt.preventDefault();
for (var m in modulesInUse) { var deps = $.extend(true, {}, activeProject.dependencies);
if (modulesInUse.hasOwnProperty(m) && !modulesInUse[m].known) { for (var m in modulesInUse) {
deps[m] = modulesInUse[m].version; if (modulesInUse.hasOwnProperty(m) && !modulesInUse[m].known) {
deps[m] = modulesInUse[m].version;
}
} }
} editDependencies(activeProject,JSON.stringify(deps,"",4),pane,depsList);
editDependencies(activeProject,JSON.stringify(deps,"",4),pane,depsList); });
}); } else if (entry.index === 3) {
} else if (entry.index === 3) { var removeButton = $('<button class="editor-button editor-button-small palette-module-button">remove from project</button>').appendTo(headerRow).click(function(evt) {
var removeButton = $('<button class="editor-button editor-button-small palette-module-button">remove from project</button>').appendTo(headerRow).click(function(evt) { evt.preventDefault();
evt.preventDefault(); var deps = $.extend(true, {}, activeProject.dependencies);
var deps = $.extend(true, {}, activeProject.dependencies); for (var m in activeProject.dependencies) {
for (var m in activeProject.dependencies) { if (activeProject.dependencies.hasOwnProperty(m) && !modulesInUse.hasOwnProperty(m)) {
if (activeProject.dependencies.hasOwnProperty(m) && !modulesInUse.hasOwnProperty(m)) { delete deps[m];
delete deps[m]; }
} }
} editDependencies(activeProject,JSON.stringify(deps,"",4),pane,depsList);
editDependencies(activeProject,JSON.stringify(deps,"",4),pane,depsList); });
}); }
} }
} else { } else {
headerRow.addClass("palette-module-header"); headerRow.addClass("palette-module-header");
@ -630,26 +642,27 @@ RED.projects.settings = (function() {
function createFilesSection(activeProject,pane) { function createFilesSection(activeProject,pane) {
var title = $('<h3></h3>').text("Files").appendTo(pane); var title = $('<h3></h3>').text("Files").appendTo(pane);
var filesContainer = $('<div class="user-settings-section"></div>').appendTo(pane); var filesContainer = $('<div class="user-settings-section"></div>').appendTo(pane);
var editFilesButton = $('<button class="editor-button editor-button-small" style="float: right;">edit</button>') if (RED.user.hasPermission("projects.write")) {
.appendTo(title) var editFilesButton = $('<button class="editor-button editor-button-small" style="float: right;">edit</button>')
.click(function(evt) { .appendTo(title)
evt.preventDefault(); .click(function(evt) {
formButtons.show(); evt.preventDefault();
editFilesButton.hide(); formButtons.show();
flowFileLabelText.hide(); editFilesButton.hide();
flowFileInput.show(); flowFileLabelText.hide();
flowFileInputSearch.show(); flowFileInput.show();
credFileLabel.hide(); flowFileInputSearch.show();
credFileInput.show(); credFileLabel.hide();
flowFileInput.focus(); credFileInput.show();
// credentialStateLabel.parent().hide(); flowFileInput.focus();
credentialStateLabel.addClass("uneditable-input"); // credentialStateLabel.parent().hide();
$(".user-settings-row-credentials").show(); credentialStateLabel.addClass("uneditable-input");
credentialStateLabel.css('height','auto'); $(".user-settings-row-credentials").show();
credentialFormRows.hide(); credentialStateLabel.css('height','auto');
credentialSecretButtons.show(); credentialFormRows.hide();
}); credentialSecretButtons.show();
});
}
var row; var row;
// Flow files // Flow files

29
editor/js/ui/projects/projects.js
View File

@ -1753,6 +1753,10 @@ RED.projects = (function() {
} else if (!activeProject.empty) { } else if (!activeProject.empty) {
throw new Error("Cannot create default file set on a non-empty project"); throw new Error("Cannot create default file set on a non-empty project");
} }
if (!RED.user.hasPermission("projects.write")) {
RED.notify(RED._("user.errors.notAuthorized"),"error");
return;
}
createProjectOptions = {}; createProjectOptions = {};
show('default-files',{existingProject: true}); show('default-files',{existingProject: true});
// var payload = { // var payload = {
@ -1805,11 +1809,18 @@ RED.projects = (function() {
return { return {
init: init, init: init,
_show: show,
showStartup: function() { showStartup: function() {
if (!RED.user.hasPermission("projects.write")) {
RED.notify(RED._("user.errors.notAuthorized"),"error");
return;
}
show('welcome'); show('welcome');
}, },
newProject: function() { newProject: function() {
if (!RED.user.hasPermission("projects.write")) {
RED.notify(RED._("user.errors.notAuthorized"),"error");
return;
}
if (!activeProject) { if (!activeProject) {
show('welcome'); show('welcome');
} else { } else {
@ -1817,15 +1828,31 @@ RED.projects = (function() {
} }
}, },
selectProject: function() { selectProject: function() {
if (!RED.user.hasPermission("projects.write")) {
RED.notify(RED._("user.errors.notAuthorized"),"error");
return;
}
show('open') show('open')
}, },
deleteProject: function() { deleteProject: function() {
if (!RED.user.hasPermission("projects.write")) {
RED.notify(RED._("user.errors.notAuthorized"),"error");
return;
}
show('delete') show('delete')
}, },
showCredentialsPrompt: function() { //TODO: rename this function showCredentialsPrompt: function() { //TODO: rename this function
if (!RED.user.hasPermission("projects.write")) {
RED.notify(RED._("user.errors.notAuthorized"),"error");
return;
}
RED.projects.settings.show('settings'); RED.projects.settings.show('settings');
}, },
showFilesPrompt: function() { //TODO: rename this function showFilesPrompt: function() { //TODO: rename this function
if (!RED.user.hasPermission("projects.write")) {
RED.notify(RED._("user.errors.notAuthorized"),"error");
return;
}
RED.projects.settings.show('settings'); RED.projects.settings.show('settings');
}, },
createDefaultFileSet: createDefaultFileSet, createDefaultFileSet: createDefaultFileSet,

9
editor/js/ui/projects/tab-versionControl.js
View File

@ -283,7 +283,10 @@ RED.sidebar.versionControl = (function() {
refreshFiles(result); refreshFiles(result);
}); });
} }
}) });
RED.events.on("login",function() {
refresh(true);
});
sidebarContent = $('<div>', {class:"sidebar-version-control"}); sidebarContent = $('<div>', {class:"sidebar-version-control"});
var stackContainer = $("<div>",{class:"sidebar-version-control-stack"}).appendTo(sidebarContent); var stackContainer = $("<div>",{class:"sidebar-version-control-stack"}).appendTo(sidebarContent);
sections = RED.stack.create({ sections = RED.stack.create({
@ -1175,6 +1178,10 @@ RED.sidebar.versionControl = (function() {
stagedChangesList.editableList('empty'); stagedChangesList.editableList('empty');
unmergedChangesList.editableList('empty'); unmergedChangesList.editableList('empty');
} }
if (!RED.user.hasPermission("projects.write")) {
return;
}
refreshInProgress = true; refreshInProgress = true;
refreshLocalCommits(); refreshLocalCommits();

4
editor/js/ui/userSettings.js
View File

@ -29,6 +29,10 @@ RED.userSettings = (function() {
if (settingsVisible) { if (settingsVisible) {
return; return;
} }
if (!RED.user.hasPermission("settings.write")) {
RED.notify(RED._("user.errors.settings"),"error");
return;
}
settingsVisible = true; settingsVisible = true;
var tabContainer; var tabContainer;

59
editor/js/user.js
View File

@ -188,6 +188,7 @@ RED.user = (function() {
RED.settings.load(function() { RED.settings.load(function() {
RED.notify(RED._("user.loggedInAs",{name:RED.settings.user.username}),"success"); RED.notify(RED._("user.loggedInAs",{name:RED.settings.user.username}),"success");
updateUserMenu(); updateUserMenu();
RED.events.emit("login",RED.settings.user.username);
}); });
}); });
} }
@ -230,10 +231,66 @@ RED.user = (function() {
} }
} }
var readRE = /^((.+)\.)?read$/
var writeRE = /^((.+)\.)?write$/
function hasPermission(permission) {
if (permission === "") {
return true;
}
if (!RED.settings.user) {
return true;
}
return checkPermission(RED.settings.user.permissions||"",permission);
}
function checkPermission(userScope,permission) {
if (permission === "") {
return true;
}
var i;
if (Array.isArray(permission)) {
// Multiple permissions requested - check each one
for (i=0;i<permission.length;i++) {
if (!checkPermission(userScope,permission[i])) {
return false;
}
}
// All permissions check out
return true;
}
if (Array.isArray(userScope)) {
if (userScope.length === 0) {
return false;
}
for (i=0;i<userScope.length;i++) {
if (checkPermission(userScope[i],permission)) {
return true;
}
}
return false;
}
if (userScope === "*" || userScope === permission) {
return true;
}
if (userScope === "read" || userScope === "*.read") {
return readRE.test(permission);
} else if (userScope === "write" || userScope === "*.write") {
return writeRE.test(permission);
}
return false;
}
return { return {
init: init, init: init,
login: login, login: login,
logout: logout logout: logout,
hasPermission: hasPermission
} }
})(); })();

4
editor/sass/projects.scss
View File

@ -23,6 +23,10 @@
#project-settings-tab-settings { #project-settings-tab-settings {
overflow-y: scroll; overflow-y: scroll;
} }
.sidebar-version-control-shade {
background: #f3f3f3;
}
.projects-edit-form form { .projects-edit-form form {
margin: 0; margin: 0;
.form-row { .form-row {

7
red/api/editor/locales/en-US/editor.json
View File

@ -76,7 +76,12 @@
"password": "Password", "password": "Password",
"login": "Login", "login": "Login",
"loginFailed": "Login failed", "loginFailed": "Login failed",
"notAuthorized": "Not authorized" "notAuthorized": "Not authorized",
"errors": {
"settings": "You must be logged in to access settings",
"deploy": "You must be logged in to deploy changes",
"notAuthorized": "You must be logged in to perform this action"
}
}, },
"notification": { "notification": {
"warning": "<strong>Warning</strong>: __message__", "warning": "<strong>Warning</strong>: __message__",