aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/builtins/__init__.py0
-rw-r--r--test/mitmproxy/builtins/test_anticomp.py22
-rw-r--r--test/mitmproxy/mastertest.py8
-rw-r--r--test/mitmproxy/test_addons.py20
-rw-r--r--test/mitmproxy/test_controller.py4
-rw-r--r--test/mitmproxy/test_flow.py39
-rw-r--r--test/mitmproxy/test_script.py2
-rw-r--r--test/mitmproxy/tservers.py2
8 files changed, 72 insertions, 25 deletions
diff --git a/test/mitmproxy/builtins/__init__.py b/test/mitmproxy/builtins/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/mitmproxy/builtins/__init__.py
diff --git a/test/mitmproxy/builtins/test_anticomp.py b/test/mitmproxy/builtins/test_anticomp.py
new file mode 100644
index 00000000..6bfd54bb
--- /dev/null
+++ b/test/mitmproxy/builtins/test_anticomp.py
@@ -0,0 +1,22 @@
+from .. import tutils, mastertest
+from mitmproxy.builtins import anticomp
+from mitmproxy.flow import master
+from mitmproxy.flow import state
+from mitmproxy import options
+
+
+class TestAntiComp(mastertest.MasterTest):
+ def test_simple(self):
+ s = state.State()
+ m = master.FlowMaster(options.Options(anticomp = True), None, s)
+ sa = anticomp.AntiComp()
+ m.addons.add(sa)
+
+ f = tutils.tflow(resp=True)
+ self.invoke(m, "request", f)
+
+ f = tutils.tflow(resp=True)
+
+ f.request.headers["Accept-Encoding"] = "foobar"
+ self.invoke(m, "request", f)
+ assert f.request.headers["Accept-Encoding"] == "identity"
diff --git a/test/mitmproxy/mastertest.py b/test/mitmproxy/mastertest.py
index 9e726a32..06854e25 100644
--- a/test/mitmproxy/mastertest.py
+++ b/test/mitmproxy/mastertest.py
@@ -3,10 +3,16 @@ import mock
from . import tutils
import netlib.tutils
-from mitmproxy import flow, proxy, models
+from mitmproxy import flow, proxy, models, controller
class MasterTest:
+ def invoke(self, master, handler, message):
+ with master.handlecontext():
+ func = getattr(master, handler)
+ func(message)
+ message.reply = controller.DummyReply()
+
def cycle(self, master, content):
f = tutils.tflow(req=netlib.tutils.treq(content=content))
l = proxy.Log("connect")
diff --git a/test/mitmproxy/test_addons.py b/test/mitmproxy/test_addons.py
new file mode 100644
index 00000000..1861d4ac
--- /dev/null
+++ b/test/mitmproxy/test_addons.py
@@ -0,0 +1,20 @@
+from __future__ import absolute_import, print_function, division
+from mitmproxy import addons
+from mitmproxy import controller
+from mitmproxy import options
+
+
+class TAddon:
+ def __init__(self, name):
+ self.name = name
+
+ def __repr__(self):
+ return "Addon(%s)" % self.name
+
+
+def test_simple():
+ m = controller.Master(options.Options())
+ a = addons.Addons(m)
+ a.add(TAddon("one"))
+ assert a.has_addon("one")
+ assert not a.has_addon("two")
diff --git a/test/mitmproxy/test_controller.py b/test/mitmproxy/test_controller.py
index 5a68e15b..6d4b8fe6 100644
--- a/test/mitmproxy/test_controller.py
+++ b/test/mitmproxy/test_controller.py
@@ -25,7 +25,7 @@ class TestMaster(object):
# Speed up test
super(DummyMaster, self).tick(0)
- m = DummyMaster()
+ m = DummyMaster(None)
assert not m.should_exit.is_set()
msg = TMsg()
msg.reply = controller.DummyReply()
@@ -34,7 +34,7 @@ class TestMaster(object):
assert m.should_exit.is_set()
def test_server_simple(self):
- m = controller.Master()
+ m = controller.Master(None)
s = DummyServer(None)
m.add_server(s)
m.start()
diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py
index 74b3f599..6b270872 100644
--- a/test/mitmproxy/test_flow.py
+++ b/test/mitmproxy/test_flow.py
@@ -139,7 +139,7 @@ class TestClientPlaybackState:
def test_tick(self):
first = tutils.tflow()
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
fm.start_client_playback([first, tutils.tflow()], True)
c = fm.client_playback
c.testing = True
@@ -470,7 +470,7 @@ class TestFlow(object):
def test_kill(self):
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
f = tutils.tflow()
f.intercept(mock.Mock())
f.kill(fm)
@@ -479,7 +479,7 @@ class TestFlow(object):
def test_killall(self):
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
f = tutils.tflow()
f.intercept(fm)
@@ -714,7 +714,7 @@ class TestSerialize:
def test_load_flows(self):
r = self._treader()
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
fm.load_flows(r)
assert len(s.flows) == 6
@@ -725,7 +725,7 @@ class TestSerialize:
mode="reverse",
upstream_server=("https", ("use-this-domain", 80))
)
- fm = flow.FlowMaster(DummyServer(conf), s)
+ fm = flow.FlowMaster(None, DummyServer(conf), s)
fm.load_flows(r)
assert s.flows[0].request.host == "use-this-domain"
@@ -772,7 +772,7 @@ class TestFlowMaster:
def test_load_script(self):
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
fm.load_script(tutils.test_data.path("data/scripts/a.py"))
fm.load_script(tutils.test_data.path("data/scripts/a.py"))
@@ -788,14 +788,14 @@ class TestFlowMaster:
def test_getset_ignore(self):
p = mock.Mock()
p.config.check_ignore = HostMatcher()
- fm = flow.FlowMaster(p, flow.State())
+ fm = flow.FlowMaster(None, p, flow.State())
assert not fm.get_ignore_filter()
fm.set_ignore_filter(["^apple\.com:", ":443$"])
assert fm.get_ignore_filter()
def test_replay(self):
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
f = tutils.tflow(resp=True)
f.request.content = None
assert "missing" in fm.replay_request(f)
@@ -808,7 +808,7 @@ class TestFlowMaster:
def test_script_reqerr(self):
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
fm.load_script(tutils.test_data.path("data/scripts/reqerr.py"))
f = tutils.tflow()
fm.clientconnect(f.client_conn)
@@ -816,7 +816,7 @@ class TestFlowMaster:
def test_script(self):
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
fm.load_script(tutils.test_data.path("data/scripts/all.py"))
f = tutils.tflow(resp=True)
@@ -852,7 +852,7 @@ class TestFlowMaster:
def test_duplicate_flow(self):
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
f = tutils.tflow(resp=True)
fm.load_flow(f)
assert s.flow_count() == 1
@@ -863,14 +863,13 @@ class TestFlowMaster:
def test_create_flow(self):
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
assert fm.create_request("GET", "http", "example.com", 80, "/")
def test_all(self):
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
fm.anticache = True
- fm.anticomp = True
f = tutils.tflow(req=None)
fm.clientconnect(f.client_conn)
f.request = HTTPRequest.wrap(netlib.tutils.treq())
@@ -895,7 +894,7 @@ class TestFlowMaster:
f = tutils.tflow(resp=True)
pb = [tutils.tflow(resp=True), f]
- fm = flow.FlowMaster(DummyServer(ProxyConfig()), s)
+ fm = flow.FlowMaster(None, DummyServer(ProxyConfig()), s)
assert not fm.start_server_playback(
pb,
False,
@@ -923,7 +922,7 @@ class TestFlowMaster:
f.response = HTTPResponse.wrap(netlib.tutils.tresp(content=f.request))
pb = [f]
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
fm.refresh_server_playback = True
assert not fm.do_server_playback(tutils.tflow())
@@ -965,7 +964,7 @@ class TestFlowMaster:
f = tutils.tflow()
f.response = HTTPResponse.wrap(netlib.tutils.tresp(content=f.request))
pb = [f]
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
fm.refresh_server_playback = True
fm.start_server_playback(
pb,
@@ -985,7 +984,7 @@ class TestFlowMaster:
def test_stickycookie(self):
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
assert "Invalid" in fm.set_stickycookie("~h")
fm.set_stickycookie(".*")
assert fm.stickycookie_state
@@ -1007,7 +1006,7 @@ class TestFlowMaster:
def test_stickyauth(self):
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
assert "Invalid" in fm.set_stickyauth("~h")
fm.set_stickyauth(".*")
assert fm.stickyauth_state
@@ -1035,7 +1034,7 @@ class TestFlowMaster:
return list(r.stream())
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
f = tutils.tflow(resp=True)
with open(p, "ab") as tmpfile:
diff --git a/test/mitmproxy/test_script.py b/test/mitmproxy/test_script.py
index 81994780..1e8220f1 100644
--- a/test/mitmproxy/test_script.py
+++ b/test/mitmproxy/test_script.py
@@ -4,7 +4,7 @@ from . import tutils
def test_duplicate_flow():
s = flow.State()
- fm = flow.FlowMaster(None, s)
+ fm = flow.FlowMaster(None, None, s)
fm.load_script(tutils.test_data.path("data/scripts/duplicate_flow.py"))
f = tutils.tflow()
fm.request(f)
diff --git a/test/mitmproxy/tservers.py b/test/mitmproxy/tservers.py
index 0760cb53..69a50b9d 100644
--- a/test/mitmproxy/tservers.py
+++ b/test/mitmproxy/tservers.py
@@ -34,7 +34,7 @@ class TestMaster(flow.FlowMaster):
config.port = 0
s = ProxyServer(config)
state = flow.State()
- flow.FlowMaster.__init__(self, s, state)
+ flow.FlowMaster.__init__(self, None, s, state)
self.apps.add(testapp, "testapp", 80)
self.apps.add(errapp, "errapp", 80)
self.clear_log()
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-29 12:04:34 +0000