[guacamole-client] 01/01: Merge 1.1.0 changes back to master.

[mjumper]

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 <mjum...@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();