kylefang/mitmproxy
1
0
Fork 0
mirror of https://github.com/zhigang1992/mitmproxy.git synced 2026-01-12 22:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove option argument for addons.add (#1576)

Browse Source
This commit is contained in:
Maximilian Hils
2016-09-24 18:21:12 -07:00
committed by GitHub
parent 92dd030c22
commit 0a643ad20f
19 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mitmproxy/addons.py
View File

@@ -11,7 +11,7 @@ class Addons(object):
def __init__(self, master):
self.chain = []
self.master = master
master.options.changed.connect(self.options_update)
master.options.changed.connect(self._options_update)
def get(self, name):
"""
@@ -23,12 +23,12 @@ class Addons(object):
if name == _get_name(i):
return i
def options_update(self, options, updated):
def _options_update(self, options, updated):
for i in self.chain:
with self.master.handlecontext():
i.configure(options, updated)
def add(self, options, *addons):
def add(self, *addons):
if not addons:
raise ValueError("No addons specified.")
self.chain.extend(addons)

2
mitmproxy/builtins/script.py
View File

@@ -249,4 +249,4 @@ class ScriptLoader():
else:
ctx.log.info("Loading script: %s" % s)
sc = Script(s)
ctx.master.addons.add(options, sc)
ctx.master.addons.add(sc)

2
mitmproxy/console/master.py
View File

@@ -256,7 +256,7 @@ class ConsoleMaster(flow.FlowMaster):
signals.replace_view_state.connect(self.sig_replace_view_state)
signals.push_view_state.connect(self.sig_push_view_state)
signals.sig_add_log.connect(self.sig_add_log)
self.addons.add(options, *builtins.default_addons())
self.addons.add(*builtins.default_addons())
def __setattr__(self, name, value):
self.__dict__[name] = value

4
mitmproxy/dump.py
View File

@@ -42,8 +42,8 @@ class DumpMaster(flow.FlowMaster):
def __init__(self, server, options):
flow.FlowMaster.__init__(self, options, server, flow.State())
self.has_errored = False
self.addons.add(options, *builtins.default_addons())
self.addons.add(options, dumper.Dumper())
self.addons.add(*builtins.default_addons())
self.addons.add(dumper.Dumper())
# This line is just for type hinting
self.options = self.options # type: Options
self.set_stream_large_bodies(options.stream_large_bodies)

2
mitmproxy/web/master.py
View File

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

2
test/mitmproxy/builtins/test_anticache.py
View File

@@ -11,7 +11,7 @@ class TestAntiCache(mastertest.MasterTest):
o = options.Options(anticache = True)
m = master.FlowMaster(o, None, s)
sa = anticache.AntiCache()
m.addons.add(o, sa)
m.addons.add(sa)
f = tutils.tflow(resp=True)
m.request(f)

2
test/mitmproxy/builtins/test_anticomp.py
View File

@@ -11,7 +11,7 @@ class TestAntiComp(mastertest.MasterTest):
o = options.Options(anticomp = True)
m = master.FlowMaster(o, None, s)
sa = anticomp.AntiComp()
m.addons.add(o, sa)
m.addons.add(sa)
f = tutils.tflow(resp=True)
m.request(f)

2
test/mitmproxy/builtins/test_dumper.py
View File

@@ -79,6 +79,6 @@ class TestContentView(mastertest.MasterTest):
)
m = mastertest.RecordingMaster(o, None, s)
d = dumper.Dumper()
m.addons.add(o, d)
m.addons.add(d)
m.response(tutils.tflow())
assert "Content viewer failed" in m.event_log[0][1]

4
test/mitmproxy/builtins/test_filestreamer.py
View File

@@ -26,7 +26,7 @@ class TestStream(mastertest.MasterTest):
m = master.FlowMaster(o, None, s)
sa = filestreamer.FileStreamer()
m.addons.add(o, sa)
m.addons.add(sa)
f = tutils.tflow(resp=True)
m.request(f)
m.response(f)
@@ -36,7 +36,7 @@ class TestStream(mastertest.MasterTest):
m.options.outfile = (p, "ab")
m.addons.add(o, sa)
m.addons.add(sa)
f = tutils.tflow()
m.request(f)
m.addons.remove(sa)

2
test/mitmproxy/builtins/test_replace.py
View File

@@ -39,7 +39,7 @@ class TestReplace(mastertest.MasterTest):
)
m = master.FlowMaster(o, None, s)
sa = replace.Replace()
m.addons.add(o, sa)
m.addons.add(sa)
f = tutils.tflow()
f.request.content = b"foo"

15
test/mitmproxy/builtins/test_script.py
View File

@@ -63,7 +63,7 @@ class TestScript(mastertest.MasterTest):
"data/addonscripts/recorder.py"
)
)
m.addons.add(o, sc)
m.addons.add(sc)
assert sc.ns.call_log == [
("solo", "start", (), {}),
("solo", "configure", (o, o.keys()), {})
@@ -84,7 +84,7 @@ class TestScript(mastertest.MasterTest):
with open("foo.py", "w"):
pass
sc = script.Script("foo.py")
m.addons.add(o, sc)
m.addons.add(sc)
for _ in range(100):
with open("foo.py", "a") as f:
@@ -102,7 +102,7 @@ class TestScript(mastertest.MasterTest):
sc = script.Script(
tutils.test_data.path("data/addonscripts/error.py")
)
m.addons.add(o, sc)
m.addons.add(sc)
f = tutils.tflow(resp=True)
m.request(f)
assert m.event_log[0][0] == "error"
@@ -116,7 +116,6 @@ class TestScript(mastertest.MasterTest):
o = options.Options()
fm = master.FlowMaster(o, None, s)
fm.addons.add(
o,
script.Script(
tutils.test_data.path("data/addonscripts/duplicate_flow.py")
)
@@ -136,7 +135,7 @@ class TestScript(mastertest.MasterTest):
"data/addonscripts/addon.py"
)
)
m.addons.add(o, sc)
m.addons.add(sc)
assert sc.ns.event_log == [
'scriptstart', 'addonstart', 'addonconfigure'
]
@@ -166,7 +165,7 @@ class TestScriptLoader(mastertest.MasterTest):
o = options.Options(scripts=[])
m = master.FlowMaster(o, None, s)
sl = script.ScriptLoader()
m.addons.add(o, sl)
m.addons.add(sl)
f = tutils.tflow(resp=True)
with m.handlecontext():
@@ -191,7 +190,7 @@ class TestScriptLoader(mastertest.MasterTest):
o = options.Options(scripts=[])
m = master.FlowMaster(o, None, s)
sc = script.ScriptLoader()
m.addons.add(o, sc)
m.addons.add(sc)
assert len(m.addons) == 1
o.update(
scripts = [
@@ -222,7 +221,7 @@ class TestScriptLoader(mastertest.MasterTest):
)
m = mastertest.RecordingMaster(o, None, s)
sc = script.ScriptLoader()
m.addons.add(o, sc)
m.addons.add(sc)
debug = [(i[0], i[1]) for i in m.event_log if i[0] == "debug"]
assert debug == [

4
test/mitmproxy/builtins/test_serverplayback.py
View File

@@ -242,7 +242,7 @@ class TestServerPlayback:
s = serverplayback.ServerPlayback()
o = options.Options(refresh_server_playback = True, keepserving=False)
m = mastertest.RecordingMaster(o, None, state)
m.addons.add(o, s)
m.addons.add(s)
f = tutils.tflow()
f.response = netlib.tutils.tresp(content=f.request.content)
@@ -272,7 +272,7 @@ class TestServerPlayback:
s = serverplayback.ServerPlayback()
o = options.Options(refresh_server_playback = True, replay_kill_extra=True)
m = mastertest.RecordingMaster(o, None, state)
m.addons.add(o, s)
m.addons.add(s)
f = tutils.tflow()
f.response = netlib.tutils.tresp(content=f.request.content)

2
test/mitmproxy/builtins/test_setheaders.py
View File

@@ -11,7 +11,7 @@ class TestSetHeaders(mastertest.MasterTest):
o = options.Options(**opts)
m = mastertest.RecordingMaster(o, None, s)
sh = setheaders.SetHeaders()
m.addons.add(o, sh)
m.addons.add(sh)
return m, sh
def test_configure(self):

2
test/mitmproxy/builtins/test_stickyauth.py
View File

@@ -11,7 +11,7 @@ class TestStickyAuth(mastertest.MasterTest):
o = options.Options(stickyauth = ".*")
m = master.FlowMaster(o, None, s)
sa = stickyauth.StickyAuth()
m.addons.add(o, sa)
m.addons.add(sa)
f = tutils.tflow(resp=True)
f.request.headers["authorization"] = "foo"

4
test/mitmproxy/builtins/test_stickycookie.py
View File

@@ -17,7 +17,7 @@ class TestStickyCookie(mastertest.MasterTest):
o = options.Options(stickycookie = ".*")
m = master.FlowMaster(o, None, s)
sc = stickycookie.StickyCookie()
m.addons.add(o, sc)
m.addons.add(sc)
return s, m, sc
def test_config(self):
@@ -30,7 +30,7 @@ class TestStickyCookie(mastertest.MasterTest):
def test_simple(self):
s, m, sc = self.mk()
m.addons.add(m.options, sc)
m.addons.add(sc)
f = tutils.tflow(resp=True)
f.response.headers["set-cookie"] = "foo=bar"

2
test/mitmproxy/script/test_concurrent.py
View File

@@ -23,7 +23,7 @@ class TestConcurrent(mastertest.MasterTest):
"data/addonscripts/concurrent_decorator.py"
)
)
m.addons.add(m.options, sc)
m.addons.add(sc)
f1, f2 = tutils.tflow(), tutils.tflow()
m.request(f1)
m.request(f2)

2
test/mitmproxy/test_examples.py
View File

@@ -35,7 +35,7 @@ def tscript(cmd, args=""):
cmd = example_dir.path(cmd) + " " + args
m = RaiseMaster(o, None, state.State())
sc = script.Script(cmd)
m.addons.add(o, sc)
m.addons.add(sc)
return m, sc

4
test/mitmproxy/test_server.py
View File

@@ -298,7 +298,7 @@ class TestHTTP(tservers.HTTPProxyTest, CommonMixin, AppMixin):
s = script.Script(
tutils.test_data.path("data/addonscripts/stream_modify.py")
)
self.master.addons.add(self.master.options, s)
self.master.addons.add(s)
d = self.pathod('200:b"foo"')
assert d.content == b"bar"
self.master.addons.remove(s)
@@ -572,7 +572,7 @@ class TestTransparent(tservers.TransparentProxyTest, CommonMixin, TcpMixin):
s = script.Script(
tutils.test_data.path("data/addonscripts/tcp_stream_modify.py")
)
self.master.addons.add(self.master.options, s)
self.master.addons.add(s)
self._tcpproxy_on()
d = self.pathod('200:b"foo"')
self._tcpproxy_off()

2
test/mitmproxy/tservers.py
View File

@@ -36,7 +36,7 @@ class TestMaster(flow.FlowMaster):
s = ProxyServer(config)
state = flow.State()
flow.FlowMaster.__init__(self, opts, s, state)
self.addons.add(opts, *builtins.default_addons())
self.addons.add(*builtins.default_addons())
self.apps.add(testapp, "testapp", 80)
self.apps.add(errapp, "errapp", 80)
self.clear_log()