[guacamole-client] branch master updated (30f6ac4 -> 00f5942)
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from 30f6ac4 GUACAMOLE-723: Merge display connection selection menu only
if multiple connections are available.
add 55c4144 GUACAMOLE-579: Parse tokens from attributes provided by the
CAS server.
add 8ab9e51 GUACAMOLE-579: Put back original init method for
compatibility.
add d8db630 GUACAMOLE-579: Clean up comments, implement convenience
method for tokens without a prefix, and remove unneeded classes.
add a6601a2 GUACAMOLE-579: Change fromAttribute to canonicalize
add a2b3e23 GUACAMOLE-579: Fix up documentation issues.
add 7f26ba7 GUACAMOLE-579: Insure that CAS is providing a username.
add 9c26a76 GUACAMOLE-579: Remove unnecessary JUnit dependencies.
add f5aa986 GUACAMOLE-579: Merge support for retrieving user attributes
CAS.
new 00f5942 Merge 1.1.0 changes back to master.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../auth/cas/AuthenticationProviderService.java| 16 +++---
.../auth/cas/CASAuthenticationProvider.java| 15 ++
.../auth/cas/ticket/TicketValidationService.java | 50 --
...nticatedUser.java => CASAuthenticatedUser.java} | 43 +++-
extensions/guacamole-auth-ldap/pom.xml | 8 ---
.../auth/ldap/AuthenticationProviderService.java | 13 +++--
.../guacamole/auth/ldap/LDAPConnectionService.java | 1 -
.../guacamole/auth/ldap/ReferralAuthHandler.java | 9 ++--
.../apache/guacamole/auth/ldap/TokenNameTest.java | 53 ---
.../org/apache/guacamole/token}/TokenName.java | 60 ++
.../org/apache/guacamole/token/TokenNameTest.java | 55
11 files changed, 209 insertions(+), 114 deletions(-)
rename
extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/user/{AuthenticatedUser.java
=> CASAuthenticatedUser.java} (60%)
delete mode 100644
extensions/guacamole-auth-ldap/src/test/java/org/apache/guacamole/auth/ldap/TokenNameTest.java
rename
{extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap =>
guacamole-ext/src/main/java/org/apache/guacamole/token}/TokenName.java (60%)
create mode 100644
guacamole-ext/src/test/java/org/apache/guacamole/token/TokenNameTest.java
[guacamole-client] 01/01: Merge 1.1.0 changes back to master.
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 00f59420e50c8d2682e052cc51df75b77ffa9b62
Merge: 30f6ac4 f5aa986
Author: Michael Jumper
AuthorDate: Sun Jun 23 19:37:32 2019 -0700
Merge 1.1.0 changes back to master.
.../auth/cas/AuthenticationProviderService.java| 16 +++---
.../auth/cas/CASAuthenticationProvider.java| 15 ++
.../auth/cas/ticket/TicketValidationService.java | 50 --
...nticatedUser.java => CASAuthenticatedUser.java} | 43 +++-
extensions/guacamole-auth-ldap/pom.xml | 8 ---
.../auth/ldap/AuthenticationProviderService.java | 13 +++--
.../guacamole/auth/ldap/LDAPConnectionService.java | 1 -
.../guacamole/auth/ldap/ReferralAuthHandler.java | 9 ++--
.../apache/guacamole/auth/ldap/TokenNameTest.java | 53 ---
.../org/apache/guacamole/token}/TokenName.java | 60 ++
.../org/apache/guacamole/token/TokenNameTest.java | 55
11 files changed, 209 insertions(+), 114 deletions(-)
diff --cc
extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/ticket/TicketValidationService.java
index 958ea2c,ba7ac83..fce4760
---
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
@@@ -30,7 -28,12 +30,11 @@@ import javax.crypto.Cipher
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import java.nio.charset.Charset;
+ import java.util.HashMap;
+ import java.util.Map;
+ import java.util.Map.Entry;
-import javax.xml.bind.DatatypeConverter;
import org.apache.guacamole.GuacamoleException;
+ import org.apache.guacamole.GuacamoleSecurityException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.auth.cas.conf.ConfigurationService;
import org.apache.guacamole.net.auth.Credentials;
@@@ -89,9 -98,12 +99,12 @@@ public class TicketValidationService
validator.setAcceptAnyProxy(true);
validator.setEncoding("UTF-8");
try {
+ Map tokens = new HashMap<>();
-String confRedirectURI = confService.getRedirectURI();
-Assertion a = validator.validate(ticket, confRedirectURI);
+URI confRedirectURI = confService.getRedirectURI();
+Assertion a = validator.validate(ticket,
confRedirectURI.toString());
AttributePrincipal principal = a.getPrincipal();
+ Map ticketAttrs =
+ new HashMap<>(principal.getAttributes());
// Retrieve username and set the credentials.
String username = principal.getName();
[guacamole-client] branch master updated (b1d3070 -> 30f6ac4)
This is an automated email from the ASF dual-hosted git repository. vnick pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git. from b1d3070 GUACAMOLE-723: Merge automatically close menus upon click unless explicitly marked as interactive. add 40ee0d3 GUACAMOLE-723: Consider entire connection hierarchy when determining whether only one connection is available. add 3d71f84 GUACAMOLE-723: Display connection selection menu only if multiple choices are available. new 30f6ac4 GUACAMOLE-723: Merge display connection selection menu only if multiple connections are available. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../app/client/controllers/clientController.js | 17 ++- .../app/navigation/services/userPageService.js | 131 - 2 files changed, 88 insertions(+), 60 deletions(-)
[guacamole-client] 01/01: GUACAMOLE-723: Merge display connection selection menu only if multiple connections are available.
This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git commit 30f6ac434b8b4dfbd12da838e99e79a9cb40f1b1 Merge: b1d3070 3d71f84 Author: Virtually Nick AuthorDate: Sun Jun 23 22:32:08 2019 -0400 GUACAMOLE-723: Merge display connection selection menu only if multiple connections are available. .../app/client/controllers/clientController.js | 17 ++- .../app/navigation/services/userPageService.js | 131 - 2 files changed, 88 insertions(+), 60 deletions(-)
[guacamole-client] 01/01: GUACAMOLE-579: Merge support for retrieving user attributes CAS.
This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch staging/1.1.0 in repository https://gitbox.apache.org/repos/asf/guacamole-client.git commit f5aa986e63d371befee8111a5d9eff1ff98af95a Merge: 82ea1d6 9c26a76 Author: Mike Jumper AuthorDate: Sun Jun 23 19:20:14 2019 -0700 GUACAMOLE-579: Merge support for retrieving user attributes CAS. .../auth/cas/AuthenticationProviderService.java| 16 +++--- .../auth/cas/CASAuthenticationProvider.java| 15 ++ .../auth/cas/ticket/TicketValidationService.java | 50 -- ...nticatedUser.java => CASAuthenticatedUser.java} | 43 +++- extensions/guacamole-auth-ldap/pom.xml | 8 --- .../auth/ldap/AuthenticationProviderService.java | 13 +++-- .../guacamole/auth/ldap/LDAPConnectionService.java | 1 - .../guacamole/auth/ldap/ReferralAuthHandler.java | 9 ++-- .../apache/guacamole/auth/ldap/TokenNameTest.java | 53 --- .../org/apache/guacamole/token}/TokenName.java | 60 ++ .../org/apache/guacamole/token/TokenNameTest.java | 55 11 files changed, 209 insertions(+), 114 deletions(-)
[guacamole-client] branch staging/1.1.0 updated (82ea1d6 -> f5aa986)
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from 82ea1d6 GUACAMOLE-354: Merge translation and definition for Swiss
German keymap option.
add 55c4144 GUACAMOLE-579: Parse tokens from attributes provided by the
CAS server.
add 8ab9e51 GUACAMOLE-579: Put back original init method for
compatibility.
add d8db630 GUACAMOLE-579: Clean up comments, implement convenience
method for tokens without a prefix, and remove unneeded classes.
add a6601a2 GUACAMOLE-579: Change fromAttribute to canonicalize
add a2b3e23 GUACAMOLE-579: Fix up documentation issues.
add 7f26ba7 GUACAMOLE-579: Insure that CAS is providing a username.
add 9c26a76 GUACAMOLE-579: Remove unnecessary JUnit dependencies.
new f5aa986 GUACAMOLE-579: Merge support for retrieving user attributes
CAS.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../auth/cas/AuthenticationProviderService.java| 16 +++---
.../auth/cas/CASAuthenticationProvider.java| 15 ++
.../auth/cas/ticket/TicketValidationService.java | 50 --
...nticatedUser.java => CASAuthenticatedUser.java} | 43 +++-
extensions/guacamole-auth-ldap/pom.xml | 8 ---
.../auth/ldap/AuthenticationProviderService.java | 13 +++--
.../guacamole/auth/ldap/LDAPConnectionService.java | 1 -
.../guacamole/auth/ldap/ReferralAuthHandler.java | 9 ++--
.../apache/guacamole/auth/ldap/TokenNameTest.java | 53 ---
.../org/apache/guacamole/token}/TokenName.java | 60 ++
.../org/apache/guacamole/token/TokenNameTest.java | 55
11 files changed, 209 insertions(+), 114 deletions(-)
rename
extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/user/{AuthenticatedUser.java
=> CASAuthenticatedUser.java} (60%)
delete mode 100644
extensions/guacamole-auth-ldap/src/test/java/org/apache/guacamole/auth/ldap/TokenNameTest.java
rename
{extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap =>
guacamole-ext/src/main/java/org/apache/guacamole/token}/TokenName.java (60%)
create mode 100644
guacamole-ext/src/test/java/org/apache/guacamole/token/TokenNameTest.java
[guacamole-client] 01/01: GUACAMOLE-723: Merge automatically close menus upon click unless explicitly marked as interactive.
This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git commit b1d3070748cbbc58bdb863e5e54cea1aa62b08df Merge: b046091 93dbf85 Author: Virtually Nick AuthorDate: Sun Jun 23 08:19:39 2019 -0400 GUACAMOLE-723: Merge automatically close menus upon click unless explicitly marked as interactive. .../main/webapp/app/client/templates/client.html | 2 +- .../webapp/app/navigation/directives/guacMenu.js | 29 ++ 2 files changed, 19 insertions(+), 12 deletions(-)
[guacamole-client] branch master updated (b046091 -> b1d3070)
This is an automated email from the ASF dual-hosted git repository. vnick pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git. from b046091 GUACAMOLE-723: Merge allow connection names to cleanly overflow in connection selection menu. add 93dbf85 GUACAMOLE-723: Automatically close menus upon click unless explicitly marked as interactive. new b1d3070 GUACAMOLE-723: Merge automatically close menus upon click unless explicitly marked as interactive. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/webapp/app/client/templates/client.html | 2 +- .../webapp/app/navigation/directives/guacMenu.js | 29 ++ 2 files changed, 19 insertions(+), 12 deletions(-)
[guacamole-client] 01/01: GUACAMOLE-723: Merge allow connection names to cleanly overflow in connection selection menu.
This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git commit b0460912b8177cf7f41ff98bf39ec8a21cc5f124 Merge: 8ec1390 47ed39f Author: Virtually Nick AuthorDate: Sun Jun 23 08:18:20 2019 -0400 GUACAMOLE-723: Merge allow connection names to cleanly overflow in connection selection menu. .../src/main/webapp/app/client/styles/connection-select-menu.css | 9 + 1 file changed, 9 insertions(+)
[guacamole-client] branch master updated (8ec1390 -> b046091)
This is an automated email from the ASF dual-hosted git repository. vnick pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git. from 8ec1390 GUACAMOLE-723: Merge allow connection name to display cleanly in menu. add 0e33525 GUACAMOLE-723: Use ellipsis for overflowing connection names within the connection selection menu. add 47ed39f GUACAMOLE-723: Prefer a wider connection selection menu, but no wider than the sidebar. new b046091 GUACAMOLE-723: Merge allow connection names to cleanly overflow in connection selection menu. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/webapp/app/client/styles/connection-select-menu.css | 9 + 1 file changed, 9 insertions(+)
