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

This closes #3824

This commit is contained in:
Justin Bertram 2021-12-13 21:58:03 -06:00
parent 753cf2a87c fb2270dc05
commit 1b32004c29
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
View File

@ -1378,7 +1378,13 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage {
rc.put(CompositeDataConstants.TYPE, m.getType());
if (!m.isLargeMessage()) {
ActiveMQBuffer bodyCopy = m.getReadOnlyBodyBuffer();
byte[] bytes = new byte[bodyCopy.readableBytes() <= valueSizeLimit ? bodyCopy.readableBytes() : valueSizeLimit + 1];
int arraySize;
if (valueSizeLimit == -1 || bodyCopy.readableBytes() <= valueSizeLimit) {
arraySize = bodyCopy.readableBytes();
} else {
arraySize = valueSizeLimit;
}
byte[] bytes = new byte[arraySize];
bodyCopy.readBytes(bytes);
rc.put(CompositeDataConstants.BODY, JsonUtil.truncate(bytes, valueSizeLimit));
} else {

42
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
View File

@ -577,6 +577,48 @@ public class QueueControlTest extends ManagementTestBase {
session.deleteQueue(queue);
}
@Test
public void testBytesMessageBodyWithoutLimits() throws Exception {
final int BYTE_COUNT = 2048;
SimpleString address = RandomUtil.randomSimpleString();
SimpleString queue = RandomUtil.randomSimpleString();
AddressSettings addressSettings = new AddressSettings().setManagementMessageAttributeSizeLimit(-1);
server.getAddressSettingsRepository().addMatch(address.toString(), addressSettings);
session.createQueue(new QueueConfiguration(queue).setAddress(address).setDurable(durable));
byte[] randomBytes = RandomUtil.randomBytes(BYTE_COUNT);
ClientMessage clientMessage = session.createMessage(false);
clientMessage.getBodyBuffer().writeBytes(randomBytes);
QueueControl queueControl = createManagementControl(address, queue);
Assert.assertEquals(0, getMessageCount(queueControl));
ClientProducer producer = session.createProducer(address);
producer.send(clientMessage);
Wait.assertEquals(1, () -> getMessageCount(queueControl));
CompositeData[] browseResult = queueControl.browse(1, 1);
boolean tested = false;
for (CompositeData compositeData : browseResult) {
for (String key : compositeData.getCompositeType().keySet()) {
Object value = compositeData.get(key);
if (value != null) {
if (value instanceof byte[]) {
assertEqualsByteArrays(randomBytes, (byte[]) value);
tested = true;
}
}
}
}
assertTrue("Nothing tested!", tested);
session.deleteQueue(queue);
}
@Test
public void testTextMessageAttributeLimits() throws Exception {
SimpleString address = RandomUtil.randomSimpleString();