diff options
| author | Marcelo Glezer <mg@tekii.com.ar> | 2015-01-06 15:49:49 -0300 |
|---|---|---|
| committer | Marcelo Glezer <mg@tekii.com.ar> | 2015-01-06 15:49:49 -0300 |
| commit | 30213d6370bca2bb222e315a63bf4d924a9b0b94 (patch) | |
| tree | 00b5eb115e961f6104314879406edc8669e06208 /libmproxy/console | |
| parent | 9695377b283f97c872e4ddbb27060883c3c32980 (diff) | |
| download | mitmproxy-30213d6370bca2bb222e315a63bf4d924a9b0b94.tar.gz mitmproxy-30213d6370bca2bb222e315a63bf4d924a9b0b94.tar.bz2 mitmproxy-30213d6370bca2bb222e315a63bf4d924a9b0b94.zip | |
now mitmproxy supports multiple saved flows files too. also fixed server_play_back start with mitmproxy (missing parameter)
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/__init__.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index f5b6a2a6..e2a0ec75 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -496,11 +496,13 @@ class ConsoleMaster(flow.FlowMaster): self.eventlog = not self.eventlog self.view_flowlist() - def _readflow(self, path): - path = os.path.expanduser(path) + def _readflow(self, paths): try: - f = file(path, "rb") - flows = list(flow.FlowReader(f).stream()) + flows = [] + 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: return True, v.strerror return False, flows @@ -521,7 +523,7 @@ class ConsoleMaster(flow.FlowMaster): ret, self.killextra, self.rheaders, 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): |