GUACAMOLE-524: Changed addStandardTokens so user.getAttributes is called
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/49c3f118 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/49c3f118 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/49c3f118 Branch: refs/heads/master Commit: 49c3f11854fadd87e3e4cff38d75a11a4d98bc74 Parents: 3d4f465 Author: Jared Frees <[email protected]> Authored: Thu Jun 14 11:08:50 2018 -0400 Committer: Jared Frees <[email protected]> Committed: Thu Jun 14 11:08:50 2018 -0400 ---------------------------------------------------------------------- .../apache/guacamole/auth/ldap/connection/ConnectionService.java | 4 ---- .../src/main/java/org/apache/guacamole/token/StandardTokens.java | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/49c3f118/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 e6e5c5c..a282f30 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 @@ -126,10 +126,6 @@ public class ConnectionService { TokenFilter tokenFilter = new TokenFilter(); StandardTokens.addStandardTokens(tokenFilter, user); - // Add custom attribute tokens - Map<String, String> attrs = user.getAttributes(); - StandardTokens.addAttributeTokens(tokenFilter, attrs); - // Produce connections for each readable configuration Map<String, Connection> connections = new HashMap<String, Connection>(); while (results.hasMore()) { http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/49c3f118/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java ---------------------------------------------------------------------- diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java index 1039091..7607481 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java @@ -171,6 +171,8 @@ public class StandardTokens { // Add tokens specific to credentials addStandardTokens(filter, user.getCredentials()); + // Add custom attribute tokens + addAttributeTokens(filter, user.getAttributes()); } /**
