Repository: guacamole-client Updated Branches: refs/heads/staging/1.0.0 a967ffa41 -> 801a5df9f
GUACAMOLE-526: Fix loading of CAS ticket field and redirection. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/df8c07c1 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/df8c07c1 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/df8c07c1 Branch: refs/heads/staging/1.0.0 Commit: df8c07c18755d0742df20d2e66c5e6d5881129d8 Parents: a967ffa Author: Nick Couchman <vn...@apache.org> Authored: Sun Dec 2 16:34:16 2018 -0500 Committer: Nick Couchman <vn...@apache.org> Committed: Tue Dec 4 19:28:14 2018 -0500 ---------------------------------------------------------------------- .../auth/cas/AuthenticationProviderService.java | 12 ++---------- .../apache/guacamole/auth/cas/form/CASTicketField.java | 2 -- 2 files changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/df8c07c1/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java index a9b3230..d769d2e 100644 --- a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java +++ b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java @@ -23,12 +23,11 @@ import com.google.inject.Inject; import com.google.inject.Provider; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; -import org.apache.guacamole.environment.Environment; import org.apache.guacamole.form.Field; import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.net.auth.Credentials; import org.apache.guacamole.net.auth.credentials.CredentialsInfo; -import org.apache.guacamole.net.auth.credentials.GuacamoleInsufficientCredentialsException; +import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException; import org.apache.guacamole.auth.cas.conf.ConfigurationService; import org.apache.guacamole.auth.cas.form.CASTicketField; import org.apache.guacamole.auth.cas.ticket.TicketValidationService; @@ -47,12 +46,6 @@ public class AuthenticationProviderService { private ConfigurationService confService; /** - * The Guacamole server environment. - */ - @Inject - private Environment environment; - - /** * Service for validating received ID tickets. */ @Inject @@ -97,8 +90,7 @@ public class AuthenticationProviderService { } // Request CAS ticket - throw new GuacamoleInsufficientCredentialsException( - "LOGIN.INFO_CAS_REDIRECT_PENDING", + throw new GuacamoleInvalidCredentialsException("Invalid login.", new CredentialsInfo(Arrays.asList(new Field[] { // CAS-specific ticket (will automatically redirect the user http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/df8c07c1/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/form/CASTicketField.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/form/CASTicketField.java b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/form/CASTicketField.java index eb0f68e..f785241 100644 --- a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/form/CASTicketField.java +++ b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/form/CASTicketField.java @@ -20,9 +20,7 @@ package org.apache.guacamole.auth.cas.form; import java.io.UnsupportedEncodingException; -import java.math.BigInteger; import java.net.URLEncoder; -import java.security.SecureRandom; import org.apache.guacamole.form.Field;
