on allowed mask mismatch, ensure all inbound frames have same masking…

… status
jauntsdn · Jan 1, 2025 · ec3ffad · ec3ffad
1 parent 8192071
commit ec3ffad
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/...java/com/jauntsdn/netty/handler/codec/http/websocketx/WebSocketCallbacksFrameDecoder.java b/...java/com/jauntsdn/netty/handler/codec/http/websocketx/WebSocketCallbacksFrameDecoder.java
@@ -28,11 +28,7 @@ void frameListener(
 
   static WebSocketCallbacksFrameDecoder frameDecoder(
       int maxFramePayloadLength, boolean expectMaskedFrames, boolean allowMaskMismatch) {
-
-    Boolean strictExpectMaskedFrames = null;
-    if (!allowMaskMismatch) {
-      strictExpectMaskedFrames = expectMaskedFrames;
-    }
-    return new WebSocketMaskedDecoder(maxFramePayloadLength, strictExpectMaskedFrames);
+    Boolean lenientExpectMaskedFrames = allowMaskMismatch ? null : expectMaskedFrames;
+    return new WebSocketMaskedDecoder(maxFramePayloadLength, lenientExpectMaskedFrames);
   }
 }
diff --git a/...rc/main/java/com/jauntsdn/netty/handler/codec/http/websocketx/WebSocketMaskedDecoder.java b/...rc/main/java/com/jauntsdn/netty/handler/codec/http/websocketx/WebSocketMaskedDecoder.java
@@ -20,11 +20,11 @@
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.websocketx.WebSocketCloseStatus;
+import javax.annotation.Nullable;
 
 final class WebSocketMaskedDecoder extends WebSocketDecoder {
-  /*if null, mask mismatch is allowed*/
-  Boolean expectMaskedFrames;
   final int maxFramePayloadLength;
+  Boolean expectMaskedFrames;
 
   WebSocketFrameFactory frameFactory;
 
@@ -43,7 +43,7 @@ final class WebSocketMaskedDecoder extends WebSocketDecoder {
   /* non-negative value means fragmentation is in progress*/
   int fragmentedTotalLength = WebSocketProtocol.VALIDATION_RESULT_NON_FRAGMENTING;
 
-  WebSocketMaskedDecoder(int maxFramePayloadLength, Boolean expectMaskedFrames) {
+  WebSocketMaskedDecoder(int maxFramePayloadLength, @Nullable Boolean expectMaskedFrames) {
     this.maxFramePayloadLength = maxFramePayloadLength;
     this.expectMaskedFrames = expectMaskedFrames;
   }
@@ -96,7 +96,9 @@ void decode(ChannelHandlerContext ctx, ByteBuf in) {
             int code = (prefix >> 24) & 0xF;
 
             Boolean expectMasked = expectMaskedFrames;
-            if (expectMasked != null && maskFlag != expectMasked) {
+            if (expectMasked == null) {
+              expectMaskedFrames = maskFlag;
+            } else if (maskFlag != expectMasked) {
               WebSocketProtocol.close(
                   ctx,
                   this,
@@ -183,7 +185,9 @@ void decode(ChannelHandlerContext ctx, ByteBuf in) {
             boolean maskFlag = masking = (prefix & 0x80) == 0x80;
 
             Boolean expectMasked = expectMaskedFrames;
-            if (expectMasked != null && maskFlag != expectMasked) {
+            if (expectMasked == null) {
+              expectMaskedFrames = maskFlag;
+            } else if (maskFlag != expectMasked) {
               WebSocketProtocol.close(
                   ctx,
                   this,
@@ -319,7 +323,9 @@ void decode(ChannelHandlerContext ctx, ByteBuf in) {
                 boolean maskFlag = masking = (prefix & 0x80) == 0x80;
 
                 Boolean expectMasked = expectMaskedFrames;
-                if (expectMasked != null && maskFlag != expectMasked) {
+                if (expectMasked == null) {
+                  expectMaskedFrames = maskFlag;
+                } else if (maskFlag != expectMasked) {
                   WebSocketProtocol.close(
                       ctx,
                       this,