Merge pull request #906 from anantk17/master

Added feature to intercept flows from within inline scripts
2016-02-01 20:24:06 +01:00 · 2016-02-01 20:24:06 +01:00 · 417384d6f2
parent 11218e0c98 34875585c0
commit 417384d6f2
1 changed files with 5 additions and 1 deletions
--- a/libmproxy/console/init.py
+++ b/libmproxy/console/init.py
@ -703,7 +703,11 @@ class ConsoleMaster(flow.FlowMaster):
                self.state.intercept) and not f.request.is_replay:
            f.intercept(self)
        else:
-            f.reply()
+            #check if flow was intercepted within an inline script by flow.intercept()
+            if f.intercepted:
+                f.intercept(self)
+            else:
+                f.reply()
        signals.flowlist_change.send(self)
        signals.flow_change.send(self, flow = f)