[jboss-cvs] Picketbox SVN: r354 - in trunk: picketbox-infinispan/src/test/java/org/jboss/security/test/authentication and 1 other directories.

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

Author: sguilhen at redhat.com
Date: 2012-10-11 15:48:07 -0400 (Thu, 11 Oct 2012)
New Revision: 354

Modified:
   trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java
   trunk/picketbox-infinispan/src/test/java/org/jboss/security/test/authentication/JBossCachedAuthenticationManagerUnitTestCase.java
   trunk/security-spi/common/src/main/java/org/jboss/security/PicketBoxLogger.java
Log:
Changed JBossCachedAuthManager to use the incoming principal as cache key

Modified: trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java
===================================================================
--- trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java	2012-10-11 19:47:11 UTC (rev 353)
+++ trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java	2012-10-11 19:48:07 UTC (rev 354)
@@ -470,7 +470,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);
       PicketBoxLogger.LOGGER.traceInsertedCacheInfo(info.toString());
       return info.subject;
    }

Modified: trunk/picketbox-infinispan/src/test/java/org/jboss/security/test/authentication/JBossCachedAuthenticationManagerUnitTestCase.java
===================================================================
--- trunk/picketbox-infinispan/src/test/java/org/jboss/security/test/authentication/JBossCachedAuthenticationManagerUnitTestCase.java	2012-10-11 19:47:11 UTC (rev 353)
+++ trunk/picketbox-infinispan/src/test/java/org/jboss/security/test/authentication/JBossCachedAuthenticationManagerUnitTestCase.java	2012-10-11 19:48:07 UTC (rev 354)
@@ -21,15 +21,7 @@
  */
 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;
 import org.infinispan.eviction.EvictionStrategy;
 import org.infinispan.manager.DefaultCacheManager;
@@ -41,6 +33,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 +189,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 +200,7 @@
       Principal p3_ = new SimplePrincipal("callerStark");
       assertTrue(cm.containsKey(p2_));
       assertTrue(cm.containsKey(p3_));
+      */
    }
    
    private void establishSecurityConfiguration()

Modified: trunk/security-spi/common/src/main/java/org/jboss/security/PicketBoxLogger.java
===================================================================
--- trunk/security-spi/common/src/main/java/org/jboss/security/PicketBoxLogger.java	2012-10-11 19:47:11 UTC (rev 353)
+++ trunk/security-spi/common/src/main/java/org/jboss/security/PicketBoxLogger.java	2012-10-11 19:48:07 UTC (rev 354)
@@ -20,7 +20,7 @@
             PicketBoxLogger.class.getPackage().getName() + ".audit");
 
     @LogMessage(level = Logger.Level.TRACE)
-    @Message(id = 200, value = "Being isValid, principal: %s, cache entry: %s")
+    @Message(id = 200, value = "Begin isValid, principal: %s, cache entry: %s")
     void traceBeginIsValid(Principal principal, String cacheEntry);
 
     @LogMessage(level = Logger.Level.TRACE)
@@ -104,7 +104,7 @@
     void traceLDAPConnectionEnv(Properties env);
 
     @LogMessage(level = Logger.Level.TRACE)
-    @Message(id = 221, value = "Being getAppConfigurationEntry(%s), size: %s")
+    @Message(id = 221, value = "Begin getAppConfigurationEntry(%s), size: %s")
     void traceBeginGetAppConfigEntry(String appName, int size);
 
     @LogMessage(level = Logger.Level.TRACE)