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

https://issues.apache.org/jira/browse/AMQ-5882 

Fail to publish if the topic name in the publish packet contains a wild
card character as per the MQTT V3.1 and V3.1.1 spec.
This commit is contained in:
Christopher L. Shannon (cshannon) 2016-02-28 17:54:23 +00:00
parent 012e4d0a1c
commit 1b38b27ed2
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
View File

@ -91,6 +91,9 @@ public class MQTTProtocolConverter {
public static final int V3_1 = 3;
public static final int V3_1_1 = 4;
public static final String SINGLE_LEVEL_WILDCARD = "+";
public static final String MULTI_LEVEL_WILDCARD = "#";
private static final IdGenerator CONNECTION_ID_GENERATOR = new IdGenerator();
private static final MQTTFrame PING_RESP_FRAME = new PINGRESP().encode();
private static final double MQTT_KEEP_ALIVE_GRACE_PERIOD = 0.5;
@ -458,6 +461,12 @@ public class MQTTProtocolConverter {
checkConnected();
LOG.trace("MQTT Rcv PUBLISH message:{} client:{} connection:{}",
command.messageId(), clientId, connectionInfo.getConnectionId());
//Both version 3.1 and 3.1.1 do not allow the topic name to contain a wildcard in the publish packet
if (containsMqttWildcard(command.topicName().toString())) {
// [MQTT-3.3.2-2]: The Topic Name in the PUBLISH Packet MUST NOT contain wildcard characters
getMQTTTransport().onException(IOExceptionSupport.create("The topic name must not contain wildcard characters.", null));
return;
}
ActiveMQMessage message = convertMessage(command);
message.setProducerId(producerId);
message.onSend();
@ -820,6 +829,11 @@ public class MQTTProtocolConverter {
return clientId;
}
protected boolean containsMqttWildcard(String value) {
return value != null && (value.contains(SINGLE_LEVEL_WILDCARD) ||
value.contains(MULTI_LEVEL_WILDCARD));
}
protected MQTTSubscriptionStrategy findSubscriptionStrategy() throws IOException {
if (subsciptionStrategy == null) {
synchronized (STRATAGY_FINDER) {

31
activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java
View File

@ -1163,6 +1163,37 @@ public class MQTTTest extends MQTTTestSupport {
connection.disconnect();
}
@Test(timeout = 60 * 1000)
public void testPublishWildcard31() throws Exception {
testPublishWildcard("3.1");
}
@Test(timeout = 60 * 1000)
public void testPublishWildcard311() throws Exception {
testPublishWildcard("3.1.1");
}
private void testPublishWildcard(String version) throws Exception {
MQTT mqttPub = createMQTTConnection("MQTTPub-Client", true);
mqttPub.setVersion(version);
BlockingConnection blockingConnection = mqttPub.blockingConnection();
blockingConnection.connect();
String payload = "Test Message";
try {
blockingConnection.publish("foo/#", payload.getBytes(), QoS.AT_LEAST_ONCE, false);
fail("Should not be able to publish with wildcard in topic.");
} catch (Exception ex) {
LOG.info("Exception expected on publish with wildcard in topic name");
}
try {
blockingConnection.publish("foo/+", payload.getBytes(), QoS.AT_LEAST_ONCE, false);
fail("Should not be able to publish with wildcard in topic.");
} catch (Exception ex) {
LOG.info("Exception expected on publish with wildcard in topic name");
}
blockingConnection.disconnect();
}
@Test(timeout = 60 * 1000)
public void testDuplicateClientId() throws Exception {
// test link stealing enabled by default