web: intercept feature

1 files changed, 11 insertions, 5 deletions

diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index 26699cc7..34c7a753 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -494,9 +494,9 @@ class FlowStore(FlowList):
         return c
 
     # TODO: Should accept_all operate on views or on all flows?
-    def accept_all(self):
+    def accept_all(self, master):
         for f in self._list:
-            f.accept_intercept()
+            f.accept_intercept(master)
 
     def kill_all(self, master):
         for f in self._list:
@@ -574,8 +574,8 @@ class State(object):
     def clear(self):
         self.flows._clear()
 
-    def accept_all(self):
-        self.flows.accept_all()
+    def accept_all(self, master):
+        self.flows.accept_all(master)
 
     def revert(self, f):
         f.revert()
@@ -811,7 +811,7 @@ class FlowMaster(controller.Master):
         """
         if f.live:
             return "Can't replay request which is still live..."
-        if f.intercepting:
+        if f.intercepted:
             return "Can't replay while intercepting..."
         if f.request.content == http.CONTENT_MISSING:
             return "Can't replay request with missing content..."
@@ -902,6 +902,12 @@ class FlowMaster(controller.Master):
             self.stream.add(f)
         return f
 
+    def handle_intercept(self, f):
+        self.state.update_flow(f)
+
+    def handle_accept_intercept(self, f):
+        self.state.update_flow(f)
+
     def shutdown(self):
         self.unload_scripts()
         controller.Master.shutdown(self)