Skip to content

Commit 33288b9

Browse files
WilliamBergaminClaude
andauthored
fix(socket_mode): send frames over 64 KB with the 64-bit length form (#2046)
Co-authored-by: Claude <svc-devxp-claude@slack-corp.com>
1 parent 6d3569e commit 33288b9

2 files changed

Lines changed: 24 additions & 1 deletion

File tree

‎slack_sdk/socket_mode/builtin/internals.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,9 +397,12 @@ def _build_data_frame_for_sending(
397397
if payload_length <= 125:
398398
b2 = masked << 7 | payload_length
399399
header += bytes([b2])
400-
else:
400+
elif payload_length <= 65535:
401401
b2 = masked << 7 | 126
402402
header += struct.pack("!BH", b2, payload_length)
403+
else:
404+
b2 = masked << 7 | 127
405+
header += struct.pack("!BQ", b2, payload_length)
403406

404407
mask_key: List[int] = random.choices(range(256), k=4)
405408
header += bytes(mask_key)

‎tests/slack_sdk/socket_mode/test_builtin.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import itertools
12
import logging
23
import socket
34
import ssl
5+
import struct
46
import time
57
import unittest
68
from unittest.mock import MagicMock, patch, sentinel
@@ -197,6 +199,20 @@ def test_build_data_frame_for_sending(self):
197199
res = _build_data_frame_for_sending("hello!", FrameHeader.OPCODE_TEXT)
198200
self.assertIsNotNone(res)
199201

202+
def test_build_data_frame_for_sending_with_16_bit_length(self):
203+
payload = b"a" * 65535
204+
frame = _build_data_frame_for_sending(payload, FrameHeader.OPCODE_TEXT)
205+
self.assertEqual(frame[1], 0b10000000 | 126)
206+
self.assertEqual(struct.unpack("!H", frame[2:4])[0], 65535)
207+
self.assertEqual(_unmask(mask_key=frame[4:8], data=frame[8:]), payload)
208+
209+
def test_build_data_frame_for_sending_with_64_bit_length(self):
210+
payload = b"a" * 65536
211+
frame = _build_data_frame_for_sending(payload, FrameHeader.OPCODE_TEXT)
212+
self.assertEqual(frame[1], 0b10000000 | 127)
213+
self.assertEqual(struct.unpack("!Q", frame[2:10])[0], 65536)
214+
self.assertEqual(_unmask(mask_key=frame[10:14], data=frame[14:]), payload)
215+
200216
def test_parse_connect_response(self):
201217
sock = socket.socket()
202218
try:
@@ -215,3 +231,7 @@ def test_creating_ssl_context(self):
215231
def test_using_supplied_ssl_context(self):
216232
ssl_context = _use_or_create_ssl_context(sentinel.ssl_context)
217233
self.assertEqual(ssl_context, sentinel.ssl_context)
234+
235+
236+
def _unmask(mask_key: bytes, data: bytes) -> bytes:
237+
return bytes(byte ^ mask for byte, mask in zip(data, itertools.cycle(mask_key)))

0 commit comments

Comments
 (0)