This is an automated email from the ASF dual-hosted git repository.
gtully pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/master by this push:
new b10458e AMQ-7125 Broker does not send error frame when an empty
destination is sent with a stomp subscribe frame
b10458e is described below
commit b10458e2c69aa8743e6606948a13dcf27dca1ccc
Author: avi5kdon <[email protected]>
AuthorDate: Tue Jan 1 21:49:25 2019 +0530
AMQ-7125 Broker does not send error frame when an empty destination is sent
with a stomp subscribe frame
---
.../transport/stomp/ProtocolConverter.java | 4 ++
.../transport/stomp/StompEmptyDestinationTest.java | 49 ++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git
a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
index 2c4d402..a89d5ee 100644
---
a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
+++
b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
@@ -575,6 +575,10 @@ public class ProtocolConverter {
throw new ProtocolException("SUBSCRIBE received without a
subscription id!");
}
+ if (destination == null || "".equals(destination)) {
+ throw new ProtocolException("Invalid empty or 'null' Destination
header");
+ }
+
final ActiveMQDestination actualDest =
translator.convertDestination(this, destination, true);
if (actualDest == null) {
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompEmptyDestinationTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompEmptyDestinationTest.java
new file mode 100644
index 0000000..5797135
--- /dev/null
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompEmptyDestinationTest.java
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.stomp;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class StompEmptyDestinationTest extends StompTestSupport{
+ private static final Logger LOG =
LoggerFactory.getLogger(StompEmptyDestinationTest.class);
+
+ @Test(timeout = 60000)
+ public void testEmptyDestinationOnSubscribe() throws Exception{
+ stompConnect();
+ stompConnection.sendFrame("CONNECT\n" + "login:system\n" +
"passcode:manager\n\n" + Stomp.NULL);
+ StompFrame frame = stompConnection.receive();
+ assertTrue(frame.toString().startsWith("CONNECTED"));
+ String send = "SUBSCRIBE\r\n" +
+ "id:1\r\n" +
+ "destination:\r\n" +
+ "receipt:1\r\n" +
+ "\r\n"+
+ "\u0000\r\n";
+
+ stompConnection.sendFrame(send);
+ StompFrame receipt = stompConnection.receive();
+ LOG.info("Broker sent: " + receipt);
+ assertTrue(receipt.getAction().startsWith("ERROR"));
+ String errorMessage = receipt.getHeaders().get("message");
+ assertEquals("Invalid empty or 'null' Destination header",
errorMessage);
+ }
+
+
+}
