[jboss-cvs] Picketbox SVN: r341 - in trunk/security-spi: spi/src/main/java/org/jboss/security and 1 other directory.

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

Author: sguilhen at redhat.com
Date: 2012-08-13 17:49:29 -0400 (Mon, 13 Aug 2012)
New Revision: 341

Modified:
   trunk/security-spi/common/src/main/java/org/jboss/security/PicketBoxLogger.java
   trunk/security-spi/spi/src/main/java/org/jboss/security/SecurityContextUtil.java
   trunk/security-spi/spi/src/main/java/org/jboss/security/SubjectInfo.java
Log:
SECURITY-687: use the SubjectInfo API to remove the identities.

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-08-11 00:57:27 UTC (rev 340)
+++ trunk/security-spi/common/src/main/java/org/jboss/security/PicketBoxLogger.java	2012-08-13 21:49:29 UTC (rev 341)
@@ -1,25 +1,15 @@
 package org.jboss.security;
 
+import org.jboss.logging.*;
+
+import javax.security.auth.Subject;
 import java.net.URL;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Principal;
-import java.security.ProtectionDomain;
+import java.security.*;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import javax.security.auth.Subject;
-
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Logger;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
-
 @MessageLogger(projectCode = "PBOX")
 public interface PicketBoxLogger extends BasicLogger {
 
@@ -54,7 +44,7 @@
     void traceEndValidteCache(boolean isValid);
 
     @LogMessage(level = Logger.Level.ERROR)
-    @Message(id = 206, value = "Loggin failure")
+    @Message(id = 206, value = "Login failure")
     void errorDuringLogin(@Cause Throwable t);
 
     @LogMessage(level = Logger.Level.TRACE)

Modified: trunk/security-spi/spi/src/main/java/org/jboss/security/SecurityContextUtil.java
===================================================================
--- trunk/security-spi/spi/src/main/java/org/jboss/security/SecurityContextUtil.java	2012-08-11 00:57:27 UTC (rev 340)
+++ trunk/security-spi/spi/src/main/java/org/jboss/security/SecurityContextUtil.java	2012-08-13 21:49:29 UTC (rev 341)
@@ -21,17 +21,16 @@
   */
 package org.jboss.security;
 
+import org.jboss.security.identity.Identity;
+import org.jboss.security.identity.RoleGroup;
+
+import javax.security.auth.Subject;
 import java.security.Principal;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import javax.security.auth.Subject;
 
-import org.jboss.security.identity.Identity;
-import org.jboss.security.identity.RoleGroup;
-
-
 /**
  *  General Utility methods for dealing with the SecurityContext
  *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
@@ -135,8 +134,6 @@
     */
    public void clearIdentities(Class<?> clazz)
    {
-      Set<Identity> resultSet = new HashSet<Identity>();
-      
       Set<Identity> ids  = this.securityContext.getSubjectInfo().getIdentities();
       if(ids != null)
       {
@@ -145,10 +142,9 @@
          {
             Identity id = iter.next();
             if(clazz.isAssignableFrom(id.getClass()))
-               resultSet.add(id);
+               this.securityContext.getSubjectInfo().removeIdentity(id);
          }
-         ids.removeAll(resultSet);
-      }  
+      }
    }
    
    /**

Modified: trunk/security-spi/spi/src/main/java/org/jboss/security/SubjectInfo.java
===================================================================
--- trunk/security-spi/spi/src/main/java/org/jboss/security/SubjectInfo.java	2012-08-11 00:57:27 UTC (rev 340)
+++ trunk/security-spi/spi/src/main/java/org/jboss/security/SubjectInfo.java	2012-08-13 21:49:29 UTC (rev 341)
@@ -21,20 +21,19 @@
   */
 package org.jboss.security;
 
+import org.jboss.security.identity.Identity;
+import org.jboss.security.identity.IdentityFactory;
+import org.jboss.security.identity.RoleGroup;
+import org.jboss.security.identity.extensions.CredentialIdentityFactory;
+
+import javax.security.auth.Subject;
 import java.io.Serializable;
 import java.security.Principal;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.security.auth.Subject;
 
-import org.jboss.security.identity.Identity;
-import org.jboss.security.identity.IdentityFactory;
-import org.jboss.security.identity.RoleGroup;
-import org.jboss.security.identity.extensions.CredentialIdentityFactory;
-
-
 /**
  *  Holds information - principal, credential and subject
  *  This class is handled by the Util class associated with the security context
@@ -126,7 +125,7 @@
    {
       return Collections.unmodifiableSet(identities);
    }
-   
+
    public synchronized void setIdentities(Set<Identity> ids)
    {
       if(identities == null)