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

3 files changed, 43 insertions, 8 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java b/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
index 508d88f941..8795adbc55 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
@@ -177,6 +177,16 @@ public class MockProtocolSession implements AMQProtocolSession
         return ProtocolOutputConverterRegistry.getConverter(this);
     }
 
+    public void setAuthorizedID(String authorizedID)
+    {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getAuthorizedID()
+    {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
     public byte getProtocolMajorVersion()
     {
         return 8;  //To change body of implemented methods use File | Settings | File Templates.
diff --git a/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java b/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
index 849285e6d6..bd7ed60d1d 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/util/TestApplicationRegistry.java
@@ -20,18 +20,18 @@
  */
 package org.apache.qpid.server.util;
 
-import org.apache.qpid.server.exchange.DefaultExchangeFactory;
-import org.apache.qpid.server.exchange.DefaultExchangeRegistry;
 import org.apache.qpid.server.exchange.ExchangeFactory;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
 import org.apache.qpid.server.management.ManagedObjectRegistry;
-import org.apache.qpid.server.management.NoopManagedObjectRegistry;
-import org.apache.qpid.server.queue.DefaultQueueRegistry;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
-import org.apache.qpid.server.security.auth.AuthenticationManager;
-import org.apache.qpid.server.security.auth.NullAuthenticationManager;
+import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
+import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;
+import org.apache.qpid.server.security.auth.database.PrincipalDatabaseManager;
+import org.apache.qpid.server.security.auth.database.PropertiesPrincipalDatabaseManager;
+import org.apache.qpid.server.security.access.AccessManager;
+import org.apache.qpid.server.security.access.AllowAll;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -41,6 +41,7 @@ import org.apache.commons.configuration.MapConfiguration;
 
 import java.util.HashMap;
 import java.util.Collection;
+import java.util.Properties;
 
 public class TestApplicationRegistry extends ApplicationRegistry
 {
@@ -52,6 +53,10 @@ public class TestApplicationRegistry extends ApplicationRegistry
 
     private ManagedObjectRegistry _managedObjectRegistry;
 
+    private AccessManager _accessManager;
+
+    private PrincipalDatabaseManager _databaseManager;
+
     private AuthenticationManager _authenticationManager;
 
     private MessageStore _messageStore;
@@ -64,13 +69,23 @@ public class TestApplicationRegistry extends ApplicationRegistry
 
     public void initialise() throws Exception
     {
+        Properties users = new Properties();
+
+        users.put("guest", "guest");
+
+        _databaseManager = new PropertiesPrincipalDatabaseManager("default", users);
+
+        _accessManager = new AllowAll();
+
+        _authenticationManager = new PrincipalDatabaseAuthenticationManager(null, null);
+
         IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
         _managedObjectRegistry = appRegistry.getManagedObjectRegistry();
         _vHost = appRegistry.getVirtualHostRegistry().getVirtualHost("test");
         _queueRegistry = _vHost.getQueueRegistry();
         _exchangeFactory = _vHost.getExchangeFactory();
         _exchangeRegistry = _vHost.getExchangeRegistry();
-        _authenticationManager = new NullAuthenticationManager();
+
         _messageStore = new TestableMemoryMessageStore();
 
         _configuration.addProperty("heartbeat.delay", 10 * 60); // 10 minutes
@@ -101,6 +116,11 @@ public class TestApplicationRegistry extends ApplicationRegistry
         return _managedObjectRegistry;
     }
 
+    public PrincipalDatabaseManager getDatabaseManager()
+    {
+        return _databaseManager;
+    }
+
     public AuthenticationManager getAuthenticationManager()
     {
         return _authenticationManager;
@@ -116,6 +136,11 @@ public class TestApplicationRegistry extends ApplicationRegistry
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    public AccessManager getAccessManager()
+    {
+        return _accessManager;
+    }
+
     public MessageStore getMessageStore()
     {
         return _messageStore;
diff --git a/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
index bbac06382d..31fd77691d 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
@@ -84,7 +84,7 @@ public class VMTestCase extends TestCase
             _brokerlist = "vm://:1";
         }
 
-        env.put("connectionfactory.connection", "amqp://client:client@" +
+        env.put("connectionfactory.connection", "amqp://guest:guest@" +
                                                 _clientID + _virtualhost + "?brokerlist='" + _brokerlist + "'");
 
         for (Map.Entry<String, String> c : _connections.entrySet())