From e6a8863c51f2e2f5809ae0a42fc874afc3c7f908 Mon Sep 17 00:00:00 2001 From: Marcelo Glezer Date: Wed, 25 Mar 2015 16:57:28 -0300 Subject: [PATCH 1/3] fixed exception in mitmproxy -c fix #535 --- libmproxy/console/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 90c8bd89d..de549ee6c 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -293,7 +293,7 @@ class ConsoleMaster(flow.FlowMaster): - a list of flows, otherwise. """ try: - return flow.read_flows_from_paths([path]) + return flow.read_flows_from_paths(path) except flow.FlowReadError as e: signals.status_message.send(message=e.strerror) From c5f153f8d0e50e12b9c9cd6ab0988a1294bcd4be Mon Sep 17 00:00:00 2001 From: Marcelo Glezer Date: Wed, 25 Mar 2015 17:07:31 -0300 Subject: [PATCH 2/3] fix #535 now works with both cases: using -c from command line and pressing c in the ui --- libmproxy/console/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index de549ee6c..75d1e1ace 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -298,6 +298,8 @@ class ConsoleMaster(flow.FlowMaster): signals.status_message.send(message=e.strerror) def client_playback_path(self, path): + if not isinstance(path, list): + path = [path] flows = self._readflows(path) if flows: self.start_client_playback(flows, False) From fb17eea5e0adcbe8d0dc5c2f029b10b172d5a3e7 Mon Sep 17 00:00:00 2001 From: Marcelo Glezer Date: Wed, 25 Mar 2015 17:12:38 -0300 Subject: [PATCH 3/3] fix #535 server replay was failing from ui but working from command line (fixed now too) --- libmproxy/console/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 75d1e1ace..9375f973b 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -305,6 +305,8 @@ class ConsoleMaster(flow.FlowMaster): self.start_client_playback(flows, False) def server_playback_path(self, path): + if not isinstance(path, list): + path = [path] flows = self._readflows(path) if flows: self.start_server_playback(