vee1e/mitmproxy
1
0
Fork 0
mirror of https://github.com/vee1e/mitmproxy.git synced 2026-09-02 02:37:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle_* -> * leftovers

Browse source
This commit is contained in:
Maximilian Hils 2016-05-29 13:01:45 -07:00
parent 748cbaa074
commit 2e633af5aa
5 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/flowbasic
View file

@ -21,12 +21,12 @@ class MyMaster(flow.FlowMaster):
@controller.handler
def request(self, f):
f = flow.FlowMaster.handle_request(self, f)
f = flow.FlowMaster.request(self, f)
print(f)
@controller.handler
def response(self, f):
f = flow.FlowMaster.handle_response(self, f)
f = flow.FlowMaster.response(self, f)
print(f)

8
mitmproxy/console/__init__.py
View file

@ -731,28 +731,28 @@ class ConsoleMaster(flow.FlowMaster):
# Handlers
@controller.handler
def error(self, f):
f = flow.FlowMaster.handle_error(self, f)
f = flow.FlowMaster.error(self, f)
if f:
self.process_flow(f)
return f
@controller.handler
def request(self, f):
f = flow.FlowMaster.handle_request(self, f)
f = flow.FlowMaster.request(self, f)
if f:
self.process_flow(f)
return f
@controller.handler
def response(self, f):
f = flow.FlowMaster.handle_response(self, f)
f = flow.FlowMaster.response(self, f)
if f:
self.process_flow(f)
return f
@controller.handler
def script_change(self, script):
if super(ConsoleMaster, self).handle_script_change(script):
if super(ConsoleMaster, self).script_change(script):
signals.status_message.send(message='"{}" reloaded.'.format(script.filename))
else:
signals.status_message.send(message='Error reloading "{}".'.format(script.filename))

2
mitmproxy/controller.py
View file

@ -24,6 +24,8 @@ Events = frozenset([
"error",
"log",
"script_change",
])

5
mitmproxy/flow.py
View file

@ -810,7 +810,7 @@ class FlowMaster(controller.Master):
def do_server_playback(self, flow):
"""
This method should be called by child classes in the handle_request
This method should be called by child classes in the request
handler. Returns True if playback has taken place, None if not.
"""
if self.server_playback:
@ -1072,7 +1072,8 @@ class FlowMaster(controller.Master):
def handle_accept_intercept(self, f):
self.state.update_flow(f)
def handle_script_change(self, s):
@controller.handler
def script_change(self, s):
"""
Handle a script whose contents have been changed on the file system.

6
mitmproxy/web/__init__.py
View file

@ -198,17 +198,17 @@ class WebMaster(flow.FlowMaster):
@controller.handler
def request(self, f):
super(WebMaster, self).handle_request(f)
super(WebMaster, self).request(f)
self._process_flow(f)
@controller.handler
def response(self, f):
super(WebMaster, self).handle_response(f)
super(WebMaster, self).response(f)
self._process_flow(f)
@controller.handler
def error(self, f):
super(WebMaster, self).handle_error(f)
super(WebMaster, self).error(f)
self._process_flow(f)
def add_event(self, e, level="info"):