[jboss-cvs] JBoss Messaging SVN: r5946 - in trunk/tests: src/org/jboss/messaging/tests/integration/security and 1 other directory.

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

Author: jmesnil
Date: 2009-02-27 05:24:29 -0500 (Fri, 27 Feb 2009)
New Revision: 5946

Modified:
   trunk/tests/config/restricted-security-client.policy
   trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityManagerClientTestBase.java
   trunk/tests/src/org/jboss/messaging/tests/integration/security/SimpleClient.java
Log:
JBMESSAGING-806: Allow JBM client to run in a jnlp (or other) sandbox

* use a java security.policy file which allows to connect to localhost:1024-
(both JNLP and applets allows to connect to the server host)

Modified: trunk/tests/config/restricted-security-client.policy
===================================================================
--- trunk/tests/config/restricted-security-client.policy	2009-02-27 04:32:18 UTC (rev 5945)
+++ trunk/tests/config/restricted-security-client.policy	2009-02-27 10:24:29 UTC (rev 5946)
@@ -1,7 +1,6 @@
 grant {
-        // Allow everything for now
         //permission java.security.AllPermission;
-
-        permission java.lang.RuntimePermission "accessDeclaredMembers";
-        permission java.net.SocketPermission "*:1024-", "connect";
+        
+        // allow to connect to localhost
+        permission java.net.SocketPermission "localhost:1024-", "connect";
 };
\ No newline at end of file

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityManagerClientTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityManagerClientTestBase.java	2009-02-27 04:32:18 UTC (rev 5945)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityManagerClientTestBase.java	2009-02-27 10:24:29 UTC (rev 5946)
@@ -22,6 +22,8 @@
 
 package org.jboss.messaging.tests.integration.security;
 
+import java.net.URL;
+
 import org.jboss.messaging.core.config.TransportConfiguration;
 import org.jboss.messaging.core.config.impl.ConfigurationImpl;
 import org.jboss.messaging.core.logging.Logger;
@@ -54,10 +56,7 @@
       doTestProducerConsumerClient(false);
    }
 
-   // disabled tests waiting for fixes on network libraries:
-   // https://jira.jboss.org/jira/browse/NETTY-115 -> fixed in netty 3.1.0.alpha4
-   // https://issues.apache.org/jira/browse/DIRMINA-659
-   public void _testProducerConsumerClientWithSecurityManager() throws Exception
+   public void testProducerConsumerClientWithSecurityManager() throws Exception
    {
       doTestProducerConsumerClient(true);
    }
@@ -97,7 +96,8 @@
       String[] vmargs = new String[0];
       if (withSecurityManager)
       {
-         vmargs = new String[] { "-Djava.security.manager" };
+         URL securityPolicyURL = Thread.currentThread().getContextClassLoader().getResource("restricted-security-client.policy");
+         vmargs = new String[] { "-Djava.security.manager", "-Djava.security.policy=" + securityPolicyURL.getPath() };
       }
 
       // spawn a JVM that creates a client withor without a security manager which sends and receives a test message

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/security/SimpleClient.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/security/SimpleClient.java	2009-02-27 04:32:18 UTC (rev 5945)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/security/SimpleClient.java	2009-02-27 10:24:29 UTC (rev 5946)
@@ -65,6 +65,7 @@
          ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(connectorFactoryClassName));
          ClientSession session = sf.createSession(false, true, true);
          
+         session.addDestination(queueName, false, true);
          session.createQueue(queueName, queueName, null, false, false);
          ClientProducer producer = session.createProducer(queueName);
          ClientConsumer consumer = session.createConsumer(queueName);
@@ -95,6 +96,8 @@
          consumer.close();
          session.deleteQueue(queueName);         
          session.close();
+         
+         System.out.println("DONE: client exited without any issue");
       }
       catch (Throwable t)
       {