Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1880 from mhils/1877

Browse Source 
Fix #1877
This commit is contained in:
Maximilian Hils 2016-12-19 19:04:45 +01:00 committed by GitHub
commit 77cd9224f9
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mitmproxy/net/http/message.py
View File

@ -103,7 +103,11 @@ class Message(serializable.Serializable):
ce = self.headers.get("content-encoding") ce = self.headers.get("content-encoding")
if ce: if ce:
try: try:
return encoding.decode(self.raw_content, ce) content = encoding.decode(self.raw_content, ce)
# A client may illegally specify a byte -> str encoding here (e.g. utf8)
if isinstance(content, str):
raise ValueError("Invalid Content-Encoding: {}".format(ce))
return content
except ValueError: except ValueError:
if strict: if strict:
raise raise

9
test/mitmproxy/net/http/test_message.py
View File

@ -141,6 +141,15 @@ class TestMessageContentEncoding:
assert r.headers["content-encoding"] assert r.headers["content-encoding"]
assert r.get_content(strict=False) == b"foo" assert r.get_content(strict=False) == b"foo"
def test_utf8_as_ce(self):
r = tutils.tresp()
r.headers["content-encoding"] = "utf8"
r.raw_content = b"foo"
with tutils.raises(ValueError):
assert r.content
assert r.headers["content-encoding"]
assert r.get_content(strict=False) == b"foo"
def test_cannot_decode(self): def test_cannot_decode(self):
r = tutils.tresp() r = tutils.tresp()
r.encode("gzip") r.encode("gzip")