From 7302ca6a99f242935edab5853f50f639af647c2b Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 22 Apr 2012 23:29:38 -0400 Subject: [PATCH] CASC-175 ensure state can be shared --- .../main/java/org/jasig/cas/client/jaas/CasLoginModule.java | 3 ++- .../proxy/AbstractEncryptedProxyGrantingTicketStorageImpl.java | 1 - .../main/java/org/jasig/cas/client/util/AbstractCasFilter.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java index 1e1b219..58a3e0e 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/jaas/CasLoginModule.java @@ -209,6 +209,7 @@ public class CasLoginModule implements LoginModule { this.assertion = null; this.callbackHandler = handler; this.subject = subject; + this.sharedState = (Map) state; this.sharedState = new HashMap(state); String ticketValidatorClass = null; @@ -412,7 +413,7 @@ public class CasLoginModule implements LoginModule { this.subject.getPrincipals().add(roleGroup); // Place principal name in shared state for downstream JAAS modules (module chaining use case) - this.sharedState.put(LOGIN_NAME, new Object()); // casPrincipal.getName()); + this.sharedState.put(LOGIN_NAME, assertion.getPrincipal().getName()); if (log.isDebugEnabled()) { if (log.isDebugEnabled()) { diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/AbstractEncryptedProxyGrantingTicketStorageImpl.java b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/AbstractEncryptedProxyGrantingTicketStorageImpl.java index b9c3e4d..7842ac3 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/proxy/AbstractEncryptedProxyGrantingTicketStorageImpl.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/proxy/AbstractEncryptedProxyGrantingTicketStorageImpl.java @@ -2,7 +2,6 @@ package org.jasig.cas.client.proxy; import javax.crypto.Cipher; import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.DESKeySpec; import javax.crypto.spec.DESedeKeySpec; import java.security.InvalidKeyException; import java.security.Key; diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractCasFilter.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractCasFilter.java index ed479b8..79c94b3 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractCasFilter.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/AbstractCasFilter.java @@ -26,7 +26,6 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; /** * Abstract filter that contains code that is common to all CAS filters.