merge bug22886 into default

Author: rade

test/src/com/rabbitmq/client/test/functional/FunctionalTests.java

@@ -65,6 +65,7 @@ public static TestSuite suite() {
         suite.addTestSuite(BindToDefaultExchange.class);
         suite.addTestSuite(UnbindAutoDeleteExchange.class);
         suite.addTestSuite(RecoverAfterCancel.class);
+        suite.addTestSuite(UnexpectedFrames.class);
         return suite;
     }
 }

test/src/com/rabbitmq/client/test/functional/UnexpectedFrames.java

@@ -0,0 +1,123 @@
+package com.rabbitmq.client.test.functional;
+
+import com.rabbitmq.client.*;
+import com.rabbitmq.client.impl.*;
+import com.rabbitmq.client.test.BrokerTestCase;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.net.Socket;
+
+/**
+ * Test that the server correctly handles us when we send it bad frames
+ */
+public class UnexpectedFrames extends BrokerTestCase {
+    private interface Confuser {
+        public Frame confuse(Frame frame) throws IOException;
+    }
+
+    public void testMissingHeader() throws IOException {
+        expectUnexpectedFrameError(new Confuser() {
+            public Frame confuse(Frame frame) {
+                if (frame.type == AMQP.FRAME_HEADER) {
+                    return null;
+                }
+                return frame;
+            }
+        });
+    }
+
+    public void testMissingMethod() throws IOException {
+        expectUnexpectedFrameError(new Confuser() {
+            public Frame confuse(Frame frame) {
+                if (frame.type == AMQP.FRAME_METHOD) {
+                    // We can't just skip the method as that will lead us to
+                    // send 0 bytes and hang waiting for a response.
+                    frame.type = AMQP.FRAME_HEADER;
+                }
+                return frame;
+            }
+        });
+    }
+
+    public void testMissingBody() throws IOException {
+        expectUnexpectedFrameError(new Confuser() {
+            public Frame confuse(Frame frame) {
+                if (frame.type == AMQP.FRAME_BODY) {
+                    return null;
+                }
+                return frame;
+            }
+        });
+    }
+
+    public void testWrongClassInHeader() throws IOException {
+        expectUnexpectedFrameError(new Confuser() {
+            public Frame confuse(Frame frame) throws IOException {
+                if (frame.type == AMQP.FRAME_HEADER) {
+                    byte[] payload = frame.accumulator.toByteArray();
+                    // First two bytes = class ID, must match class ID from
+                    // method.
+                    payload[0] = 12;
+                    payload[1] = 34;
+                    frame.accumulator = new ByteArrayOutputStream();
+                    frame.accumulator.write(payload, 0, payload.length);
+                }
+                return frame;
+            }
+        });
+    }
+
+    private void expectUnexpectedFrameError(Confuser confuser) throws IOException {
+        ConnectionFactory factory = new ConnectionFactory();
+        Socket socket = factory.getSocketFactory().createSocket("localhost",
+                AMQP.PROTOCOL.PORT);
+        ConfusedFrameHandler handler = new ConfusedFrameHandler(socket);
+        AMQConnection connection = new AMQConnection(factory, handler);
+        try {
+            connection.start(false);
+        } catch (RedirectException e) {}
+        Channel channel = connection.createChannel();
+
+        handler.confuser = confuser;
+
+        try {
+            String queue = channel.queueDeclare().getQueue();
+            channel.basicPublish("", queue, null, "Hello".getBytes());
+            GetResponse result = channel.basicGet(queue, false);
+            channel.basicAck(result.getEnvelope().getDeliveryTag(), false);
+            fail("We should have seen an UNEXPECTED_FRAME by now");
+        }
+        catch (IOException e) {
+            checkShutdownSignal(AMQP.UNEXPECTED_FRAME, e);
+        }
+    }
+
+    private static class ConfusedFrameHandler extends SocketFrameHandler {
+        public ConfusedFrameHandler(Socket socket) throws IOException {
+            super(socket);
+        }
+
+        @Override
+        public void writeFrame(Frame frame) throws IOException {
+            Frame confusedFrame = new Frame();
+            confusedFrame.accumulator = frame.accumulator;
+            confusedFrame.channel = frame.channel;
+            confusedFrame.type = frame.type;
+
+            confusedFrame = confuser.confuse(confusedFrame);
+            if (confusedFrame != null) {
+                super.writeFrame(confusedFrame);
+            }
+        }
+
+        public Confuser confuser = new Confuser() {
+            public Frame confuse(Frame frame) {
+                // Do nothing to start with, we need to negotiate before the
+                // server will send us unexpected_frame errors
+                return frame;
+            }
+        };
+    }
+}