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

GUACAMOLE-1881: Remove unnecessary usage of TokenName.canonicalize() to derive static name.

Browse Source
This commit is contained in:
Michael Jumper
2024-05-15 10:37:06 -07:00
parent 27bbd35a3d
commit 50fdb34540
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/AuthenticationProviderService.java
View File

@@ -65,12 +65,13 @@ public class AuthenticationProviderService {
/** /**
* The prefix that will be used when generating tokens. * The prefix that will be used when generating tokens.
*/ */
public static final String LDAP_ATTRIBUTE_TOKEN_PREFIX = "LDAP_"; public static final String LDAP_TOKEN_PREFIX = "LDAP_";
/** /**
* The name of LDAP domain attribute. * The name of parameter token that will contain the domain extracted from
* the LDAP user's username, if applicable.
*/ */
public static final String LDAP_DOMAIN_TOKEN = "DOMAIN"; public static final String LDAP_DOMAIN_TOKEN = LDAP_TOKEN_PREFIX + "DOMAIN";
/** /**
* Service for creating and managing connections to LDAP servers. * Service for creating and managing connections to LDAP servers.
@@ -389,19 +390,18 @@ public class AuthenticationProviderService {
// Convert each retrieved attribute into a corresponding token // Convert each retrieved attribute into a corresponding token
for (Attribute attr : attributes) { for (Attribute attr : attributes) {
tokens.put(TokenName.canonicalize(attr.getId(), tokens.put(TokenName.canonicalize(attr.getId(),
LDAP_ATTRIBUTE_TOKEN_PREFIX), attr.getString()); LDAP_TOKEN_PREFIX), attr.getString());
} }
} }
catch (LdapException e) { catch (LdapException e) {
throw new GuacamoleServerException("Could not query LDAP user attributes.", e); throw new GuacamoleServerException("Could not query LDAP user attributes.", e);
} }
// Extracting the domain name from the user's credentials // Extract the domain (ie: Windows / Active Directory domain) from the
// user's credentials
String domainName = getDomainToken(credentials); String domainName = getDomainToken(credentials);
if (domainName != null) { if (domainName != null)
String tokenName = TokenName.canonicalize(LDAP_DOMAIN_TOKEN, LDAP_ATTRIBUTE_TOKEN_PREFIX); tokens.put(LDAP_DOMAIN_TOKEN, domainName);
tokens.put(tokenName, domainName);
}
return tokens; return tokens;