Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-7125 Broker does not send error frame when an empty destination is sent with a stomp subscribe frame

This commit is contained in:
avi5kdon 2019-01-01 21:49:25 +05:30 committed by gtully
parent a16b227808
commit b10458e2c6
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
View File

@ -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) {

49
activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompEmptyDestinationTest.java Normal file
View File

@ -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);
}
}