QPID-70 InVM Authentication QPID-419 Access Control QPID-423 Authentication per virtualhost

Restructured auth package.
Enabled InVM Authentication
Initial changes to allow authenticators per virtualhost.
Initial access control classes.
Initial work to allow access control testing through inVM broker.



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@518988 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 30 insertions, 32 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/client/DispatcherTest.java b/java/client/src/test/java/org/apache/qpid/client/DispatcherTest.java
index cf26a54f1b..1d85ea47fd 100644
--- a/java/client/src/test/java/org/apache/qpid/client/DispatcherTest.java
+++ b/java/client/src/test/java/org/apache/qpid/client/DispatcherTest.java
@@ -82,7 +82,7 @@ public class DispatcherTest extends TestCase
 
         Hashtable<String, String> env = new Hashtable<String, String>();
 
-        env.put("connectionfactory.connection", "amqp://client:client@MLT_ID/test?brokerlist='vm://:1'");
+        env.put("connectionfactory.connection", "amqp://guest:guest@MLT_ID/test?brokerlist='vm://:1'");
         env.put("queue.queue", "MessageListenerTest");
 
         _context = factory.getInitialContext(env);
diff --git a/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java b/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
index 6062528d43..a406f9f86e 100644
--- a/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
+++ b/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
@@ -74,7 +74,7 @@ public class MessageListenerMultiConsumerTest extends TestCase
 
         Hashtable<String, String> env = new Hashtable<String, String>();
 
-        env.put("connectionfactory.connection", "amqp://client:client@MLT_ID/test?brokerlist='vm://:1'");
+        env.put("connectionfactory.connection", "amqp://guest:guest@MLT_ID/test?brokerlist='vm://:1'");
         env.put("queue.queue", "direct://amq.direct//MessageListenerTest");
 
         _context = factory.getInitialContext(env);
diff --git a/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java b/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java
index dc01005247..5fb77af4db 100644
--- a/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java
+++ b/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java
@@ -73,7 +73,7 @@ public class MessageListenerTest extends TestCase implements MessageListener
 
         Hashtable<String, String> env = new Hashtable<String, String>();
 
-        env.put("connectionfactory.connection", "amqp://client:client@MLT_ID/test?brokerlist='vm://:1'");
+        env.put("connectionfactory.connection", "amqp://guest:guest@MLT_ID/test?brokerlist='vm://:1'");
         env.put("queue.queue", "MessageListenerTest");
 
         _context = factory.getInitialContext(env);
diff --git a/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java b/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
index 08501c9554..10bf1a8d6d 100644
--- a/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
+++ b/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
@@ -82,7 +82,7 @@ public class ResetMessageListenerTest extends TestCase
 
         Hashtable<String, String> env = new Hashtable<String, String>();
 
-        env.put("connectionfactory.connection", "amqp://client:client@MLT_ID/test?brokerlist='vm://:1'");
+        env.put("connectionfactory.connection", "amqp://guest:guest@MLT_ID/test?brokerlist='vm://:1'");
         env.put("queue.queue", "direct://amq.direct//MessageListenerTest");
 
         _context = factory.getInitialContext(env);
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
index d9ce080e14..ab0d26b0e0 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
@@ -73,7 +73,7 @@ public class ConnectionTest extends TestCase
     {
         try
         {
-            AMQConnection conn = new AMQConnection("amqp://guest:guestd@clientid/test?brokerlist='"
+            AMQConnection conn = new AMQConnection("amqp://guest:guest@clientid/test?brokerlist='"
                                                    + _broker
                                                    + "?retries='1''&defaultQueueExchange='test.direct'"
                                                    + "&defaultTopicExchange='test.topic'"
@@ -115,13 +115,12 @@ public class ConnectionTest extends TestCase
         }
     }
 
-
-    // FIXME The inVM broker currently has no authentication .. Needs added QPID-70
-    public void passwordFailureConnection() throws Exception
+     //fixme AMQAuthenticationException is not propogaged
+    public void PasswordFailureConnection() throws Exception
     {
         try
         {
-            new AMQConnection("amqp://guest:rubbishpassword@clientid/testpath?brokerlist='" + _broker + "?retries='1''");
+            new AMQConnection("amqp://guest:rubbishpassword@clientid/test?brokerlist='" + _broker + "?retries='1''");
             fail("Connection should not be established password is wrong.");
         }
         catch (AMQException amqe)
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
index 5cee306846..117696196e 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
@@ -41,10 +41,8 @@ import uk.co.thebadgerset.junit.concurrency.ThreadTestCoordinator;
  * Running in AUTO_ACK mode, the close call ought to wait until the onMessage method completes, and the ack is sent

  * before closing the connection.

  *

- * <p><table id="crc"><caption>CRC Card</caption>

- * <tr><th> Responsibilities <th> Collaborations

- * <tr><td> Check that closing a connection whilst handling a message, blocks till completion of the handler.

- * </table>

+ * <p><table id="crc"><caption>CRC Card</caption> <tr><th> Responsibilities <th> Collaborations <tr><td> Check that

+ * closing a connection whilst handling a message, blocks till completion of the handler. </table>

  */

 public class CloseBeforeAckTest extends TestCase

 {

@@ -53,6 +51,7 @@ public class CloseBeforeAckTest extends TestCase
     Connection connection;

     Session session;

     public static final String TEST_QUEUE_NAME = "TestQueue";

+    private int TEST_COUNT = 25;

 

     class TestThread1 extends TestRunnable implements MessageListener

     {

@@ -65,34 +64,34 @@ public class CloseBeforeAckTest extends TestCase
         public void onMessage(Message message)

         {

             // Give thread 2 permission to close the session.

-            allow(new int[] { 1 });

+            allow(new int[]{1});

 

             // Wait until thread 2 has closed the connection, or is blocked waiting for this to complete.

-            waitFor(new int[] { 1 }, true);

+            waitFor(new int[]{1}, true);

         }

     }

 

     TestThread1 testThread1 = new TestThread1();

 

     TestRunnable testThread2 =

-        new TestRunnable()

-        {

-            public void runWithExceptions() throws Exception

+            new TestRunnable()

             {

-                // Send a message to be picked up by thread 1.

-                session.createProducer(null).send(session.createQueue(TEST_QUEUE_NAME),

-                                                  session.createTextMessage("Hi there thread 1!"));

+                public void runWithExceptions() throws Exception

+                {

+                    // Send a message to be picked up by thread 1.

+                    session.createProducer(null).send(session.createQueue(TEST_QUEUE_NAME),

+                                                      session.createTextMessage("Hi there thread 1!"));

 

-                // Wait for thread 1 to pick up the message and give permission to continue.

-                waitFor(new int[] { 0 }, false);

+                    // Wait for thread 1 to pick up the message and give permission to continue.

+                    waitFor(new int[]{0}, false);

 

-                // Close the connection.

-                session.close();

+                    // Close the connection.

+                    session.close();

 

-                // Allow thread 1 to continue to completion, if it is erronously still waiting.

-                allow(new int[] { 1 });

-            }

-        };

+                    // Allow thread 1 to continue to completion, if it is erronously still waiting.

+                    allow(new int[]{1});

+                }

+            };

 

     public void testCloseBeforeAutoAck_QPID_397() throws Exception

     {

@@ -123,9 +122,9 @@ public class CloseBeforeAckTest extends TestCase
         Assert.assertTrue(errorMessage, "".equals(errorMessage));

     }

 

-    public void testCloseBeforeAutoAckManyTimes() throws Exception

+    public void closeBeforeAutoAckManyTimes() throws Exception

     {

-        for (int i = 0; i < 500; i++)

+        for (int i = 0; i < TEST_COUNT; i++)

         {

             testCloseBeforeAutoAck_QPID_397();

         }

diff --git a/java/client/src/test/java/org/apache/qpid/testutil/Config.java b/java/client/src/test/java/org/apache/qpid/testutil/Config.java
index e5b4834622..8109d20a33 100644
--- a/java/client/src/test/java/org/apache/qpid/testutil/Config.java
+++ b/java/client/src/test/java/org/apache/qpid/testutil/Config.java
@@ -136,7 +136,7 @@ public class Config
     public Connection getConnection() throws Exception
     {
         System.out.println("Connecting to " + host + " on " + port + "...");
-        return new AMQConnection(host, port, "guest", "guest", "Client" + System.currentTimeMillis(), "/test_path");
+        return new AMQConnection(host, port, "guest", "guest", "Client" + System.currentTimeMillis(), "/test");
     }
 
     public boolean setOptions(String[] argv)