From 49c3f11854fadd87e3e4cff38d75a11a4d98bc74 Mon Sep 17 00:00:00 2001 From: Jared Frees Date: Thu, 14 Jun 2018 11:08:50 -0400 Subject: [PATCH] GUACAMOLE-524: Changed addStandardTokens so user.getAttributes is called --- .../guacamole/auth/ldap/connection/ConnectionService.java | 4 ---- .../main/java/org/apache/guacamole/token/StandardTokens.java | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) 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 e6e5c5c13..a282f3036 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 attrs = user.getAttributes(); - StandardTokens.addAttributeTokens(tokenFilter, attrs); - // Produce connections for each readable configuration Map connections = new HashMap(); while (results.hasMore()) { 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 1039091e7..760748179 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()); } /**