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

GUACAMOLE-524: Changed addStandardTokens so user.getAttributes is called

Browse Source
This commit is contained in:
Jared Frees
2018-06-14 11:08:50 -04:00
parent 3d4f465c10
commit 49c3f11854
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
View File

@@ -126,10 +126,6 @@ public class ConnectionService {
TokenFilter tokenFilter = new TokenFilter(); TokenFilter tokenFilter = new TokenFilter();
StandardTokens.addStandardTokens(tokenFilter, user); StandardTokens.addStandardTokens(tokenFilter, user);
// Add custom attribute tokens
Map<String, String> attrs = user.getAttributes();
StandardTokens.addAttributeTokens(tokenFilter, attrs);
// Produce connections for each readable configuration // Produce connections for each readable configuration
Map<String, Connection> connections = new HashMap<String, Connection>(); Map<String, Connection> connections = new HashMap<String, Connection>();
while (results.hasMore()) { while (results.hasMore()) {

2
guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java
View File

@@ -171,6 +171,8 @@ public class StandardTokens {
// Add tokens specific to credentials // Add tokens specific to credentials
addStandardTokens(filter, user.getCredentials()); addStandardTokens(filter, user.getCredentials());
// Add custom attribute tokens
addAttributeTokens(filter, user.getAttributes());
} }
/** /**