[jboss-cvs] Picketbox SVN: r520 - trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication.

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

Author: dehort
Date: 2014-03-06 17:43:38 -0500 (Thu, 06 Mar 2014)
New Revision: 520

Modified:
   trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java
Log:
Fixed an issue where the SecureIdentityLoginModule results were not cached by the JAAS cache
[SECURITY-803]


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	2014-03-06 21:31:06 UTC (rev 519)
+++ trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java	2014-03-06 22:43:38 UTC (rev 520)
@@ -133,7 +133,7 @@
    public boolean isValid(Principal principal, Object credential, Subject activeSubject)
    {
       // first check cache
-      DomainInfo cachedEntry = getCacheInfo(principal);
+      DomainInfo cachedEntry = getCacheInfo(principal != null ? principal : new org.jboss.security.SimplePrincipal("null"));
       PicketBoxLogger.LOGGER.traceBeginIsValid(principal, cachedEntry != null ? cachedEntry.toString() : null);
 
       boolean isValid = false;
@@ -423,7 +423,7 @@
    private Subject updateCache(LoginContext loginContext, Subject subject, Principal principal, Object credential)
    {
       // If we don't have a cache there is nothing to update
-      if (domainCache == null || principal == null)
+      if (domainCache == null)
          return subject;
 
       DomainInfo info = new DomainInfo();
@@ -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(principal, info);
+      domainCache.put(principal != null ? principal : new org.jboss.security.SimplePrincipal("null"), info);
       PicketBoxLogger.LOGGER.traceInsertedCacheInfo(info.toString());
       return info.subject;
    }
@@ -507,4 +507,4 @@
          }
       }
    }
-}
\ No newline at end of file
+}