[jboss-cvs] JBossAS SVN: r62552 - trunk/server/src/main/org/jboss/web/deployers.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 25 11:03:36 EDT 2007
Author: anil.saldhana at jboss.com
Date: 2007-04-25 11:03:36 -0400 (Wed, 25 Apr 2007)
New Revision: 62552
Modified:
trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
trunk/server/src/main/org/jboss/web/deployers/WebModule.java
trunk/server/src/main/org/jboss/web/deployers/WebModuleMBean.java
Log:
JBAS-4348: security deployer fixes
Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java 2007-04-25 15:02:09 UTC (rev 62551)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java 2007-04-25 15:03:36 UTC (rev 62552)
@@ -33,18 +33,16 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-
+
import org.jboss.deployers.plugins.deployers.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.deployers.spi.deployment.MainDeployer;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.deployment.security.JaccPolicyUtil;
+import org.jboss.deployers.spi.structure.DeploymentContext;
import org.jboss.metadata.WebMetaData;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.system.metadata.ServiceAttributeMetaData;
+import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.system.metadata.ServiceConstructorMetaData;
-import org.jboss.system.metadata.ServiceDependencyMetaData;
+import org.jboss.system.metadata.ServiceDependencyMetaData;
import org.jboss.system.metadata.ServiceMetaData;
import org.jboss.system.server.ServerConfig;
import org.jboss.system.server.ServerConfigLocator;
@@ -617,13 +615,7 @@
ServiceDependencyMetaData sdmd = new ServiceDependencyMetaData();
sdmd.setIDependOn(iDependOn);
}
- webModule.setDependencies(dependencies);
-
- //Add a dependence on the JaccPolicy
- //TODO: Do it only if the war is security enabled
- List<ServiceAttributeMetaData> attrs = new ArrayList<ServiceAttributeMetaData>();
- JaccPolicyUtil.getServiceAttributeMetaData(unit, attrs);
- webModule.setAttributes(attrs);
+ webModule.setDependencies(dependencies);
// TODO could create multiple components for the deployment
// The ServiceConstructorMetaData is not serializable due to its args
Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java 2007-04-25 15:02:09 UTC (rev 62551)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java 2007-04-25 15:03:36 UTC (rev 62552)
@@ -24,8 +24,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.security.Policy;
-import java.util.ArrayList;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
@@ -37,12 +36,9 @@
import javax.naming.InitialContext;
import javax.naming.LinkRef;
import javax.naming.NamingException;
-import javax.security.jacc.PolicyConfiguration;
-import javax.security.jacc.PolicyConfigurationFactory;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.deployers.spi.deployment.MainDeployer;
-import org.jboss.deployment.security.JaccPolicyMBean;
import org.jboss.ejb.EjbUtil50;
import org.jboss.logging.Logger;
import org.jboss.metadata.EjbLocalRefMetaData;
@@ -117,9 +113,7 @@
/**
* The default security-domain name to use
*/
- protected String defaultSecurityDomain;
-
- protected JaccPolicyMBean jaccPolicy;
+ protected String defaultSecurityDomain;
public AbstractWarDeployment()
{
@@ -263,19 +257,8 @@
public void setDefaultSecurityDomain(String defaultSecurityDomain)
{
this.defaultSecurityDomain = defaultSecurityDomain;
- }
+ }
-
- public JaccPolicyMBean getJaccPolicy()
- {
- return jaccPolicy;
- }
-
- public void setJaccPolicy(JaccPolicyMBean jaccPolicy)
- {
- this.jaccPolicy = jaccPolicy;
- }
-
/**
* A template pattern implementation of the deploy() method. This method
* calls the {@link #performDeploy(WebApplication, String,
@@ -342,25 +325,8 @@
String contextID = metaData.getJaccContextID();
if( contextID == null )
contextID = unit.getSimpleName();
- metaData.setJaccContextID(contextID);
-
- //Link it to the top-level deployment parent policy configuration
- if(log.isTraceEnabled())
- log.trace("Jacc Policy injected="+jaccPolicy != null);
- PolicyConfiguration pc = null;
- if(jaccPolicy != null)
- {
- if(log.isTraceEnabled())
- log.trace("Jacc Policy linking to top-level policyConfiguration");
- pc = jaccPolicy.createPermissions(metaData, contextID, pc);
- jaccPolicy.link(pc);
- // Commit the policy configuration
- pc.commit();
- }
+ metaData.setJaccContextID(contextID);
- // Allow the policy to incorporate the policy configs
- Policy.getPolicy().refresh();
-
webApp = new WebApplication(metaData);
webApp.setClassLoader(warLoader);
webApp.setDeploymentUnit(unit);
@@ -387,10 +353,7 @@
performUndeploy(webApp, warUrl);
// Unregister the permissions with the JACC layer
WebMetaData metaData = webApp.getMetaData();
- String contextID = metaData.getJaccContextID();
- PolicyConfigurationFactory pcFactory = PolicyConfigurationFactory.getPolicyConfigurationFactory();
- PolicyConfiguration pc = pcFactory.getPolicyConfiguration(contextID, true);
- pc.delete();
+ String contextID = metaData.getJaccContextID();
//Unregister any xacml policies
String prefixedSecurityDomain = webApp.getMetaData().getSecurityDomain();
if(prefixedSecurityDomain != null)
Modified: trunk/server/src/main/org/jboss/web/deployers/WebModule.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/WebModule.java 2007-04-25 15:02:09 UTC (rev 62551)
+++ trunk/server/src/main/org/jboss/web/deployers/WebModule.java 2007-04-25 15:03:36 UTC (rev 62552)
@@ -22,8 +22,7 @@
package org.jboss.web.deployers;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.deployment.DeploymentException;
-import org.jboss.deployment.security.JaccPolicyMBean;
+import org.jboss.deployment.DeploymentException;
import org.jboss.logging.Logger;
import org.jboss.metadata.WebMetaData;
import org.jboss.web.WebApplication;
@@ -48,10 +47,7 @@
private static Logger log = Logger.getLogger(WebModule.class);
private DeploymentUnit di;
private AbstractWarDeployer container;
- private AbstractWarDeployment deployment;
-
- /** Jacc Policy for top-level deployment */
- private JaccPolicyMBean jaccPolicy;
+ private AbstractWarDeployment deployment;
public WebModule(DeploymentUnit di, AbstractWarDeployer container,
AbstractWarDeployment deployment)
@@ -59,18 +55,8 @@
this.di = di;
this.container = container;
this.deployment = deployment;
- }
+ }
- public JaccPolicyMBean getJaccPolicy()
- {
- return jaccPolicy;
- }
-
- public void setJaccPolicy(JaccPolicyMBean jaccPolicy)
- {
- this.jaccPolicy = jaccPolicy;
- }
-
public void create()
{
@@ -98,9 +84,7 @@
throws Exception
{
// Get the war URL
- WebMetaData metaData = di.getAttachment(WebMetaData.class);
- //Add the jacc policy
- deployment.setJaccPolicy(jaccPolicy);
+ WebMetaData metaData = di.getAttachment(WebMetaData.class);
WebApplication webApp = deployment.start(di, metaData);
String warURL = di.getName();
container.addDeployedApp(warURL, webApp);
Modified: trunk/server/src/main/org/jboss/web/deployers/WebModuleMBean.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/WebModuleMBean.java 2007-04-25 15:02:09 UTC (rev 62551)
+++ trunk/server/src/main/org/jboss/web/deployers/WebModuleMBean.java 2007-04-25 15:03:36 UTC (rev 62552)
@@ -20,8 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.web.deployers;
-
-import org.jboss.deployment.security.JaccPolicyMBean;
+
/** The standard mbean service interface for the WebModule
* @author Scott.Stark at jboss.org
@@ -32,9 +31,5 @@
public void create() throws Exception;
public void start() throws Exception;
public void stop() throws Exception;
- public void destroy() throws Exception;
-
- /** For top-level jacc policy */
- public JaccPolicyMBean getJaccPolicy();
- public void setJaccPolicy(JaccPolicyMBean jp);
+ public void destroy() throws Exception;
}
More information about the jboss-cvs-commits
mailing list