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-234: Only try LDAP bind if user authenticated with LDAP.

Browse Source
This commit is contained in:
Nick Couchman
2018-12-15 14:22:54 -05:00
committed by Virtually Nick
parent fc5c4c538e
commit 791cfeabbb
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,22 +300,25 @@ public class AuthenticationProviderService {
// Bind using credentials associated with AuthenticatedUser // Bind using credentials associated with AuthenticatedUser
Credentials credentials = authenticatedUser.getCredentials(); Credentials credentials = authenticatedUser.getCredentials();
Dn bindDn = ((LDAPAuthenticatedUser) authenticatedUser).getBindDn(); if (authenticatedUser instanceof LDAPAuthenticatedUser) {
LdapNetworkConnection ldapConnection = ldapService.bindAs(bindDn, credentials.getPassword()); Dn bindDn = ((LDAPAuthenticatedUser) authenticatedUser).getBindDn();
LdapNetworkConnection ldapConnection = ldapService.bindAs(bindDn, credentials.getPassword());
try { try {
// Build user context by querying LDAP // Build user context by querying LDAP
LDAPUserContext userContext = userContextProvider.get(); LDAPUserContext userContext = userContextProvider.get();
userContext.init(authenticatedUser, ldapConnection); userContext.init(authenticatedUser, ldapConnection);
return userContext; return userContext;
}
// Always disconnect
finally {
ldapService.disconnect(ldapConnection);
}
} }
return null;
// Always disconnect
finally {
ldapService.disconnect(ldapConnection);
}
} }