From 5a763d2a53e2e9c39330b08c0f04ccede0ee29b2 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Wed, 14 Jun 2017 21:21:54 -0400 Subject: [PATCH 1/3] GUACAMOLE-323: Provide login help text during CAS redirect. --- .../guacamole/auth/cas/AuthenticationProviderService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 43435fedb..edd89dce8 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 @@ -29,6 +29,7 @@ import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.form.Field; 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; @@ -89,7 +90,8 @@ public class AuthenticationProviderService { } // Request CAS ticket - throw new GuacamoleInvalidCredentialsException("Invalid login.", + throw new GuacamoleInsufficientCredentialsException( + "Please wait, redirecting to CAS authentication.", new CredentialsInfo(Arrays.asList(new Field[] { // CAS-specific ticket (will automatically redirect the user From ab40313ced8fe6f47e41f9fae8494f053c875959 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Thu, 15 Jun 2017 20:58:26 -0400 Subject: [PATCH 2/3] GUACAMOLE-323: Add translation file; hide ticket field header. --- .../auth/cas/AuthenticationProviderService.java | 2 +- .../src/main/resources/guac-manifest.json | 4 ++++ .../src/main/resources/translations/en.json | 12 ++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 extensions/guacamole-auth-cas/src/main/resources/translations/en.json 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 edd89dce8..044c00fd5 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 @@ -91,7 +91,7 @@ public class AuthenticationProviderService { // Request CAS ticket throw new GuacamoleInsufficientCredentialsException( - "Please wait, redirecting to CAS authentication.", + "LOGIN.INFO_CAS_REDIRECT_PENDING", new CredentialsInfo(Arrays.asList(new Field[] { // CAS-specific ticket (will automatically redirect the user diff --git a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json index d0f335346..fd963a217 100644 --- a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json @@ -9,6 +9,10 @@ "org.apache.guacamole.auth.cas.CASAuthenticationProvider" ], + "translations" : [ + "translations/en.json" + ], + "js" : [ "casModule.js", "casController.js", diff --git a/extensions/guacamole-auth-cas/src/main/resources/translations/en.json b/extensions/guacamole-auth-cas/src/main/resources/translations/en.json new file mode 100644 index 000000000..dfda606c5 --- /dev/null +++ b/extensions/guacamole-auth-cas/src/main/resources/translations/en.json @@ -0,0 +1,12 @@ +{ + + "DATA_SOURCE_CAS" : { + "NAME" : "CAS SSO Backend" + }, + + "LOGIN" : { + "FIELD_HEADER_TICKET" : "", + "INFO_CAS_REDIRECT_PENDING" : "Please wait, redirecting to CAS authentication." + } + +} From bc59074808375ffb472850ec18e8e94c724b695b Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Thu, 15 Jun 2017 21:01:48 -0400 Subject: [PATCH 3/3] GUACAMOLE-323: Clean up unneeded import. --- .../apache/guacamole/auth/cas/AuthenticationProviderService.java | 1 - 1 file changed, 1 deletion(-) 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 044c00fd5..f3870a6d8 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 @@ -30,7 +30,6 @@ import org.apache.guacamole.form.Field; 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;