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

now mitmproxy supports multiple saved flows files too. also fixed server_play_back start with mitmproxy (missing parameter)

Browse Source
This commit is contained in:
Marcelo Glezer 2015-01-06 15:49:49 -03:00
parent 9695377b28
commit 30213d6370
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libmproxy/console/__init__.py
View File

@ -496,11 +496,13 @@ class ConsoleMaster(flow.FlowMaster):
self.eventlog = not self.eventlog self.eventlog = not self.eventlog
self.view_flowlist() self.view_flowlist()
def _readflow(self, path): def _readflow(self, paths):
path = os.path.expanduser(path)
try: try:
f = file(path, "rb") flows = []
flows = list(flow.FlowReader(f).stream()) for path in paths:
path = os.path.expanduser(path)
f = file(path, "rb")
flows.extend(list(flow.FlowReader(f).stream()))
except (IOError, flow.FlowReadError), v: except (IOError, flow.FlowReadError), v:
return True, v.strerror return True, v.strerror
return False, flows return False, flows
@ -521,7 +523,7 @@ class ConsoleMaster(flow.FlowMaster):
ret, ret,
self.killextra, self.rheaders, self.killextra, self.rheaders,
False, self.nopop, False, self.nopop,
self.options.replay_ignore_params, self.options.replay_ignore_content self.options.replay_ignore_params, self.options.replay_ignore_content, self.options.replay_ignore_payload_params
) )
def spawn_editor(self, data): def spawn_editor(self, data):