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

Merge 0.9.13-incubating changes back to master.

Browse Source
This commit is contained in:
Nick Couchman
2017-06-28 08:10:19 -04:00
parent 303be24cc1 de12b683d7
commit 5d1399413b
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
View File

@@ -313,8 +313,8 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
logger.debug("Unable to parse numeric attribute.", e);
}
// Set guacd hostname (no translation necessary)
getModel().setProxyHostname(attributes.get(GUACD_HOSTNAME_NAME));
// Translate guacd hostname
getModel().setProxyHostname(TextField.parse(attributes.get(GUACD_HOSTNAME_NAME)));
// Translate guacd port
try { getModel().setProxyPort(NumericField.parse(attributes.get(GUACD_PORT_NAME))); }

8
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java
View File

@@ -526,16 +526,16 @@ public class ModeledUser extends ModeledDirectoryObject<UserModel> implements Us
private void setUnrestrictedAttributes(Map<String, String> attributes) {
// Translate full name attribute
getModel().setFullName(attributes.get(User.Attribute.FULL_NAME));
getModel().setFullName(TextField.parse(attributes.get(User.Attribute.FULL_NAME)));
// Translate email address attribute
getModel().setEmailAddress(attributes.get(User.Attribute.EMAIL_ADDRESS));
getModel().setEmailAddress(TextField.parse(attributes.get(User.Attribute.EMAIL_ADDRESS)));
// Translate organization attribute
getModel().setOrganization(attributes.get(User.Attribute.ORGANIZATION));
getModel().setOrganization(TextField.parse(attributes.get(User.Attribute.ORGANIZATION)));
// Translate role attribute
getModel().setOrganizationalRole(attributes.get(User.Attribute.ORGANIZATIONAL_ROLE));
getModel().setOrganizationalRole(TextField.parse(attributes.get(User.Attribute.ORGANIZATIONAL_ROLE)));
}

21
guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java
View File

@@ -35,4 +35,25 @@ public class TextField extends Field {
super(name, Field.Type.TEXT);
}
/**
* Parses the given string, interpreting empty strings as equivalent to
* null. For all other cases, the given string is returned verbatim.
*
* @param str
* The string to parse, which may be null.
*
* @return
* The given string, or null if the given string was null or empty.
*/
public static String parse(String str) {
// Return null if no value provided
if (str == null || str.isEmpty())
return null;
// Otherwise, return string unmodified
return str;
}
}