[jboss-cvs] Picketbox SVN: r351 - in branches/4.0.9.Final-JBPAPP-10088/picketbox-infinispan/src: test/java/org/jboss/security/test/authentication and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: dehort
Date: 2012-10-02 14:41:52 -0400 (Tue, 02 Oct 2012)
New Revision: 351

Modified:
   branches/4.0.9.Final-JBPAPP-10088/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java
   branches/4.0.9.Final-JBPAPP-10088/picketbox-infinispan/src/test/java/org/jboss/security/test/authentication/JBossCachedAuthenticationManagerUnitTestCase.java
Log:
Checking in a patch for an issue where the jaas cache was using the CallerPrincipal for the cache key
[JBPAPP-10088]


Modified: branches/4.0.9.Final-JBPAPP-10088/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java
===================================================================
--- branches/4.0.9.Final-JBPAPP-10088/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java	2012-10-02 18:35:01 UTC (rev 350)
+++ branches/4.0.9.Final-JBPAPP-10088/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java	2012-10-02 18:41:52 UTC (rev 351)
@@ -516,7 +516,7 @@
 
       // If the user already exists another login is active. Currently
       // only one is allowed so remove the old and insert the new
-      domainCache.put(info.callerPrincipal, info);
+      domainCache.put(principal, info);
       if (trace)
          log.trace("Inserted cache info: " + info);
       return info.subject;
@@ -557,4 +557,4 @@
          }
       }
    }
-}
\ No newline at end of file
+}

Modified: branches/4.0.9.Final-JBPAPP-10088/picketbox-infinispan/src/test/java/org/jboss/security/test/authentication/JBossCachedAuthenticationManagerUnitTestCase.java
===================================================================
--- branches/4.0.9.Final-JBPAPP-10088/picketbox-infinispan/src/test/java/org/jboss/security/test/authentication/JBossCachedAuthenticationManagerUnitTestCase.java	2012-10-02 18:35:01 UTC (rev 350)
+++ branches/4.0.9.Final-JBPAPP-10088/picketbox-infinispan/src/test/java/org/jboss/security/test/authentication/JBossCachedAuthenticationManagerUnitTestCase.java	2012-10-02 18:41:52 UTC (rev 351)
@@ -21,13 +21,6 @@
  */
 package org.jboss.security.test.authentication;
 
-import java.security.Principal;
-import java.util.HashMap;
-
-import javax.security.auth.login.AppConfigurationEntry;
-import javax.security.auth.login.Configuration;
-import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
-
 import junit.framework.TestCase;
 
 import org.infinispan.Cache;
@@ -41,6 +34,12 @@
 import org.jboss.security.authentication.JBossCachedAuthenticationManager;
 import org.jboss.security.authentication.JBossCachedAuthenticationManager.DomainInfo;
 
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
+import javax.security.auth.login.Configuration;
+import java.security.Principal;
+import java.util.HashMap;
+
 /**
  *  Unit tests for the JBossCachedAuthenticationManager.
  *  
@@ -191,8 +190,9 @@
       assertTrue(cm.containsKey(p));
       Principal p2 = new SimplePrincipal("scott");
       assertTrue(am.isValid(p2, "echoman"));
-      assertTrue(cm.containsKey(p));
+      assertTrue(cm.containsKey(p2));
       // we store the caller principal in the cache
+      /*
       Principal p2_ = new SimplePrincipal("callerScott");
       assertTrue(cm.containsKey(p2_));
       Principal p3 = new SimplePrincipal("stark");
@@ -201,6 +201,7 @@
       Principal p3_ = new SimplePrincipal("callerStark");
       assertTrue(cm.containsKey(p2_));
       assertTrue(cm.containsKey(p3_));
+      */
    }
    
    private void establishSecurityConfiguration()