aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/__init__.py
diff options
context:
space:
mode:
authorAnant <anantk17@ymail.com>2016-01-25 19:00:33 +0530
committerAnant <anantk17@ymail.com>2016-01-25 19:00:33 +0530
commit0a6e3c88ef154a30b089d7bd2736284854e45af3 (patch)
tree7e3709fa00ab7725d8c64ed428050e701ca4af60 /libmproxy/console/__init__.py
parenta60810cc2c0ecf7ae9b630dbe5d9f3bb0c287a41 (diff)
downloadmitmproxy-0a6e3c88ef154a30b089d7bd2736284854e45af3.tar.gz
mitmproxy-0a6e3c88ef154a30b089d7bd2736284854e45af3.tar.bz2
mitmproxy-0a6e3c88ef154a30b089d7bd2736284854e45af3.zip
Added feature to intercept flows from within inline scripts
Diffstat (limited to 'libmproxy/console/__init__.py')
-rw-r--r--libmproxy/console/__init__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index 0df10256..9b0250e7 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -702,7 +702,10 @@ class ConsoleMaster(flow.FlowMaster):
self.state.intercept) and not f.request.is_replay:
f.intercept(self)
else:
- f.reply()
+ if f.intercepted:
+ f.intercept(self)
+ else:
+ f.reply()
signals.flowlist_change.send(self)
signals.flow_change.send(self, flow = f)
@@ -732,4 +735,4 @@ class ConsoleMaster(flow.FlowMaster):
if super(ConsoleMaster, self).handle_script_change(script):
signals.status_message.send(message='"{}" reloaded.'.format(script.filename))
else:
- signals.status_message.send(message='Error reloading "{}".'.format(script.filename)) \ No newline at end of file
+ signals.status_message.send(message='Error reloading "{}".'.format(script.filename))