Repository: incubator-guacamole-client Updated Branches: refs/heads/master 83b857709 -> 80896ca5b
GUACAMOLE-355: Catch CAS errors and throw them to Guacamole, and display error message in login dialog. 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/5ff7fbf9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/5ff7fbf9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/5ff7fbf9 Branch: refs/heads/master Commit: 5ff7fbf971a30bc8e822fe6b3c906272914c8682 Parents: bfb6b13 Author: Nick Couchman <[email protected]> Authored: Thu Aug 10 21:34:23 2017 -0400 Committer: Nick Couchman <[email protected]> Committed: Fri Oct 27 15:16:41 2017 -0400 ---------------------------------------------------------------------- .../guacamole/auth/cas/ticket/TicketValidationService.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5ff7fbf9/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java index 122059c..045b347 100644 --- a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java +++ b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java @@ -33,6 +33,8 @@ import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleServerException; import org.apache.guacamole.auth.cas.conf.ConfigurationService; 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.jasig.cas.client.authentication.AttributePrincipal; import org.jasig.cas.client.validation.Assertion; import org.jasig.cas.client.validation.Cas20ProxyTicketValidator; @@ -109,6 +111,10 @@ public class TicketValidationService { catch (TicketValidationException e) { throw new GuacamoleException("Ticket validation failed.", e); } + catch (Throwable t) { + logger.error("Error validating ticket with CAS server: {}", t.getMessage()); + throw new GuacamoleInsufficientCredentialsException("Error validating ticket with CAS server.", t, CredentialsInfo.USERNAME_PASSWORD); + } }
