diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-02-01 20:24:06 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-02-01 20:24:06 +0100 |
| commit | 417384d6f2f4965b9f029944b12fadb39a5a3a5f (patch) | |
| tree | 83073476c3db1a8ea8e2733d4e03d6cc9cce900b /libmproxy | |
| parent | 11218e0c988310cff6940c9a0632234af9570c21 (diff) | |
| parent | 34875585c05301c02da4a945e0226333f3fbadf7 (diff) | |
| download | mitmproxy-417384d6f2f4965b9f029944b12fadb39a5a3a5f.tar.gz mitmproxy-417384d6f2f4965b9f029944b12fadb39a5a3a5f.tar.bz2 mitmproxy-417384d6f2f4965b9f029944b12fadb39a5a3a5f.zip | |
Merge pull request #906 from anantk17/master
Added feature to intercept flows from within inline scripts
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/console/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 6ae24d0d..80a6e28a 100644 --- 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) |