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

#268: Only assign password if given.

Browse Source
This commit is contained in:
Michael Jumper
2013-02-10 13:31:53 -08:00
parent 7f17ce4e88
commit 52d1c5e1d8
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
guacamole/src/main/webapp/admin.xhtml
View File

@@ -239,6 +239,11 @@
if (password != reentered_password) if (password != reentered_password)
throw new Error("Passwords do not match."); throw new Error("Passwords do not match.");
// Do not update password if it's just the
// not-changed token
if (password == "f12a1930-7195-11e2-bcfd-0800200c9a66")
password = null;
// Set user permissions // Set user permissions
user_perms.read_connection = {}; user_perms.read_connection = {};
var connections = fields[2]; var connections = fields[2];

9
guacamole/src/main/webapp/scripts/service.js
View File

@@ -293,7 +293,7 @@ GuacamoleService.Users = {
* Updates the user having the given username. * Updates the user having the given username.
* *
* @param {String} username The username of the user to create. * @param {String} username The username of the user to create.
* @param {String} password The password to assign to the user. * @param {String} password The password to assign to the user (optional).
* @param {GuacamoleService.PermissionSet} permissions The permissions to * @param {GuacamoleService.PermissionSet} permissions The permissions to
* assign. * assign.
* @param {String} parameters Any parameters which should be passed to the * @param {String} parameters Any parameters which should be passed to the
@@ -303,11 +303,12 @@ GuacamoleService.Users = {
"update" : function(username, password, permissions, parameters) { "update" : function(username, password, permissions, parameters) {
// Construct request URL // Construct request URL
var users_url = "users/update?name=" + encodeURIComponent(username); var users_url = "users/update";
if (parameters) users_url += "&" + parameters; if (parameters) users_url += "?" + parameters;
// Init POST data // Init POST data
var data = "password=" + encodeURIComponent(password); var data = "name=" + encodeURIComponent(username);
if (password) data += "&password=" + encodeURIComponent(password);
// Creation permissions // Creation permissions
if (permissions.create_user) data += "&user=create"; if (permissions.create_user) data += "&user=create";