AMQ-6058 added a check to make sure the destination starts with the virtual topic prefix.

This commit is contained in:
Chad Zobrisky 2015-11-23 19:49:02 +00:00
parent 8be1486508
commit dca6e4506e
2 changed files with 117 additions and 1 deletions

View File

@ -142,7 +142,11 @@ public class VirtualTopicInterceptor extends DestinationFilter {
}
protected boolean shouldDispatch(Broker broker, Message message, Destination dest) throws IOException {
return true;
//can't find .* in the prefix, so default back to old logic and return true
if(prefix.indexOf(".*")>0){
return dest.getName().startsWith(prefix.substring(0,prefix.indexOf(".*")));
}
else return true;
}
protected ActiveMQDestination getQueueConsumersWildcard(ActiveMQDestination original) {

View File

@ -0,0 +1,112 @@
/**
* 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.broker.virtual;
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.region.DestinationInterceptor;
import org.apache.activemq.broker.region.virtual.VirtualDestination;
import org.apache.activemq.broker.region.virtual.VirtualDestinationInterceptor;
import org.apache.activemq.broker.region.virtual.VirtualTopic;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Test for ticket AMQ-6058, shouldDispatch prefix check
*/
public class CustomVirtualTopicInterceptorTest extends EmbeddedBrokerTestSupport{
private static final Logger LOG = LoggerFactory.getLogger(CustomVirtualTopicInterceptorTest.class);
protected int total = 10;
protected Connection connection;
protected ActiveMQDestination getConsumer1Destination() {
return new ActiveMQQueue("q.private.vt.testing.test.virtual.topic");
}
protected ActiveMQDestination getConsumer2Destination() {
return new ActiveMQQueue("q.private.>");
}
protected ActiveMQDestination getProducerDestination() {
return new ActiveMQTopic("test.virtual.topic");
}
public void testVirtualTopicRouting() throws Exception {
if (connection == null) {
connection = createConnection();
}
connection.start();
LOG.info("validate no other messages on queues");
try {
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
ActiveMQDestination destination1 = getConsumer1Destination();
ActiveMQDestination destination2 = getConsumer2Destination();
MessageConsumer c1 = session.createConsumer(destination1, null);
MessageConsumer c2 = session.createConsumer(destination2, null);
LOG.info("send one simple message that should go to both consumers");
MessageProducer producer = session.createProducer(getProducerDestination());
broker.getBroker().addDestination(broker.getAdminConnectionContext(), destination2, false);
assertNotNull(producer);
producer.send(session.createTextMessage("Last Message"));
//check that c1 received the message as it should
assertNotNull(c1.receive(3000));
//check that c2 did not receive the message - this breaks pre-patch,
//when VirtualTopicInterceptor.shouldDispatch always returned true
assertNull(c2.receive(3000));
} catch (JMSException e) {
e.printStackTrace();
fail("unexpeced ex while waiting for last messages: " + e);
}
}
protected void tearDown() throws Exception {
if (connection != null) {
connection.close();
}
super.tearDown();
}
//setup the broker and virtual topic to test custom Virtual topic name
//and a multilevel prefix
protected BrokerService createBroker() throws Exception {
BrokerService broker = new BrokerService();
broker.setPersistent(false);
VirtualTopic virtualTopic = new VirtualTopic();
virtualTopic.setName(">");
virtualTopic.setPrefix("q.private.vt.*.");
VirtualDestinationInterceptor interceptor = new VirtualDestinationInterceptor();
interceptor.setVirtualDestinations(new VirtualDestination[]{virtualTopic});
broker.setDestinationInterceptors(new DestinationInterceptor[]{interceptor});
return broker;
}
}