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-1881: Decouple domain extraction from whether the extracted domain is used for a token.

Browse Source
This commit is contained in:
Michael Jumper
2024-05-15 10:38:20 -07:00
parent 50fdb34540
commit b2b1452e11
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,15 +316,18 @@ public class AuthenticationProviderService {
} }
/** /**
* Returns the current LDAP domain token from the provided user credentials. * Returns the Windows / Active Directory domain included in the username
* of the provided user credentials. If the username does not contain a
* domain, null is returned.
* *
* @param credentials * @param credentials
* The credentials used for authentication. * The credentials used for authentication.
* *
* @return * @return
* Domain name by splitting login username or null if no domain is detected. * The domain name within the username of the provided credentials, or
* null if no domain is present.
*/ */
private String getDomainToken(Credentials credentials) { private String getUserDomain(Credentials credentials) {
String username = credentials.getUsername(); String username = credentials.getUsername();
//Regex is used to extract the domain from a username //Regex is used to extract the domain from a username
//that is in either of these formats: DOMAIN\\username or username@domain. //that is in either of these formats: DOMAIN\\username or username@domain.
@@ -399,7 +402,7 @@ public class AuthenticationProviderService {
// Extract the domain (ie: Windows / Active Directory domain) from the // Extract the domain (ie: Windows / Active Directory domain) from the
// user's credentials // user's credentials
String domainName = getDomainToken(credentials); String domainName = getUserDomain(credentials);
if (domainName != null) if (domainName != null)
tokens.put(LDAP_DOMAIN_TOKEN, domainName); tokens.put(LDAP_DOMAIN_TOKEN, domainName);