mirror of
https://github.com/zhigang1992/mitmproxy.git
synced 2026-05-30 17:33:26 +08:00
Make mitmdump handle invalid serialized data gracefully.
This commit is contained in:
@@ -560,6 +560,10 @@ class FlowWriter:
|
||||
s = json.dumps(d)
|
||||
self.ns.write(s)
|
||||
|
||||
class FlowReadError(Exception):
|
||||
@property
|
||||
def strerror(self):
|
||||
return self.args[0]
|
||||
|
||||
class FlowReader:
|
||||
def __init__(self, fo):
|
||||
@@ -570,7 +574,10 @@ class FlowReader:
|
||||
"""
|
||||
Yields Flow objects from the dump.
|
||||
"""
|
||||
for i in self.ns:
|
||||
data = json.loads(i)
|
||||
yield Flow.from_state(data)
|
||||
try:
|
||||
for i in self.ns:
|
||||
data = json.loads(i)
|
||||
yield Flow.from_state(data)
|
||||
except netstring.DecoderError:
|
||||
raise FlowReadError("Invalid data format.")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user