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

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

Author: anil.saldhana at jboss.com
Date: 2007-04-25 11:07:35 -0400 (Wed, 25 Apr 2007)
New Revision: 62556

Modified:
   trunk/server/src/main/org/jboss/ejb/EjbModule.java
   trunk/server/src/main/org/jboss/ejb/EjbModuleMBean.java
Log:
JBAS-4348: security deployer fixes

Modified: trunk/server/src/main/org/jboss/ejb/EjbModule.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EjbModule.java	2007-04-25 15:06:18 UTC (rev 62555)
+++ trunk/server/src/main/org/jboss/ejb/EjbModule.java	2007-04-25 15:07:35 UTC (rev 62556)
@@ -46,8 +46,7 @@
 
 import org.jboss.deployers.spi.deployer.DeploymentUnit;
 import org.jboss.deployment.DeploymentException;
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.security.JaccPolicyMBean;
+import org.jboss.deployment.DeploymentInfo; 
 import org.jboss.ejb.plugins.SecurityProxyInterceptor;
 import org.jboss.ejb.plugins.StatefulSessionInstancePool;
 import org.jboss.invocation.InvocationType;
@@ -155,10 +154,7 @@
 
    /** Whether we are call by value */
    private boolean callByValue;
-   private ApplicationMetaData appMetaData;
-   
-   /** Top level Jacc Policy per top-level deployment */
-   private JaccPolicyMBean jaccPolicy;
+   private ApplicationMetaData appMetaData; 
 
    public EjbModule(final DeploymentUnit unit, ApplicationMetaData metaData)
    {
@@ -181,6 +177,14 @@
       if (flag != null )
             callByValue = flag.booleanValue();
 
+      //Set the unauthenticated identity on the metadata if absent
+      if(metaData.getUnauthenticatedPrincipal() == null)
+      {
+         String unauthenticatedPrincipal = unit.getAttachment("EJB.uauthenticatedIdentity", String.class);
+         if(unauthenticatedPrincipal == null)
+            unauthenticatedPrincipal = unit.getAttachment("EAR.uauthenticatedIdentity", String.class);
+         metaData.setUnauthenticatedPrincipal(unauthenticatedPrincipal);
+      }
       // Add the ApplicationMetaData for the jbossws ejb21 deployer to pickup later
       if (unit.getAttachment(ApplicationMetaData.class) == null)
          unit.addAttachment(ApplicationMetaData.class, metaData);
@@ -336,18 +340,7 @@
    {
       return appMetaData.getUrl();
    }
-
-   public JaccPolicyMBean getJaccPolicy()
-   {
-      return jaccPolicy;
-   }
-   
-   public void setJaccPolicy(JaccPolicyMBean jaccPolicy)
-   {
-      this.jaccPolicy = jaccPolicy;
-   }
-   
-
+ 
    // Service implementation ----------------------------------------
 
    protected void createService() throws Exception
@@ -367,7 +360,7 @@
          if( contextID == null )
             contextID = deploymentUnit.getSimpleName(); 
          appMetaData.setJaccContextID(contextID);
-         PolicyConfiguration pc = null;
+         /*PolicyConfiguration pc = null; */
          while (beans.hasNext())
          {
             BeanMetaData bean = (BeanMetaData) beans.next();
@@ -375,17 +368,8 @@
             Container con = createContainer(bean, deploymentUnit);
             addContainer(con);
             //@todo support overriding the context id via metadata is needed
-            con.setJaccContextID(contextID);
-            // Register the permissions with the JACC layer
-            /**createPermissions(bean, pc);*/ 
-            if(jaccPolicy != null)
-              pc = jaccPolicy.createPermissions(bean, contextID, pc);
-         }
-         
-         if(pc != null && jaccPolicy != null)
-         {
-            jaccPolicy.link(pc); 
-         }
+            con.setJaccContextID(contextID); 
+         } 
 
          //only one iteration should be necessary, but we won't sweat it.
          //2 iterations are needed by cmp...jdbc/bridge/JDBCCMRFieldBridge which
@@ -512,10 +496,7 @@
       }
       ListIterator iter = containerOrdering.listIterator(containerOrdering.size());
       // Unegister the permissions with the JACC layer
-      String contextID = appMetaData.getJaccContextID();
-      PolicyConfigurationFactory pcFactory = PolicyConfigurationFactory.getPolicyConfigurationFactory();
-      PolicyConfiguration pc = pcFactory.getPolicyConfiguration(contextID, true);
-      pc.delete();
+      String contextID = appMetaData.getJaccContextID(); 
       //Unregister any xacml policies
       String securityDomain = Util.unprefixSecurityDomain(appMetaData.getSecurityDomain());
       if(securityDomain != null)

Modified: trunk/server/src/main/org/jboss/ejb/EjbModuleMBean.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EjbModuleMBean.java	2007-04-25 15:06:18 UTC (rev 62555)
+++ trunk/server/src/main/org/jboss/ejb/EjbModuleMBean.java	2007-04-25 15:07:35 UTC (rev 62556)
@@ -22,8 +22,7 @@
 package org.jboss.ejb;
 
 import javax.management.ObjectName;
-
-import org.jboss.deployment.security.JaccPolicyMBean;
+ 
 import org.jboss.tm.TransactionManagerFactory;
 
 /**
@@ -39,9 +38,7 @@
     */
   java.util.Collection getContainers() ;
 
-  void setTransactionManagerFactory(TransactionManagerFactory tmFactory);
-  void setJaccPolicy(JaccPolicyMBean jp);
-  JaccPolicyMBean getJaccPolicy();
+  void setTransactionManagerFactory(TransactionManagerFactory tmFactory); 
   public ObjectName getWebServiceName();
   public void setWebServiceName(ObjectName webServiceName);
 }