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-5: Provide most recent Credentials to updateUserContext(). Doing otherwise relies on the AuthenticatedUser being updated, which is not guaranteed to happen.

Browse Source
This commit is contained in:
Michael Jumper
2016-07-29 15:14:39 -07:00
parent 872aac375c
commit abbc83a15b
6 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/java/org/apache/guacamole/extension/AuthenticationProviderFacade.java
View File

@@ -183,7 +183,7 @@ public class AuthenticationProviderFacade implements AuthenticationProvider {
@Override
public UserContext updateUserContext(UserContext context,
AuthenticatedUser authenticatedUser)
AuthenticatedUser authenticatedUser, Credentials credentials)
throws GuacamoleException {
// Ignore auth attempts if no auth provider could be loaded
@@ -193,7 +193,7 @@ public class AuthenticationProviderFacade implements AuthenticationProvider {
}
// Delegate to underlying auth provider
return authProvider.updateUserContext(context, authenticatedUser);
return authProvider.updateUserContext(context, authenticatedUser, credentials);
}

11
guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthenticationService.java
View File

@@ -288,6 +288,10 @@ public class AuthenticationService {
* The AuthenticatedUser that has successfully authenticated or re-
* authenticated.
*
* @param credentials
* The Credentials provided by the user in the most recent
* authentication attempt.
*
* @return
* A List of all UserContexts associated with the given
* AuthenticatedUser.
@@ -296,7 +300,8 @@ public class AuthenticationService {
* If an error occurs while creating or updating any UserContext.
*/
private List<UserContext> getUserContexts(GuacamoleSession existingSession,
AuthenticatedUser authenticatedUser) throws GuacamoleException {
AuthenticatedUser authenticatedUser, Credentials credentials)
throws GuacamoleException {
List<UserContext> userContexts = new ArrayList<UserContext>(authProviders.size());
@@ -309,7 +314,7 @@ public class AuthenticationService {
// Update existing UserContext
AuthenticationProvider authProvider = oldUserContext.getAuthenticationProvider();
UserContext userContext = authProvider.updateUserContext(oldUserContext, authenticatedUser);
UserContext userContext = authProvider.updateUserContext(oldUserContext, authenticatedUser, credentials);
// Add to available data, if successful
if (userContext != null)
@@ -379,7 +384,7 @@ public class AuthenticationService {
// Get up-to-date AuthenticatedUser and associated UserContexts
AuthenticatedUser authenticatedUser = getAuthenticatedUser(existingSession, credentials);
List<UserContext> userContexts = getUserContexts(existingSession, authenticatedUser);
List<UserContext> userContexts = getUserContexts(existingSession, authenticatedUser, credentials);
// Update existing session, if it exists
String authToken;