safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 21:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #268: Implement connection access manipulation, fix user update (reinstate use of DummyUser).

Browse Source
This commit is contained in:
Michael Jumper
2013-02-13 15:32:57 -08:00
parent bb2f8d852d
commit 2a71da3827
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/crud/users/Update.java
View File

@@ -161,7 +161,8 @@ public class Update extends AuthenticatingHttpServlet {
context.getUserDirectory(); context.getUserDirectory();
// Get user data, setting password if given // Get user data, setting password if given
User user = directory.get(username); User user = new DummyUser();
user.setUsername(username);
if (password != null) if (password != null)
user.setPassword(password); user.setPassword(password);

25
guacamole/src/main/webapp/scripts/admin-ui.js
View File

@@ -532,7 +532,8 @@ GuacAdmin.reset = function() {
}; };
// If readable connections exist, list them // If readable connections exist, list them
if (GuacAdmin.hasEntry(permissions.read_connection)) { var selected_connections = {};
if (GuacAdmin.hasEntry(permissions.administer_connection)) {
// Add fields for per-connection checkboxes // Add fields for per-connection checkboxes
var connections_header = GuacUI.createChildElement(sections, "dt"); var connections_header = GuacUI.createChildElement(sections, "dt");
@@ -541,13 +542,28 @@ GuacAdmin.reset = function() {
GuacUI.createChildElement(sections, "dd"), GuacUI.createChildElement(sections, "dd"),
"div", "list"); "div", "list");
for (var conn in permissions.read_connection) { for (var conn in permissions.administer_connection) {
var connection = GuacUI.createChildElement(connections, "div", "connection"); var connection = GuacUI.createChildElement(connections, "div", "connection");
var connection_field = GuacUI.createChildElement(connection, "input"); var connection_field = GuacUI.createChildElement(connection, "input");
var connection_name = GuacUI.createChildElement(connection, "span", "name"); var connection_name = GuacUI.createChildElement(connection, "span", "name");
connection_field.setAttribute("type", "checkbox"); connection_field.setAttribute("type", "checkbox");
connection_field.setAttribute("value", conn);
// Check checkbox if connection readable by selected user
if (conn in user_perms.read_connection) {
selected_connections[conn] = true;
connection_field.checked = true;
}
// Update selected connections when changed
connection_field.onclick = connection_field.onchange = function() {
if (this.checked)
selected_connections[this.value] = true;
else if (selected_connections[this.value])
delete selected_connections[this.value];
};
connection_name.textContent = conn; connection_name.textContent = conn;
@@ -586,10 +602,7 @@ GuacAdmin.reset = function() {
password = null; password = null;
// Set user permissions // Set user permissions
user_perms.read_connection = {}; user_perms.read_connection = selected_connections;
var connections = undefined; /* STUB (selected connections) */
for (var i=0; i<connections.length; i++)
user_perms.read_connection[connections[i]] = true;
// Save user // Save user
GuacamoleService.Users.update( GuacamoleService.Users.update(