GUACAMOLE-524: Add custom attribute tokens with tokenFilter
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/3abc9966 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/3abc9966 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/3abc9966 Branch: refs/heads/master Commit: 3abc996658df828885b452c42e59ab847ce33680 Parents: f5f9f62 Author: Jared Frees <[email protected]> Authored: Mon Jun 11 15:15:31 2018 -0400 Committer: Jared Frees <[email protected]> Committed: Mon Jun 11 15:15:31 2018 -0400 ---------------------------------------------------------------------- .../guacamole/auth/ldap/connection/ConnectionService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3abc9966/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java index 3ce00e3..67df3bf 100644 --- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java +++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java @@ -36,6 +36,7 @@ import org.apache.guacamole.auth.ldap.EscapingService; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleServerException; import org.apache.guacamole.net.auth.AuthenticatedUser; +//import org.apache.guacamole.auth.ldap.user.AuthenticatedUser; import org.apache.guacamole.net.auth.Connection; import org.apache.guacamole.net.auth.simple.SimpleConnection; import org.apache.guacamole.protocol.GuacamoleConfiguration; @@ -126,6 +127,10 @@ public class ConnectionService { TokenFilter tokenFilter = new TokenFilter(); StandardTokens.addStandardTokens(tokenFilter, user); + // Add custom attribute tokens + Map<String, String> attrs = ( (org.apache.guacamole.auth.ldap.user.AuthenticatedUser) user).getAttributes(); + StandardTokens.addAttributeTokens(tokenFilter, attrs); + // Produce connections for each readable configuration Map<String, Connection> connections = new HashMap<String, Connection>(); while (results.hasMore()) { @@ -295,4 +300,3 @@ public class ConnectionService { } } -
