Before throwing TooLongFrameException,should skip the bytes to be rea…

…d in MqttDecoder (netty#11204) Motivation: Before throwing TooLongFrameException, should call the skipBytes method to skip the bytes to be read Modification: - skip bytes before throw Result: Actually skip the bytes when we detect too much data Signed-off-by: xingrufei <[email protected]> Co-authored-by: xingrufei <[email protected]>
benevans · Apr 29, 2021 · bf721c8 · bf721c8
1 parent 438632a
commit bf721c8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttDecoder.java b/codec-mqtt/src/main/java/io/netty/handler/codec/mqtt/MqttDecoder.java
@@ -98,6 +98,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer) throws Exceptio
                 final Result<?> decodedVariableHeader = decodeVariableHeader(ctx, buffer, mqttFixedHeader);
                 variableHeader = decodedVariableHeader.value;
                 if (bytesRemainingInVariablePart > maxBytesInMessage) {
+                    buffer.skipBytes(buffer.readableBytes());
                     throw new TooLongFrameException("too large message: " + bytesRemainingInVariablePart + " bytes");
                 }
                 bytesRemainingInVariablePart -= decodedVariableHeader.numberOfBytesConsumed;

diff --git a/codec-mqtt/src/test/java/io/netty/handler/codec/mqtt/MqttCodecTest.java b/codec-mqtt/src/test/java/io/netty/handler/codec/mqtt/MqttCodecTest.java
@@ -327,6 +327,7 @@ public void testConnectMessageForMqtt31TooLarge() throws Exception {
             verify(ctx).fireChannelRead(captor.capture());
 
             final MqttMessage decodedMessage = captor.getValue();
+            assertEquals(0, byteBuf.readableBytes());
 
             validateFixedHeaders(message.fixedHeader(), decodedMessage.fixedHeader());
             validateConnectVariableHeader(message.variableHeader(),
@@ -348,6 +349,7 @@ public void testConnectMessageForMqtt311TooLarge() throws Exception {
             verify(ctx).fireChannelRead(captor.capture());
 
             final MqttMessage decodedMessage = captor.getValue();
+            assertEquals(0, byteBuf.readableBytes());
 
             validateFixedHeaders(message.fixedHeader(), decodedMessage.fixedHeader());
             validateConnectVariableHeader(message.variableHeader(),
@@ -369,6 +371,8 @@ public void testConnAckMessageTooLarge() throws Exception {
             verify(ctx).fireChannelRead(captor.capture());
 
             final MqttMessage decodedMessage = captor.getValue();
+            assertEquals(0, byteBuf.readableBytes());
+
             validateFixedHeaders(message.fixedHeader(), decodedMessage.fixedHeader());
             validateDecoderExceptionTooLargeMessage(decodedMessage);
         } finally {
@@ -387,6 +391,7 @@ public void testPublishMessageTooLarge() throws Exception {
             verify(ctx).fireChannelRead(captor.capture());
 
             final MqttMessage decodedMessage = captor.getValue();
+            assertEquals(0, byteBuf.readableBytes());
 
             validateFixedHeaders(message.fixedHeader(), decodedMessage.fixedHeader());
             validatePublishVariableHeader(message.variableHeader(),
@@ -408,6 +413,8 @@ public void testSubscribeMessageTooLarge() throws Exception {
             verify(ctx).fireChannelRead(captor.capture());
 
             final MqttMessage decodedMessage = captor.getValue();
+            assertEquals(0, byteBuf.readableBytes());
+
             validateFixedHeaders(message.fixedHeader(), decodedMessage.fixedHeader());
             validateMessageIdVariableHeader(message.variableHeader(),
                     (MqttMessageIdVariableHeader) decodedMessage.variableHeader());
@@ -428,6 +435,8 @@ public void testSubAckMessageTooLarge() throws Exception {
             verify(ctx).fireChannelRead(captor.capture());
 
             final MqttMessage decodedMessage = captor.getValue();
+            assertEquals(0, byteBuf.readableBytes());
+
             validateFixedHeaders(message.fixedHeader(), decodedMessage.fixedHeader());
             validateMessageIdVariableHeader(message.variableHeader(),
                     (MqttMessageIdVariableHeader) decodedMessage.variableHeader());
@@ -448,6 +457,8 @@ public void testUnSubscribeMessageTooLarge() throws Exception {
             verify(ctx).fireChannelRead(captor.capture());
 
             final MqttMessage decodedMessage = captor.getValue();
+            assertEquals(0, byteBuf.readableBytes());
+
             validateFixedHeaders(message.fixedHeader(), decodedMessage.fixedHeader());
             validateMessageIdVariableHeader(message.variableHeader(),
                     (MqttMessageIdVariableHeader) decodedMessage.variableHeader());