GUACAMOLE-195: Remove call to getRemoteUser() and just use the configured HTTP header.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/8eb33b5c Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/8eb33b5c Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/8eb33b5c Branch: refs/heads/master Commit: 8eb33b5ca6ac276a5e368c754546e5d400aa1759 Parents: 96fb8a9 Author: Nick Couchman <[email protected]> Authored: Fri Feb 3 13:13:02 2017 -0500 Committer: Nick Couchman <[email protected]> Committed: Fri Feb 3 13:13:02 2017 -0500 ---------------------------------------------------------------------- .../auth/header/AuthenticationProviderService.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/8eb33b5c/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/AuthenticationProviderService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/AuthenticationProviderService.java b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/AuthenticationProviderService.java index 2625efd..a4acc9b 100644 --- a/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/AuthenticationProviderService.java +++ b/extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/AuthenticationProviderService.java @@ -70,13 +70,10 @@ public class AuthenticationProviderService { // Pull HTTP header from request if present HttpServletRequest request = credentials.getRequest(); if(request != null) { - // Try getRemoteUser(), first - String username = request.getRemoteUser(); - // Check if that worked, if not, try the configured header. - if(username == null) - username = request.getHeader(confService.getHttpAuthHeader()); + // Get the username from the header configured in guacamole.properties + String username = request.getHeader(confService.getHttpAuthHeader()); - if (username != null) { + if(username != null) { AuthenticatedUser authenticatedUser = authenticatedUserProvider.get(); authenticatedUser.init(username, credentials); return authenticatedUser;
