You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/10/27 19:21:35 UTC
[1/4] incubator-guacamole-client git commit: GUACAMOLE-355: Catch CAS
errors and throw them to Guacamole, and display error message in login dialog.
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/staging/0.9.14-incubating bfb6b13ba -> 51ccbed13
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/staging/0.9.14-incubating
Commit: 5ff7fbf971a30bc8e822fe6b3c906272914c8682
Parents: bfb6b13
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Aug 10 21:34:23 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
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);
+ }
}
[4/4] incubator-guacamole-client git commit: GUACAMOLE-355: Merge
catch-all error handling for unchecked exceptions thrown by underlying CAS
library.
Posted by mj...@apache.org.
GUACAMOLE-355: Merge catch-all error handling for unchecked exceptions thrown by underlying CAS library.
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/51ccbed1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/51ccbed1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/51ccbed1
Branch: refs/heads/staging/0.9.14-incubating
Commit: 51ccbed1307be4c52298cc7a0e27ad6d2bb1ff54
Parents: bfb6b13 9c57e20
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Oct 27 12:20:07 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Oct 27 12:20:07 2017 -0700
----------------------------------------------------------------------
.../guacamole/auth/cas/ticket/TicketValidationService.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
[2/4] incubator-guacamole-client git commit: GUACAMOLE-355: Make
error displayed to user more generic.
Posted by mj...@apache.org.
GUACAMOLE-355: Make error displayed to user more generic.
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/a45a44fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/a45a44fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/a45a44fe
Branch: refs/heads/staging/0.9.14-incubating
Commit: a45a44fea57f86180ed18ac9fa199e2cc2c1d7b0
Parents: 5ff7fbf
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Aug 18 21:51:42 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Oct 27 15:16:49 2017 -0400
----------------------------------------------------------------------
.../apache/guacamole/auth/cas/ticket/TicketValidationService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/a45a44fe/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 045b347..34003a6 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
@@ -113,7 +113,7 @@ public class TicketValidationService {
}
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);
+ throw new GuacamoleInsufficientCredentialsException("CAS login failed.", CredentialsInfo.USERNAME_PASSWORD);
}
}
[3/4] incubator-guacamole-client git commit: GUACAMOLE-355: Switch to
Invalid credentials and rely on error being logged.
Posted by mj...@apache.org.
GUACAMOLE-355: Switch to Invalid credentials and rely on error being logged.
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/9c57e20a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/9c57e20a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/9c57e20a
Branch: refs/heads/staging/0.9.14-incubating
Commit: 9c57e20a177de62a7825d198118b63df99813a50
Parents: a45a44f
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Oct 27 14:29:13 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Oct 27 15:16:49 2017 -0400
----------------------------------------------------------------------
.../guacamole/auth/cas/ticket/TicketValidationService.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/9c57e20a/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 34003a6..bfc3b69 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
@@ -34,7 +34,7 @@ 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.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
import org.jasig.cas.client.authentication.AttributePrincipal;
import org.jasig.cas.client.validation.Assertion;
import org.jasig.cas.client.validation.Cas20ProxyTicketValidator;
@@ -113,7 +113,7 @@ public class TicketValidationService {
}
catch (Throwable t) {
logger.error("Error validating ticket with CAS server: {}", t.getMessage());
- throw new GuacamoleInsufficientCredentialsException("CAS login failed.", CredentialsInfo.USERNAME_PASSWORD);
+ throw new GuacamoleInvalidCredentialsException("CAS login failed.", CredentialsInfo.USERNAME_PASSWORD);
}
}