Merge pull request #11125 from soul2zimate/WFLY-10187

[WFLY-10187] add missing permissions for DatabaseTimerServiceMultiNodeTestCase and RemoteLocalCallTestCase
wildfly · Apr 18, 2018 · 07597ee · 07597ee
2 parents 1834edb + 4e59dbc
commit 07597ee
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/...org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceMultiNodeTestCase.java b/...org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceMultiNodeTestCase.java
@@ -45,7 +45,10 @@
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
+
+import java.net.SocketPermission;
 import java.net.URI;
+import java.security.SecurityPermission;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
@@ -59,6 +62,7 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ROLLBACK_ON_RUNTIME_FAILURE;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;
+import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
 
 /**
  * Tests that timers are never doubled up
@@ -180,6 +184,11 @@ private static Archive<?> createDeployment(boolean client) {
         war.addAsResource(new StringAsset(client ? "client" : "server"), "node.txt");
         if (client) {
             war.addAsManifestResource(DatabaseTimerServiceMultiNodeExecutionDisabledTestCase.class.getPackage(), "jboss-ejb-client.xml", "jboss-ejb-client.xml");
+            war.addAsManifestResource(
+                    createPermissionsXmlAsset(
+                            new SocketPermission("*:9092", "connect,resolve"),
+                            new SecurityPermission("putProviderProperty.WildFlyElytron")),
+                    "permissions.xml");
         }
         return war;
     }

diff --git a/...ltinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallTestCase.java b/...ltinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallTestCase.java
@@ -22,6 +22,10 @@
 
 package org.jboss.as.test.multinode.remotecall;
 
+import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+
+import java.security.SecurityPermission;
+
 import javax.ejb.EJBException;
 import javax.naming.InitialContext;
 
@@ -68,6 +72,10 @@ public static Archive<?> deployment1() {
         JavaArchive jar = createJar(ARCHIVE_NAME_CLIENT);
         jar.addClasses(RemoteLocalCallTestCase.class);
         jar.addAsManifestResource("META-INF/jboss-ejb-client-receivers.xml", "jboss-ejb-client.xml");
+        jar.addAsManifestResource(
+                createPermissionsXmlAsset(
+                        new SecurityPermission("putProviderProperty.WildFlyElytron")),
+                "permissions.xml");
         return jar;
     }