[guacamole-client] branch master updated (30f6ac4 -> 00f5942)

[mj...@apache.org]

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.

[mj...@apache.org]

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 <mj...@apache.org>
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<String, String> 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<String, Object> ticketAttrs =
+                     new HashMap<>(principal.getAttributes());
  
              // Retrieve username and set the credentials.
              String username = principal.getName();