aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-03-18 09:43:47 +1300
committerAldo Cortesi <aldo@nullcube.com>2011-03-18 09:43:47 +1300
commit89b0ac51952e62abc61123a4c6e766c671f0ac86 (patch)
treeb4aad19bed75c7a09adda98460b2d5218e4256b1 /libmproxy/console.py
parentf97c144869fa4cb8123d0a12ec9503ee0a8cf485 (diff)
downloadmitmproxy-89b0ac51952e62abc61123a4c6e766c671f0ac86.tar.gz
mitmproxy-89b0ac51952e62abc61123a4c6e766c671f0ac86.tar.bz2
mitmproxy-89b0ac51952e62abc61123a4c6e766c671f0ac86.zip
Server replay shortcut in mitmproxy can now be used to interrupt a current replay.
Diffstat (limited to 'libmproxy/console.py')
-rw-r--r--libmproxy/console.py24
1 files changed, 19 insertions, 5 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py
index 4c53ef01..b8f766e6 100644
--- a/libmproxy/console.py
+++ b/libmproxy/console.py
@@ -1359,11 +1359,21 @@ class ConsoleMaster(flow.FlowMaster):
)
k = None
elif k == "s":
- self.path_prompt(
- "Server replay: ",
- self.state.last_saveload,
- self.server_playback_path
- )
+ if not self.server_playback:
+ self.path_prompt(
+ "Server replay: ",
+ self.state.last_saveload,
+ self.server_playback_path
+ )
+ else:
+ self.prompt_onekey(
+ "Stop current server replay?",
+ (
+ ("yes", "y"),
+ ("no", "n"),
+ ),
+ self.stop_server_playback_prompt,
+ )
k = None
elif k == "L":
self.path_prompt(
@@ -1399,6 +1409,10 @@ class ConsoleMaster(flow.FlowMaster):
if a != "n":
self.stop_client_playback()
+ def stop_server_playback_prompt(self, a):
+ if a != "n":
+ self.stop_server_playback()
+
def quit(self, a):
if a != "n":
raise Stop