bug23185 merged into default

Author: Marek Majkowski

test/src/com/rabbitmq/client/test/server/Permissions.java

@@ -52,7 +52,6 @@ public class Permissions extends BrokerTestCase
 {
 
     protected Channel adminCh;
-    protected Channel noAccessCh;
 
     public Permissions()
     {
@@ -82,21 +81,17 @@ protected void addRestrictedAccount()
     {
         runCtl("add_user test test");
         runCtl("add_user testadmin test");
-        runCtl("add_user noaccess test");
         runCtl("add_vhost /test");
         runCtl("set_permissions -p /test test configure write read");
         runCtl("set_permissions -p /test testadmin \".*\" \".*\" \".*\"");
-        runCtl("set_permissions -p /test -s all noaccess \"\" \"\" \"\"");
     }
 
     protected void deleteRestrictedAccount()
         throws IOException
     {
-        runCtl("clear_permissions -p /test noaccess");
         runCtl("clear_permissions -p /test testadmin");
         runCtl("clear_permissions -p /test test");
         runCtl("delete_vhost /test");
-        runCtl("delete_user noaccess");
         runCtl("delete_user testadmin");
         runCtl("delete_user test");
     }
@@ -122,12 +117,6 @@ public void with(String name) throws IOException {
                     adminCh.exchangeDeclare(name, "direct");
                     adminCh.queueDeclare(name, false, false, false, null);
                 }});
-
-        factory = new ConnectionFactory();
-        factory.setUsername("noaccess");
-        factory.setPassword("test");
-        factory.setVirtualHost("/test");
-        noAccessCh = factory.newConnection().createChannel();
     }
 
     protected void releaseResources()
@@ -139,7 +128,6 @@ public void with(String name) throws IOException {
                     adminCh.exchangeDelete(name);
                 }});
         adminCh.getConnection().abort();
-        noAccessCh.getConnection().abort();
     }
 
     protected void withNames(WithName action)
@@ -262,58 +250,88 @@ public void testAltExchConfiguration()
                 createAltExchConfigTest("configure-and-read-me"));
     }
 
+    public void testClientNoAccess()
+        throws IOException, InterruptedException
+    {
+        runCtl("set_permissions -p /test test -s client \"\" \"\" amq.direct");
+        Thread.sleep(2000);
+        {
+            String queueName =
+                channel.queueDeclare().getQueue();   // configure
+            channel.queueBind(queueName, "amq.direct", queueName); // write
+            channel.queuePurge(queueName);           // read
+            channel.queueDelete(queueName);          // configure
+        }
+
+        expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
+                public void with(String _) throws IOException {
+                    channel.queueDeclare("amq.genbah", false, false, false, null);
+                }}
+        );
+
+        commonNoAccessTests();
+    }
+
     public void testNoAccess()
-        throws IOException
+        throws IOException, InterruptedException
     {
+        runCtl("set_permissions -p /test -s all test \"\" \"\" \"\"");
+        Thread.sleep(2000);
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
                 public void with(String _) throws IOException {
-                    noAccessCh.queueDeclare("justaqueue", false, false, true, null);
+                    channel.queueDeclare();
                 }}
         );
+
+        commonNoAccessTests();
+    }
+
+    private void commonNoAccessTests()
+        throws IOException {
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
                 public void with(String _) throws IOException {
-                    noAccessCh.queueDeclare();
+                    channel.queueDeclare("justaqueue", false, false, true, null);
                 }}
         );
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
                 public void with(String _) throws IOException {
-                    noAccessCh.queueDelete("configure");
+                    channel.queueDelete("configure");
                 }}
         );
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
                 public void with(String _) throws IOException {
-                    noAccessCh.queueBind("write", "write", "write");
+                    channel.queueBind("write", "write", "write");
                 }}
         );
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
                 public void with(String _) throws IOException {
-                    noAccessCh.queuePurge("read");
+                    channel.queuePurge("read");
                 }}
         );
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
                 public void with(String _) throws IOException {
-                    noAccessCh.exchangeDeclare("justanexchange", "direct");
+                    channel.exchangeDeclare("justanexchange", "direct");
                 }}
         );
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
                 public void with(String _) throws IOException {
-                    noAccessCh.exchangeDeclare("configure", "direct");
+                    channel.exchangeDeclare("configure", "direct");
                 }}
         );
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
                 public void with(String _) throws IOException {
-                    noAccessCh.basicPublish("write", "", null, "foo".getBytes());
-                    noAccessCh.queueDeclare();
+                    channel.basicPublish("write", "", null, "foo".getBytes());
+                    channel.queueDeclare();
                 }}
         );
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
                 public void with(String _) throws IOException {
-                    noAccessCh.basicGet("read", false);
+                    channel.basicGet("read", false);
                 }}
         );
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
                 public void with(String _) throws IOException {
-                    noAccessCh.basicConsume("read", null);
+                    channel.basicConsume("read", null);
                 }}
         );
     }
@@ -333,7 +351,7 @@ protected void expectExceptionRun(int exceptionCode, WithName action)
                     (AMQP.Channel.Close) ((Command)sse.getReason()).getMethod();
                 assertEquals(exceptionCode, closeMethod.getReplyCode());
             }
-            noAccessCh = noAccessCh.getConnection().createChannel();
+            channel = channel.getConnection().createChannel();
         }
     }