diff options
author | Aldo Cortesi <aldo@corte.si> | 2017-03-24 11:29:36 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@corte.si> | 2017-03-25 10:48:12 +1300 |
commit | 65f0885bd6809966f694d1ffb965401b8ab2cffc (patch) | |
tree | ea90d5849f57d6b74ca0cefbb4498ff10776a848 /examples | |
parent | d69a411303298c944d5941e0f3e435ff96800a69 (diff) | |
download | mitmproxy-65f0885bd6809966f694d1ffb965401b8ab2cffc.tar.gz mitmproxy-65f0885bd6809966f694d1ffb965401b8ab2cffc.tar.bz2 mitmproxy-65f0885bd6809966f694d1ffb965401b8ab2cffc.zip |
addon loader: add boot_into, which replaces returning from start()
While we're here, expand test coverage for addonmanager to 100%, and promote to
individual coverage.
Diffstat (limited to 'examples')
-rw-r--r-- | examples/complex/dns_spoofing.py | 4 | ||||
-rw-r--r-- | examples/complex/har_dump.py | 2 | ||||
-rw-r--r-- | examples/complex/remote_debug.py | 2 | ||||
-rw-r--r-- | examples/complex/tls_passthrough.py | 2 | ||||
-rw-r--r-- | examples/simple/add_header_class.py | 4 | ||||
-rw-r--r-- | examples/simple/custom_contentview.py | 2 | ||||
-rw-r--r-- | examples/simple/custom_option.py | 4 | ||||
-rw-r--r-- | examples/simple/filter_flows.py | 4 | ||||
-rw-r--r-- | examples/simple/io_write_dumpfile.py | 4 | ||||
-rw-r--r-- | examples/simple/log_events.py | 2 | ||||
-rw-r--r-- | examples/simple/modify_body_inject_iframe.py | 4 | ||||
-rw-r--r-- | examples/simple/script_arguments.py | 4 | ||||
-rw-r--r-- | examples/simple/wsgi_flask_app.py | 2 |
13 files changed, 20 insertions, 20 deletions
diff --git a/examples/complex/dns_spoofing.py b/examples/complex/dns_spoofing.py index 9f6af522..01e036b2 100644 --- a/examples/complex/dns_spoofing.py +++ b/examples/complex/dns_spoofing.py @@ -54,5 +54,5 @@ class Rerouter: flow.request.port = port -def load(opts): - return Rerouter() +def load(l): + l.boot_into(Rerouter()) diff --git a/examples/complex/har_dump.py b/examples/complex/har_dump.py index f9f8cd95..0515d0f5 100644 --- a/examples/complex/har_dump.py +++ b/examples/complex/har_dump.py @@ -25,7 +25,7 @@ HAR = {} SERVERS_SEEN = set() -def load(opts): +def load(l): """ Called once on script startup before any other events. """ diff --git a/examples/complex/remote_debug.py b/examples/complex/remote_debug.py index 0b7049d2..fa6f3d33 100644 --- a/examples/complex/remote_debug.py +++ b/examples/complex/remote_debug.py @@ -14,6 +14,6 @@ Usage: """ -def load(opts): +def load(l): import pydevd pydevd.settrace("localhost", port=5678, stdoutToServer=True, stderrToServer=True) diff --git a/examples/complex/tls_passthrough.py b/examples/complex/tls_passthrough.py index 3b3c8936..72c0244b 100644 --- a/examples/complex/tls_passthrough.py +++ b/examples/complex/tls_passthrough.py @@ -112,7 +112,7 @@ class TlsFeedback(TlsLayer): tls_strategy = None -def load(opts): +def load(l): global tls_strategy if len(sys.argv) == 2: tls_strategy = ProbabilisticStrategy(float(sys.argv[1])) diff --git a/examples/simple/add_header_class.py b/examples/simple/add_header_class.py index 7a0dbafa..69b64163 100644 --- a/examples/simple/add_header_class.py +++ b/examples/simple/add_header_class.py @@ -3,5 +3,5 @@ class AddHeader: flow.response.headers["newheader"] = "foo" -def load(opts): - return AddHeader() +def load(l): + return l.boot_into(AddHeader()) diff --git a/examples/simple/custom_contentview.py b/examples/simple/custom_contentview.py index b159154f..34fa5541 100644 --- a/examples/simple/custom_contentview.py +++ b/examples/simple/custom_contentview.py @@ -20,7 +20,7 @@ class ViewSwapCase(contentviews.View): view = ViewSwapCase() -def load(opts): +def load(l): contentviews.add(view) diff --git a/examples/simple/custom_option.py b/examples/simple/custom_option.py index 3190b840..c8bc98d4 100644 --- a/examples/simple/custom_option.py +++ b/examples/simple/custom_option.py @@ -1,9 +1,9 @@ from mitmproxy import ctx -def load(options): +def load(l): ctx.log.info("Registering option 'custom'") - options.add_option("custom", bool, False, "A custom option") + l.add_option("custom", bool, False, "A custom option") def configure(options, updated): diff --git a/examples/simple/filter_flows.py b/examples/simple/filter_flows.py index 4d3e264e..d2b735be 100644 --- a/examples/simple/filter_flows.py +++ b/examples/simple/filter_flows.py @@ -17,7 +17,7 @@ class Filter: print(flow) -def load(opts): +def load(l): if len(sys.argv) != 2: raise ValueError("Usage: -s 'filt.py FILTER'") - return Filter(sys.argv[1]) + l.boot_into(Filter(sys.argv[1])) diff --git a/examples/simple/io_write_dumpfile.py b/examples/simple/io_write_dumpfile.py index 3204e566..15e7693c 100644 --- a/examples/simple/io_write_dumpfile.py +++ b/examples/simple/io_write_dumpfile.py @@ -23,7 +23,7 @@ class Writer: self.w.add(flow) -def load(opts): +def load(l): if len(sys.argv) != 2: raise ValueError('Usage: -s "flowriter.py filename"') - return Writer(sys.argv[1]) + l.boot_into(Writer(sys.argv[1])) diff --git a/examples/simple/log_events.py b/examples/simple/log_events.py index 518a202f..581b99f3 100644 --- a/examples/simple/log_events.py +++ b/examples/simple/log_events.py @@ -7,6 +7,6 @@ If you want to help us out: https://github.com/mitmproxy/mitmproxy/issues/1530 : from mitmproxy import ctx -def load(opts): +def load(l): ctx.log.info("This is some informative text.") ctx.log.error("This is an error.") diff --git a/examples/simple/modify_body_inject_iframe.py b/examples/simple/modify_body_inject_iframe.py index f92aac04..442a5118 100644 --- a/examples/simple/modify_body_inject_iframe.py +++ b/examples/simple/modify_body_inject_iframe.py @@ -23,7 +23,7 @@ class Injector: flow.response.content = str(html).encode("utf8") -def load(opts): +def load(l): if len(sys.argv) != 2: raise ValueError('Usage: -s "iframe_injector.py url"') - return Injector(sys.argv[1]) + return l.boot_into(Injector(sys.argv[1])) diff --git a/examples/simple/script_arguments.py b/examples/simple/script_arguments.py index e16f6a22..84292eb9 100644 --- a/examples/simple/script_arguments.py +++ b/examples/simple/script_arguments.py @@ -9,9 +9,9 @@ class Replacer: flow.response.replace(self.src, self.dst) -def load(opts): +def load(l): parser = argparse.ArgumentParser() parser.add_argument("src", type=str) parser.add_argument("dst", type=str) args = parser.parse_args() - return Replacer(args.src, args.dst) + l.boot_into(Replacer(args.src, args.dst)) diff --git a/examples/simple/wsgi_flask_app.py b/examples/simple/wsgi_flask_app.py index 5def17b4..30008b16 100644 --- a/examples/simple/wsgi_flask_app.py +++ b/examples/simple/wsgi_flask_app.py @@ -14,7 +14,7 @@ def hello_world(): return 'Hello World!' -def load(opts): +def load(l): # Host app at the magic domain "proxapp" on port 80. Requests to this # domain and port combination will now be routed to the WSGI app instance. return wsgiapp.WSGIApp(app, "proxapp", 80) |