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

Serialized data version check.

Browse Source
This commit is contained in:
Aldo Cortesi 2012-04-11 10:10:53 +12:00
parent 5e096c8ec9
commit 8c96264304
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmproxy/flow.py
View File

@ -1575,6 +1575,9 @@ class FlowReader:
try: try:
while 1: while 1:
data = tnetstring.load(self.fo) data = tnetstring.load(self.fo)
if tuple(data["version"]) != version.IVERSION:
v = ".".join(str(i) for i in data["version"])
raise FlowReadError("Incompatible serialized data version: %s"%v)
off = self.fo.tell() off = self.fo.tell()
yield Flow._from_state(data) yield Flow._from_state(data)
except ValueError: except ValueError:

13
test/test_flow.py
View File

@ -1,7 +1,7 @@
import Queue, time import Queue, time
from cStringIO import StringIO from cStringIO import StringIO
import email.utils import email.utils
from libmproxy import filt, flow, controller, utils from libmproxy import filt, flow, controller, utils, tnetstring
import tutils import tutils
import libpry import libpry
@ -494,6 +494,17 @@ class uSerialize(libpry.AutoTree):
f = flow.FlowReadError("foo") f = flow.FlowReadError("foo")
assert f.strerror == "foo" assert f.strerror == "foo"
def test_versioncheck(self):
f = tutils.tflow()
d = f._get_state()
d["version"] = (0, 0)
sio = StringIO()
tnetstring.dump(d, sio)
sio.seek(0)
r = flow.FlowReader(sio)
libpry.raises("version", list, r.stream())
class uFlowMaster(libpry.AutoTree): class uFlowMaster(libpry.AutoTree):
def test_load_script(self): def test_load_script(self):