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/06/23 21:39:33 UTC
[1/5] incubator-guacamole-client git commit: GUACAMOLE-323: Clean up
unneeded import.
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/master 18effb247 -> 372635a72
GUACAMOLE-323: Clean up unneeded import.
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/bc590748
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/bc590748
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/bc590748
Branch: refs/heads/master
Commit: bc59074808375ffb472850ec18e8e94c724b695b
Parents: ab40313
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Jun 15 21:01:48 2017 -0400
Committer: Nick Couchman <ni...@yahoo.com>
Committed: Mon Jun 19 14:59:20 2017 -0400
----------------------------------------------------------------------
.../apache/guacamole/auth/cas/AuthenticationProviderService.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/bc590748/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 044c00f..f3870a6 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;
[4/5] incubator-guacamole-client git commit: GUACAMOLE-323: Merge
login help test for CAS.
Posted by mj...@apache.org.
GUACAMOLE-323: Merge login help test for CAS.
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/04c70c7e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/04c70c7e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/04c70c7e
Branch: refs/heads/master
Commit: 04c70c7e49c555fa89023b1f7b090384bc06c8f4
Parents: 80b681e bc59074
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Jun 23 14:36:40 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Jun 23 14:36:40 2017 -0700
----------------------------------------------------------------------
.../auth/cas/AuthenticationProviderService.java | 5 +++--
.../src/main/resources/guac-manifest.json | 4 ++++
.../src/main/resources/translations/en.json | 12 ++++++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-guacamole-client git commit: GUACAMOLE-323: Provide
login help text during CAS redirect.
Posted by mj...@apache.org.
GUACAMOLE-323: Provide login help text during CAS redirect.
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/5a763d2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/5a763d2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/5a763d2a
Branch: refs/heads/master
Commit: 5a763d2a53e2e9c39330b08c0f04ccede0ee29b2
Parents: 80b681e
Author: Nick Couchman <vn...@apache.org>
Authored: Wed Jun 14 21:21:54 2017 -0400
Committer: Nick Couchman <ni...@yahoo.com>
Committed: Mon Jun 19 14:59:20 2017 -0400
----------------------------------------------------------------------
.../apache/guacamole/auth/cas/AuthenticationProviderService.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5a763d2a/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 43435fe..edd89dc 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
[5/5] incubator-guacamole-client git commit: Merge 0.9.13-incubating
changes back to master.
Posted by mj...@apache.org.
Merge 0.9.13-incubating changes back to master.
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/372635a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/372635a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/372635a7
Branch: refs/heads/master
Commit: 372635a72de4e0672f06fc7a978610e7ac59e55f
Parents: 18effb2 04c70c7
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Jun 23 14:38:32 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Jun 23 14:38:32 2017 -0700
----------------------------------------------------------------------
.../auth/cas/AuthenticationProviderService.java | 5 +++--
.../src/main/resources/guac-manifest.json | 4 ++++
.../src/main/resources/translations/en.json | 12 ++++++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/5] incubator-guacamole-client git commit: GUACAMOLE-323: Add
translation file; hide ticket field header.
Posted by mj...@apache.org.
GUACAMOLE-323: Add translation file; hide ticket field 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/ab40313c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/ab40313c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/ab40313c
Branch: refs/heads/master
Commit: ab40313ced8fe6f47e41f9fae8494f053c875959
Parents: 5a763d2
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Jun 15 20:58:26 2017 -0400
Committer: Nick Couchman <ni...@yahoo.com>
Committed: Mon Jun 19 14:59:20 2017 -0400
----------------------------------------------------------------------
.../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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ab40313c/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 edd89dc..044c00f 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
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ab40313c/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
----------------------------------------------------------------------
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 d0f3353..fd963a2 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",
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/ab40313c/extensions/guacamole-auth-cas/src/main/resources/translations/en.json
----------------------------------------------------------------------
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 0000000..dfda606
--- /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."
+ }
+
+}