[jboss-cvs] JBossAS SVN: r62573 - trunk/aspects/src/main/org/jboss/aspects/security.

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

Author: anil.saldhana at jboss.com
Date: 2007-04-25 18:39:46 -0400 (Wed, 25 Apr 2007)
New Revision: 62573

Modified:
   trunk/aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java
   trunk/aspects/src/main/org/jboss/aspects/security/SecurityActions.java
Log:
remove subjectinfo usage

Modified: trunk/aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java	2007-04-25 22:25:38 UTC (rev 62572)
+++ trunk/aspects/src/main/org/jboss/aspects/security/AuthenticationInterceptor.java	2007-04-25 22:39:46 UTC (rev 62573)
@@ -88,7 +88,7 @@
             SecurityActions.popSubjectContext(); 
          } 
          if(authenticationManager != null)
-            SecurityActions.clearSecurityContext(authenticationManager.getSecurityDomain());
+            SecurityActions.clearSecurityContext();
      
          if (invocation.getMetaData("security", "principal") != null)
          {

Modified: trunk/aspects/src/main/org/jboss/aspects/security/SecurityActions.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aspects/security/SecurityActions.java	2007-04-25 22:25:38 UTC (rev 62572)
+++ trunk/aspects/src/main/org/jboss/aspects/security/SecurityActions.java	2007-04-25 22:39:46 UTC (rev 62573)
@@ -25,8 +25,7 @@
 import java.security.PrivilegedExceptionAction;
 import java.security.Principal;
 import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.util.HashMap;
+import java.security.PrivilegedActionException; 
 import java.lang.reflect.UndeclaredThrowableException;
 
 import javax.security.auth.Subject;
@@ -35,11 +34,10 @@
  
 import org.jboss.logging.Logger;
 import org.jboss.security.SecurityAssociation;
-import org.jboss.security.RunAsIdentity;
-import org.jboss.security.SecurityConstants;
-import org.jboss.security.SecurityContext;
-import org.jboss.security.SubjectInfo;
-import org.jboss.security.plugins.JBossSecurityContext;
+import org.jboss.security.RunAsIdentity; 
+import org.jboss.security.SecurityContext;  
+import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.security.plugins.SecurityContextFactory;
 
 /** A collection of privileged actions for this package
  * @author Scott.Stark at jboss.org
@@ -614,99 +612,67 @@
    
    
    private static class GetSecurityContextAction implements PrivilegedAction
-   { 
-      private String securityDomain;
-      GetSecurityContextAction(String sd)
-      {
-         this.securityDomain = sd;
+   {  
+      GetSecurityContextAction()
+      { 
       }
       public Object run()
-      {
-         String sc = SecurityConstants.SECURITY_CONTEXT;
-         HashMap map = (HashMap)SecurityAssociation.getContextInfo(sc);
-         if(map == null)
-         {
-            map = new HashMap();
-            SecurityAssociation.setContextInfo(sc, map);
-         }
-         SecurityAssociation.setContextInfo(sc, map);  
-         return map.get(this.securityDomain); 
+      { 
+         return SecurityContextAssociation.getSecurityContext(); 
       }
    }
    
    private static class SetSecurityContextAction implements PrivilegedAction
    { 
-      private SecurityContext securityContext;
-      private String securityDomain;
-      SetSecurityContextAction(SecurityContext sc, String sd)
+      private SecurityContext securityContext; 
+      SetSecurityContextAction(SecurityContext sc)
       {
-         this.securityContext = sc;
-         this.securityDomain = sd;
+         this.securityContext = sc; 
       }
       
       public Object run()
       {
-         String sc = SecurityConstants.SECURITY_CONTEXT;
-         HashMap map = (HashMap)SecurityAssociation.getContextInfo(sc);
-         if(map == null)
-         {
-            map = new HashMap();
-            SecurityAssociation.setContextInfo(sc, map);
-         }
-         map.put(securityDomain, securityContext); 
-         SecurityAssociation.setContextInfo(sc, map); 
+         SecurityContextAssociation.setSecurityContext(securityContext);
          return null;
       }
    }
    
    private static class ClearSecurityContextAction implements PrivilegedAction
-   { 
-      private String securityDomain;
-      ClearSecurityContextAction(String sd)
-      {
-         this.securityDomain = sd;
+   {  
+      ClearSecurityContextAction()
+      { 
       }
       public Object run()
       {
-         String sc = SecurityConstants.SECURITY_CONTEXT;
-         HashMap map = (HashMap)SecurityAssociation.getContextInfo(sc);
-         if(map == null)
-         {
-            map = new HashMap();
-            SecurityAssociation.setContextInfo(sc, map);
-         }
-         if(map.containsKey(securityDomain))
-            map.remove(securityDomain);
-         
-         SecurityAssociation.setContextInfo(sc, map);
+         SecurityContextAssociation.clearSecurityContext();
          return null;
       }
    }
 
-   static void clearSecurityContext(String securityDomain)
+   static void clearSecurityContext()
    {
-      ClearSecurityContextAction action = new ClearSecurityContextAction(securityDomain);
+      ClearSecurityContextAction action = new ClearSecurityContextAction();
       AccessController.doPrivileged(action);
    }
    
-   static SecurityContext getSecurityContext(String securityDomain)
+   static SecurityContext getSecurityContext()
    {
-      GetSecurityContextAction action = new GetSecurityContextAction(securityDomain);
+      GetSecurityContextAction action = new GetSecurityContextAction();
       return (SecurityContext)AccessController.doPrivileged(action);
    }
    
-   static void setSecurityContext(SecurityContext sc, String securityDomain)
+   static void setSecurityContext(SecurityContext sc)
    {
-      SetSecurityContextAction action = new SetSecurityContextAction(sc,securityDomain);
+      SetSecurityContextAction action = new SetSecurityContextAction(sc);
       AccessController.doPrivileged(action);
    }
    
    static void establishSecurityContext(String domain, Principal p, Object cred,
          Subject subject)
-   {
-      JBossSecurityContext jsc = new JBossSecurityContext(domain);
-      jsc.getUtil().createSubjectInfo(p, cred, subject); 
-      SecurityActions.setSecurityContext(jsc, domain);
+   { 
+      SecurityContext sc = SecurityContextFactory.createSecurityContext(p, 
+            cred, subject, domain); 
+      SecurityActions.setSecurityContext(sc);
    }
    
 }