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

AMQ-8412 - Add wireformat negotiation test for maxFrameSizeEnabled 

Verify that maxFrameSizeEnabled being configured on the client or the
server is not negotiated and won't affect the other
This commit is contained in:
Christopher L. Shannon (cshannon) 2022-02-07 08:03:06 -05:00
parent 43aa1800fa
commit 26a3c55833
3 changed files with 102 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
activemq-client/src/main/java/org/apache/activemq/command/WireFormatInfo.java
View File

@ -354,6 +354,14 @@ public class WireFormatInfo implements Command, MarshallAware {
setProperty("PlatformDetails", platformDetails);
}
public boolean isMaxFrameSizeEnabled() throws IOException {
return Boolean.TRUE == getProperty("MaxFrameSizeEnabled");
}
public void setMaxFrameSizeEnabled(boolean maxFrameSizeEnabled) throws IOException {
setProperty("MaxFrameSizeEnabled", maxFrameSizeEnabled ? Boolean.TRUE : Boolean.FALSE);
}
@Override
public Response visit(CommandVisitor visitor) throws Exception {
return visitor.processWireFormat(this);

1
activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
View File

@ -63,6 +63,7 @@ public class OpenWireFormatFactory implements WireFormatFactory {
info.setMaxInactivityDurationInitalDelay(maxInactivityDurationInitalDelay);
info.setCacheSize(cacheSize);
info.setMaxFrameSize(maxFrameSize);
info.setMaxFrameSizeEnabled(maxFrameSizeEnabled);
if( host!=null ) {
info.setHost(host);
}

93
activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java
View File

@ -233,4 +233,97 @@ public class WireformatNegociationTest extends CombinationTestSupport {
assertEquals(1048576, serverWF.get().getMaxFrameSize());
}
/**
* The property maxFrameSizeEnabled should NOT be negotiated as we don't want to allow
* clients to override a server setting. Verify both sides can change their setting and it won't
* affect the other side.
*
* @throws Exception
*/
public void testWireFormatMaxFrameSizeBothEnabled() throws Exception {
startServer("tcp://localhost:61616");
startClient("tcp://localhost:61616");
assertTrue("Connect timeout", negociationCounter.await(10, TimeUnit.SECONDS));
assertNull("Async error: " + asyncError, asyncError.get());
//both should be enabled
assertNotNull(clientWF.get());
assertTrue(Boolean.valueOf(clientWF.get().getProperties().get("MaxFrameSizeEnabled").toString()));
assertNotNull(serverWF.get());
assertTrue(Boolean.valueOf(serverWF.get().getProperties().get("MaxFrameSizeEnabled").toString()));
}
//Make sure settin the flag to true explicitly and not default works
public void testWireFormatMaxFrameSizeBothEnabledExplicit() throws Exception {
startServer("tcp://localhost:61616?wireFormat.maxFrameSizeEnabled=true");
startClient("tcp://localhost:61616?wireFormat.maxFrameSizeEnabled=true");
assertTrue("Connect timeout", negociationCounter.await(10, TimeUnit.SECONDS));
assertNull("Async error: " + asyncError, asyncError.get());
//both should be enabled
assertNotNull(clientWF.get());
assertTrue(Boolean.valueOf(clientWF.get().getProperties().get("MaxFrameSizeEnabled").toString()));
assertNotNull(serverWF.get());
assertTrue(Boolean.valueOf(serverWF.get().getProperties().get("MaxFrameSizeEnabled").toString()));
}
//Verify disabling client doesn't change server
public void testWireFormatMaxFrameSizeClientDisabled() throws Exception {
startServer("tcp://localhost:61616");
startClient("tcp://localhost:61616?wireFormat.maxFrameSizeEnabled=false");
assertTrue("Connect timeout", negociationCounter.await(10, TimeUnit.SECONDS));
assertNull("Async error: " + asyncError, asyncError.get());
//Verify client disabled
assertNotNull(clientWF.get());
assertTrue(Boolean.valueOf(clientWF.get().getProperties().get("MaxFrameSizeEnabled").toString()));
//Make sure server is still enabled
assertNotNull(serverWF.get());
assertFalse(Boolean.valueOf(serverWF.get().getProperties().get("MaxFrameSizeEnabled").toString()));
}
//Verify disabling server doesn't change client
public void testWireFormatMaxFrameSizeServerDisabled() throws Exception {
startServer("tcp://localhost:61616?wireFormat.maxFrameSizeEnabled=false");
startClient("tcp://localhost:61616");
assertTrue("Connect timeout", negociationCounter.await(10, TimeUnit.SECONDS));
assertNull("Async error: " + asyncError, asyncError.get());
//Verify client enabled
assertNotNull(clientWF.get());
assertFalse(Boolean.valueOf(clientWF.get().getProperties().get("MaxFrameSizeEnabled").toString()));
//Make server disabled
assertNotNull(serverWF.get());
assertTrue(Boolean.valueOf(serverWF.get().getProperties().get("MaxFrameSizeEnabled").toString()));
}
//Verify disabling server and client
public void testWireFormatMaxFrameSizeBothDisabled() throws Exception {
startServer("tcp://localhost:61616?wireFormat.maxFrameSizeEnabled=false");
startClient("tcp://localhost:61616?wireFormat.maxFrameSizeEnabled=false");
assertTrue("Connect timeout", negociationCounter.await(10, TimeUnit.SECONDS));
assertNull("Async error: " + asyncError, asyncError.get());
//Make both disabled
assertNotNull(clientWF.get());
assertFalse(Boolean.valueOf(clientWF.get().getProperties().get("MaxFrameSizeEnabled").toString()));
assertNotNull(serverWF.get());
assertFalse(Boolean.valueOf(serverWF.get().getProperties().get("MaxFrameSizeEnabled").toString()));
}
}