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

ARTEMIS-3317 OpenWire property conversion can cause ClassCastException

This commit is contained in:
Justin Bertram 2021-05-26 13:50:15 -05:00 committed by clebertsuconic
parent f0476d6a12
commit cdaa00d470
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
View File

@ -590,14 +590,14 @@ public final class OpenWireMessageConverter {
}
amqMsg.setArrival(arrival);
final String brokerPath = (String) coreMessage.getObjectProperty(AMQ_MSG_BROKER_PATH);
if (brokerPath != null && !brokerPath.isEmpty()) {
setAMQMsgBrokerPath(amqMsg, brokerPath);
final Object brokerPath = coreMessage.getObjectProperty(AMQ_MSG_BROKER_PATH);
if (brokerPath != null && brokerPath instanceof SimpleString && ((SimpleString)brokerPath).length() > 0) {
setAMQMsgBrokerPath(amqMsg, ((SimpleString)brokerPath).toString());
}
final String clusterPath = (String) coreMessage.getObjectProperty(AMQ_MSG_CLUSTER);
if (clusterPath != null && !clusterPath.isEmpty()) {
setAMQMsgClusterPath(amqMsg, clusterPath);
final Object clusterPath = coreMessage.getObjectProperty(AMQ_MSG_CLUSTER);
if (clusterPath != null && clusterPath instanceof SimpleString && ((SimpleString)clusterPath).length() > 0) {
setAMQMsgClusterPath(amqMsg, ((SimpleString)clusterPath).toString());
}
Integer commandId = (Integer) coreMessage.getObjectProperty(AMQ_MSG_COMMAND_ID);
@ -672,9 +672,9 @@ public final class OpenWireMessageConverter {
setAMQMsgReplyTo(amqMsg, marshaller, replyToBytes);
}
final String userId = (String) coreMessage.getObjectProperty(AMQ_MSG_USER_ID);
if (userId != null) {
amqMsg.setUserID(userId);
final Object userId = coreMessage.getObjectProperty(AMQ_MSG_USER_ID);
if (userId != null && userId instanceof SimpleString && ((SimpleString)userId).length() > 0) {
amqMsg.setUserID(((SimpleString)userId).toString());
}
final Boolean isDroppable = (Boolean) coreMessage.getObjectProperty(AMQ_MSG_DROPPABLE);

29
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
View File

@ -73,6 +73,7 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.core.transaction.Transaction;
import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.apache.activemq.artemis.tests.util.Wait;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
@ -1780,6 +1781,34 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
assertNull(transaction);
}
@Test
public void testPropertyConversions() throws Exception {
final String BROKER_PATH = RandomUtil.randomString();
final String CLUSTER = RandomUtil.randomString();
final String USER_ID = RandomUtil.randomString();
try (Connection connection = factory.createConnection()) {
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue(queueName); ///// PRODUCE MESSAGE
MessageProducer producer = session.createProducer(queue);
TextMessage message = session.createTextMessage("This is a text message");
message.setStringProperty("__HDR_BROKER_PATH", BROKER_PATH);
message.setStringProperty("__HDR_CLUSTER", CLUSTER);
message.setStringProperty("__HDR_USER_ID", USER_ID);
producer.send(message);
MessageConsumer messageConsumer = session.createConsumer(queue);
connection.start();
TextMessage messageReceived = (TextMessage) messageConsumer.receive(5000);
assertNotNull(messageReceived);
assertEquals(BROKER_PATH, messageReceived.getStringProperty("__HDR_BROKER_PATH"));
assertEquals(CLUSTER, messageReceived.getStringProperty("__HDR_CLUSTER"));
assertEquals(USER_ID, messageReceived.getStringProperty("__HDR_USER_ID"));
}
}
private void checkQueueEmpty(String qName) {
PostOffice po = server.getPostOffice();
LocalQueueBinding binding = (LocalQueueBinding) po.getBinding(SimpleString.toSimpleString(qName));