Make mitmdump server playback also exit by default.

Like client playback, the --keepserving option makes mitmdump keep serving.

2 files changed, 11 insertions, 5 deletions

diff --git a/libmproxy/dump.py b/libmproxy/dump.py
index b02c84dc..73ecc54d 100644
--- a/libmproxy/dump.py
+++ b/libmproxy/dump.py
@@ -73,7 +73,8 @@ class DumpMaster(flow.FlowMaster):
         if options.server_replay:
             self.start_server_playback(
                 self._readflow(options.server_replay),
-                options.kill, options.rheaders
+                options.kill, options.rheaders,
+                not options.keepserving
             )
 
         if options.client_replay:
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index fb9bd4c7..957d5301 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -69,12 +69,12 @@ class ClientPlaybackState:
 
 
 class ServerPlaybackState:
-    def __init__(self, headers, flows):
+    def __init__(self, headers, flows, exit):
         """
             headers: A case-insensitive list of request headers that should be
             included in request-response matching.
         """
-        self.headers = headers
+        self.headers, self.exit = headers, exit
         self.fmap = {}
         for i in flows:
             if i.response:
@@ -458,12 +458,12 @@ class FlowMaster(controller.Master):
         """
         self.client_playback = ClientPlaybackState(flows, exit)
 
-    def start_server_playback(self, flows, kill, headers):
+    def start_server_playback(self, flows, kill, headers, exit):
         """
             flows: A list of flows.
             kill: Boolean, should we kill requests not part of the replay?
         """
-        self.server_playback = ServerPlaybackState(headers, flows)
+        self.server_playback = ServerPlaybackState(headers, flows, exit)
         self.kill_nonreplay = kill
 
     def do_server_playback(self, flow):
@@ -492,6 +492,11 @@ class FlowMaster(controller.Master):
             if all(e):
                 self.shutdown()
             self.client_playback.tick(self)
+
+        if self.server_playback:
+            if self.server_playback.exit and self.server_playback.count() == 0:
+                self.shutdown()
+
         controller.Master.tick(self, q)
 
     def handle_clientconnect(self, r):