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

Merge pull request #3211 from cortesi/tcheck

Browse Source 
Add typechecking of Any values for state object
This commit is contained in:
Thomas Kriechbaumer 2018-06-17 08:45:03 +02:00 committed by GitHub
commit 3cd3765270
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mitmproxy/stateobject.py
View File

@ -1,6 +1,7 @@
import typing import typing
from typing import Any # noqa from typing import Any # noqa
from typing import MutableMapping # noqa from typing import MutableMapping # noqa
import json
from mitmproxy.coretypes import serializable from mitmproxy.coretypes import serializable
from mitmproxy.utils import typecheck from mitmproxy.utils import typecheck
@ -77,8 +78,14 @@ def _process(typeinfo: typecheck.Type, val: typing.Any, make: bool) -> typing.An
for k, v in val.items() for k, v in val.items()
} }
elif typename.startswith("typing.Any"): elif typename.startswith("typing.Any"):
# FIXME: Remove this when we remove flow.metadata # This requires a bit of explanation. We can't import our IO layer here,
assert isinstance(val, (int, str, bool, bytes)) # because it causes a circular import. Rather than restructuring the
# code for this, we use JSON serialization, which has similar primitive
# type restrictions as tnetstring, to check for conformance.
try:
json.dumps(val)
except TypeError:
raise ValueError(f"Data not serializable: {val}")
return val return val
else: else:
return typeinfo(val) return typeinfo(val)

2
test/mitmproxy/test_stateobject.py
View File

@ -125,7 +125,7 @@ def test_any():
assert a.x == b.x assert a.x == b.x
a = TAny(object()) a = TAny(object())
with pytest.raises(AssertionError): with pytest.raises(ValueError):
a.get_state() a.get_state()