Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

addons: add AddonHalt exception

Browse Source 
This can be raised from an addon handler to stop further processing of a flow.

Use this to prevent further handling of web app requests.
This commit is contained in:
Aldo Cortesi 2016-10-19 12:01:08 +13:00
parent 87629586ae
commit da8dec9823
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mitmproxy/addons.py
View File

@ -86,4 +86,7 @@ class Addons:
def __call__(self, name, *args, **kwargs): def __call__(self, name, *args, **kwargs):
for i in self.chain: for i in self.chain:
self.invoke(i, name, *args, **kwargs) try:
self.invoke(i, name, *args, **kwargs)
except exceptions.AddonHalt:
return

2
mitmproxy/builtins/wsgiapp.py
View File

@ -1,4 +1,5 @@
from mitmproxy import ctx from mitmproxy import ctx
from mitmproxy import exceptions
from netlib import wsgi from netlib import wsgi
from netlib import version from netlib import version
@ -30,6 +31,7 @@ class WSGIApp:
if err: if err:
ctx.log.warn("Error in wsgi app. %s" % err, "error") ctx.log.warn("Error in wsgi app. %s" % err, "error")
flow.reply.kill() flow.reply.kill()
raise exceptions.AddonHalt()
def request(self, f): def request(self, f):
if (f.request.pretty_host, f.request.port) == (self.host, self.port): if (f.request.pretty_host, f.request.port) == (self.host, self.port):

2
mitmproxy/console/master.py
View File

@ -224,7 +224,6 @@ class ConsoleMaster(flow.FlowMaster):
def __init__(self, server, options): def __init__(self, server, options):
flow.FlowMaster.__init__(self, options, server) flow.FlowMaster.__init__(self, options, server)
self.state = ConsoleState() self.state = ConsoleState()
self.addons.add(self.state)
self.stream_path = None self.stream_path = None
# This line is just for type hinting # This line is just for type hinting
self.options = self.options # type: Options self.options = self.options # type: Options
@ -252,6 +251,7 @@ class ConsoleMaster(flow.FlowMaster):
signals.push_view_state.connect(self.sig_push_view_state) signals.push_view_state.connect(self.sig_push_view_state)
signals.sig_add_log.connect(self.sig_add_log) signals.sig_add_log.connect(self.sig_add_log)
self.addons.add(*builtins.default_addons()) self.addons.add(*builtins.default_addons())
self.addons.add(self.state)
def __setattr__(self, name, value): def __setattr__(self, name, value):
self.__dict__[name] = value self.__dict__[name] = value

4
mitmproxy/exceptions.py
View File

@ -96,3 +96,7 @@ class OptionsError(Exception):
class AddonError(Exception): class AddonError(Exception):
pass pass
class AddonHalt(Exception):
pass

2
mitmproxy/web/master.py
View File

@ -135,8 +135,8 @@ class WebMaster(flow.FlowMaster):
def __init__(self, server, options): def __init__(self, server, options):
super().__init__(options, server) super().__init__(options, server)
self.state = WebState() self.state = WebState()
self.addons.add(self.state)
self.addons.add(*builtins.default_addons()) self.addons.add(*builtins.default_addons())
self.addons.add(self.state)
self.app = app.Application( self.app = app.Application(
self, self.options.wdebug, self.options.wauthenticator self, self.options.wdebug, self.options.wauthenticator
) )