[WFLY-5810] Move JndiPermission to its own package & cleanroom rewrite

wildfly · Mar 7, 2016 · 06d6fb8 · 06d6fb8
1 parent 0ef8325
commit 06d6fb8
Show file tree

Hide file tree

Showing 20 changed files with 1,101 additions and 779 deletions.
diff --git a/ee/src/main/java/org/jboss/as/ee/component/deployers/EEDefaultPermissionsProcessor.java b/ee/src/main/java/org/jboss/as/ee/component/deployers/EEDefaultPermissionsProcessor.java
@@ -30,7 +30,7 @@
 import java.util.Enumeration;
 import java.util.List;
 
-import org.jboss.as.naming.JndiPermission;
+import org.wildfly.naming.java.permission.JndiPermission;
 import org.jboss.as.server.deployment.Attachments;
 import org.jboss.as.server.deployment.DeploymentPhaseContext;
 import org.jboss.as.server.deployment.DeploymentUnit;
@@ -41,10 +41,6 @@
 import org.jboss.modules.security.ImmediatePermissionFactory;
 import org.jboss.modules.security.PermissionFactory;
 
-import static org.jboss.as.naming.JndiPermission.Action.LIST;
-import static org.jboss.as.naming.JndiPermission.Action.LIST_BINDINGS;
-import static org.jboss.as.naming.JndiPermission.Action.LOOKUP;
-
 /**
  * A processor which sets up the default Java EE permission set.
  *
@@ -55,17 +51,18 @@ public final class EEDefaultPermissionsProcessor implements DeploymentUnitProces
 
     static {
         final Permissions permissions = new Permissions();
-        permissions.add(new JndiPermission("java:comp", LOOKUP, LIST, LIST_BINDINGS));
+        final int actionBits = JndiPermission.ACTION_LOOKUP | JndiPermission.ACTION_LIST | JndiPermission.ACTION_LIST_BINDINGS;
-        permissions.add(new JndiPermission("java:comp/-", LOOKUP, LIST, LIST_BINDINGS));
+        permissions.add(new JndiPermission("java:comp", actionBits));
-        permissions.add(new JndiPermission("java:module", LOOKUP, LIST, LIST_BINDINGS));
+        permissions.add(new JndiPermission("java:comp/-", actionBits));
-        permissions.add(new JndiPermission("java:module/-", LOOKUP, LIST, LIST_BINDINGS));
+        permissions.add(new JndiPermission("java:module", actionBits));
-        permissions.add(new JndiPermission("java:app", LOOKUP, LIST, LIST_BINDINGS));
+        permissions.add(new JndiPermission("java:module/-", actionBits));
-        permissions.add(new JndiPermission("java:app/-", LOOKUP, LIST, LIST_BINDINGS));
+        permissions.add(new JndiPermission("java:app", actionBits));
-        permissions.add(new JndiPermission("java:global", LOOKUP));
+        permissions.add(new JndiPermission("java:app/-", actionBits));
-        permissions.add(new JndiPermission("java:global/-", LOOKUP));
+        permissions.add(new JndiPermission("java:global", JndiPermission.ACTION_LOOKUP));
-        permissions.add(new JndiPermission("java:jboss", LOOKUP));
+        permissions.add(new JndiPermission("java:global/-", JndiPermission.ACTION_LOOKUP));
-        permissions.add(new JndiPermission("java:jboss/-", LOOKUP));
+        permissions.add(new JndiPermission("java:jboss", JndiPermission.ACTION_LOOKUP));
-        permissions.add(new JndiPermission("java:/-", LOOKUP));
+        permissions.add(new JndiPermission("java:jboss/-", JndiPermission.ACTION_LOOKUP));
+        permissions.add(new JndiPermission("java:/-", JndiPermission.ACTION_LOOKUP));
         DEFAULT_PERMISSIONS = permissions;
     }
 

diff --git a/ee/src/main/java/org/jboss/as/ee/managedbean/processors/JavaEEDependencyProcessor.java b/ee/src/main/java/org/jboss/as/ee/managedbean/processors/JavaEEDependencyProcessor.java
@@ -87,6 +87,8 @@ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitPro
         ee.addImportFilter(PathFilters.acceptAll(), false);
         moduleSpecification.addSystemDependency(ee);
 
+        // add dep for naming permission
+        moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.wildfly.naming"), false, false, false, false));
 
         //we always add all Java EE API modules, as the platform spec requires them to always be available
         //we do not just add the javaee.api module, as this breaks excludes