Skip to content

fix: correctly handle WebSocket message fragmentation #1057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: correctly handle WebSocket message fragmentation #1057

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions python-ecosys/aiohttp/aiohttp/aiohttp_ws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,10 @@ async def handshake(self, uri, ssl, req):

async def receive(self):
while True:
opcode, payload = await self._read_frame()
opcode, payload, final = await self._read_frame()
while not final:
_, morepayload, final = await self._read_frame() # original opcode must be preserved
payload += morepayload
send_opcode, data = self._process_websocket_frame(opcode, payload)
if send_opcode: # pragma: no cover
await self.send(data, send_opcode)
Expand Down Expand Up @@ -206,7 +209,7 @@ async def _read_frame(self):
payload = await self.reader.readexactly(length)
if has_mask: # pragma: no cover
payload = bytes(x ^ mask[i % 4] for i, x in enumerate(payload))
return opcode, payload
return opcode, payload, fin


class ClientWebSocketResponse:
Expand Down
Loading