vee1e/mitmproxy
1
0
Fork 0
mirror of https://github.com/vee1e/mitmproxy.git synced 2026-09-01 18:27:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3200 from Kriechi/websocket-frame-masking-api

Browse source 
improve websocket frame masking api
This commit is contained in:
Thomas Kriechbaumer 2018-06-11 13:40:31 +02:00 • committed by GitHub
commit b6fd9b4484
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mitmproxy/net/websockets/frame.py
View file

@ -71,7 +71,7 @@ class FrameHeader:
else:
self.length_code = length_code
if mask is DEFAULT and masking_key is DEFAULT:
if (mask is DEFAULT and masking_key is DEFAULT) or mask == 0 or mask is False:
self.mask = False
self.masking_key = b""
elif mask is DEFAULT:

2
test/mitmproxy/net/websockets/test_frame.py
View file

@ -122,7 +122,7 @@ class TestFrameHeader:
f = websockets.FrameHeader(masking_key=b"foob", mask=0)
assert not f.mask
assert f.masking_key
assert not f.masking_key
class TestFrame:

6
test/pathod/language/test_websockets.py
View file

@ -123,12 +123,6 @@ class TestWebsocketFrame:
assert not frm.header.mask
assert not frm.header.masking_key
frm = self.fr("wf:b'foo':-mask:k'abcd'", is_client=True)
assert not frm.header.mask
# We're reading back a corrupted frame - the first 3 characters of the
# mask is mis-interpreted as the payload
assert frm.payload == b"abc"
def test_knone(self):
with pytest.raises(Exception, match="Expected 4 bytes"):
self.fr("wf:b'foo':mask:knone")