[jboss-cvs] JBossAS SVN: r62677 - trunk/server/src/main/org/jboss/ejb/plugins/local.

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

Author: anil.saldhana at jboss.com
Date: 2007-05-01 00:21:50 -0400 (Tue, 01 May 2007)
New Revision: 62677

Modified:
   trunk/server/src/main/org/jboss/ejb/plugins/local/BaseLocalProxyFactory.java
Log:
JBAS-4317: move the security context establishment to a separate interceptor

Modified: trunk/server/src/main/org/jboss/ejb/plugins/local/BaseLocalProxyFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/local/BaseLocalProxyFactory.java	2007-05-01 04:20:56 UTC (rev 62676)
+++ trunk/server/src/main/org/jboss/ejb/plugins/local/BaseLocalProxyFactory.java	2007-05-01 04:21:50 UTC (rev 62677)
@@ -43,8 +43,7 @@
 import javax.ejb.TransactionRequiredLocalException;
 import javax.ejb.TransactionRolledbackLocalException;
 import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.security.auth.Subject;
+import javax.naming.InitialContext; 
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 import javax.transaction.TransactionRequiredException;
@@ -58,11 +57,8 @@
 import org.jboss.invocation.LocalEJBInvocation;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.BeanMetaData;
-import org.jboss.naming.Util; 
-import org.jboss.security.RunAs; 
-import org.jboss.security.SecurityContext; 
-import org.jboss.security.SecurityContextUtil;
-import org.jboss.security.SecurityIdentity;
+import org.jboss.naming.Util;   
+import org.jboss.security.SecurityContext;  
 import org.jboss.security.plugins.SecurityContextAssociation; 
 import org.jboss.util.NestedRuntimeException;
 import org.jboss.tm.TransactionLocal; 
@@ -351,10 +347,7 @@
       }
       container.pushENC();
 
-      SecurityActions sa = SecurityActions.UTIL.getSecurityActions(); 
-      //Cache the security identity
-      SecurityContext sc = sa.getSecurityContext();
-      SecurityIdentity sidentity = sc.getUtil().getSecurityIdentity(); 
+      SecurityActions sa = SecurityActions.UTIL.getSecurityActions();   
       
       try
       {
@@ -364,8 +357,7 @@
             getTransaction(),
             sa.getPrincipal(),
             sa.getCredential());
-         invocation.setType(InvocationType.LOCALHOME); 
-         invocation.setSecurityContext(sc); 
+         invocation.setType(InvocationType.LOCALHOME);  
  
          return container.invoke(invocation);
       }
@@ -391,9 +383,7 @@
          if(setCl)
          {
             TCLAction.UTIL.setContextClassLoader(oldCl);
-         } 
-         //Restore the previous security identity 
-         sc.getUtil().setSecurityIdentity(sidentity); 
+         }  
       }
    }
 
@@ -432,12 +422,6 @@
       container.pushENC();
 
       SecurityActions sa = SecurityActions.UTIL.getSecurityActions();  
-      SecurityContext sc = sa.getSecurityContext();  
-      
-      //Cache the subject
-      Subject subj = sc.getUtil().getSubject();
-      RunAs ra = sc.getRunAs();
-      RunAs callerRunAs = sc.getUtil().getCallerRunAs();
       try
       {
          LocalEJBInvocation invocation = new LocalEJBInvocation(id,
@@ -447,7 +431,6 @@
             sa.getPrincipal(),
             sa.getCredential());
          invocation.setType(InvocationType.LOCAL);  
-         invocation.setSecurityContext(sa.getSecurityContext());
          
          return container.invoke(invocation);
       }
@@ -473,12 +456,7 @@
          if(setCl)
          {
             TCLAction.UTIL.setContextClassLoader(oldCl);
-         } 
-         //Restore the previous subject and runas
-         SecurityContextUtil util = sc.getUtil(); 
-         util.createSubjectInfo(util.getUserPrincipal(), util.getCredential(), subj);
-         sc.setRunAs(ra);
-         sc.getUtil().setCallerRunAs(callerRunAs);
+         }  
       }
    }