fix websocket regression introduced in 7.0.1 (#4733)

mitmproxy · Aug 4, 2021 · 53a916e · 53a916e
1 parent 88374e9
commit 53a916e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/mitmproxy/proxy/layers/websocket.py b/mitmproxy/proxy/layers/websocket.py
@@ -164,7 +164,7 @@ def relay_messages(self, event: events.Event) -> layer.CommandGenerator[None]:
                     content = b"".join(src_ws.frame_buf)
 
                     fragmentizer = Fragmentizer(src_ws.frame_buf, is_text)
-                    src_ws.frame_buf.clear()
+                    src_ws.frame_buf = [b""]
 
                     message = websocket.WebSocketMessage(typ, from_client, content)
                     self.flow.websocket.messages.append(message)

diff --git a/test/mitmproxy/proxy/layers/test_websocket.py b/test/mitmproxy/proxy/layers/test_websocket.py
@@ -95,8 +95,12 @@ def test_upgrade(tctx):
             << websocket.WebsocketMessageHook(flow)
             >> reply()
             << SendData(tctx.client, b"\x82\nhello back")
+            >> DataReceived(tctx.client, masked_bytes(b"\x81\x0bhello again"))
+            << websocket.WebsocketMessageHook(flow)
+            >> reply()
+            << SendData(tctx.server, masked(b"\x81\x0bhello again"))
     )
-    assert len(flow().websocket.messages) == 2
+    assert len(flow().websocket.messages) == 3
     assert flow().websocket.messages[0].content == b"hello world"
     assert flow().websocket.messages[0].from_client
     assert flow().websocket.messages[0].type == Opcode.TEXT