aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-03-11 16:44:55 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-03-11 16:44:55 +0100
commit1bfc27c3f644c7edd20b7911209dc072ba9965ad (patch)
tree800f27e7dc510ab6ed36dc8eb6e98f6152bc3bd9
parentc1c3fe3c8855d005bb951f844455a66e43213604 (diff)
parent5a1c3c4ad818df9355bb71326bc810e4ce361cb6 (diff)
downloadmitmproxy-1bfc27c3f644c7edd20b7911209dc072ba9965ad.tar.gz
mitmproxy-1bfc27c3f644c7edd20b7911209dc072ba9965ad.tar.bz2
mitmproxy-1bfc27c3f644c7edd20b7911209dc072ba9965ad.zip
Merge pull request #1008 from dufferzafar/test-examples
Some tests for examples
-rw-r--r--examples/__init__.py0
-rw-r--r--examples/iframe_injector.py2
-rw-r--r--examples/modify_form.py6
-rw-r--r--examples/modify_querystring.py5
-rw-r--r--test/mitmproxy/test_examples.py119
-rw-r--r--test/mitmproxy/test_flow_export.py1
-rw-r--r--test/mitmproxy/test_har_extractor.py37
7 files changed, 123 insertions, 47 deletions
diff --git a/examples/__init__.py b/examples/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/examples/__init__.py
+++ /dev/null
diff --git a/examples/iframe_injector.py b/examples/iframe_injector.py
index fc38b136..ad844f19 100644
--- a/examples/iframe_injector.py
+++ b/examples/iframe_injector.py
@@ -14,7 +14,7 @@ def response(context, flow):
if flow.request.host in context.iframe_url:
return
with decoded(flow.response): # Remove content encoding (gzip, ...)
- html = BeautifulSoup(flow.response.content)
+ html = BeautifulSoup(flow.response.content, "lxml")
if html.body:
iframe = html.new_tag(
"iframe",
diff --git a/examples/modify_form.py b/examples/modify_form.py
index 3e9d15c0..86188781 100644
--- a/examples/modify_form.py
+++ b/examples/modify_form.py
@@ -1,5 +1,5 @@
def request(context, flow):
- if "application/x-www-form-urlencoded" in flow.request.headers.get("content-type", ""):
- form = flow.request.get_form_urlencoded()
+ form = flow.request.urlencoded_form
+ if form is not None:
form["mitmproxy"] = ["rocks"]
- flow.request.set_form_urlencoded(form)
+ flow.request.urlencoded_form = form
diff --git a/examples/modify_querystring.py b/examples/modify_querystring.py
index 7f31a48f..d682df69 100644
--- a/examples/modify_querystring.py
+++ b/examples/modify_querystring.py
@@ -1,6 +1,5 @@
-
def request(context, flow):
- q = flow.request.get_query()
+ q = flow.request.query
if q:
q["mitmproxy"] = ["rocks"]
- flow.request.set_query(q)
+ flow.request.query = q
diff --git a/test/mitmproxy/test_examples.py b/test/mitmproxy/test_examples.py
index 163ace17..803776ac 100644
--- a/test/mitmproxy/test_examples.py
+++ b/test/mitmproxy/test_examples.py
@@ -1,11 +1,42 @@
import glob
+import json
+import os
+from contextlib import contextmanager
+
from mitmproxy import utils, script
from mitmproxy.proxy import config
-from . import tservers
+from netlib import tutils as netutils
+from netlib.http import Headers
+from . import tservers, tutils
+
+example_dir = utils.Data(__name__).path("../../examples")
+
+
+class DummyContext(object):
+ """Emulate script.ScriptContext() functionality."""
+
+ contentview = None
+
+ def log(self, *args, **kwargs):
+ pass
+
+ def add_contentview(self, view_obj):
+ self.contentview = view_obj
+
+ def remove_contentview(self, view_obj):
+ self.contentview = None
+
+
+@contextmanager
+def example(command):
+ command = os.path.join(example_dir, command)
+ ctx = DummyContext()
+ s = script.Script(command, ctx)
+ yield s
+ s.unload()
def test_load_scripts():
- example_dir = utils.Data(__name__).path("../../examples")
scripts = glob.glob("%s/*.py" % example_dir)
tmaster = tservers.TestMaster(config.ProxyConfig())
@@ -28,3 +59,87 @@ def test_load_scripts():
raise
else:
s.unload()
+
+
+def test_add_header():
+ flow = tutils.tflow(resp=netutils.tresp())
+ with example("add_header.py") as ex:
+ ex.run("response", flow)
+ assert flow.response.headers["newheader"] == "foo"
+
+
+def test_custom_contentviews():
+ with example("custom_contentviews.py") as ex:
+ pig = ex.ctx.contentview
+ _, fmt = pig("<html>test!</html>")
+ assert any('esttay!' in val[0][1] for val in fmt)
+ assert not pig("gobbledygook")
+
+
+def test_iframe_injector():
+ with tutils.raises(script.ScriptException):
+ with example("iframe_injector.py") as ex:
+ pass
+
+ flow = tutils.tflow(resp=netutils.tresp(content="<html>mitmproxy</html>"))
+ with example("iframe_injector.py http://example.org/evil_iframe") as ex:
+ ex.run("response", flow)
+ content = flow.response.content
+ assert 'iframe' in content and 'evil_iframe' in content
+
+
+def test_modify_form():
+ form_header = Headers(content_type="application/x-www-form-urlencoded")
+ flow = tutils.tflow(req=netutils.treq(headers=form_header))
+ with example("modify_form.py") as ex:
+ ex.run("request", flow)
+ assert flow.request.urlencoded_form["mitmproxy"] == ["rocks"]
+
+
+def test_modify_querystring():
+ flow = tutils.tflow(req=netutils.treq(path="/search?q=term"))
+ with example("modify_querystring.py") as ex:
+ ex.run("request", flow)
+ assert flow.request.query["mitmproxy"] == ["rocks"]
+
+
+def test_modify_response_body():
+ with tutils.raises(script.ScriptException):
+ with example("modify_response_body.py") as ex:
+ pass
+
+ flow = tutils.tflow(resp=netutils.tresp(content="I <3 mitmproxy"))
+ with example("modify_response_body.py mitmproxy rocks") as ex:
+ assert ex.ctx.old == "mitmproxy" and ex.ctx.new == "rocks"
+ ex.run("response", flow)
+ assert flow.response.content == "I <3 rocks"
+
+
+def test_redirect_requests():
+ flow = tutils.tflow(req=netutils.treq(host="example.org"))
+ with example("redirect_requests.py") as ex:
+ ex.run("request", flow)
+ assert flow.request.host == "mitmproxy.org"
+
+
+def test_har_extractor():
+ with tutils.raises(script.ScriptException):
+ with example("har_extractor.py") as ex:
+ pass
+
+ times = dict(
+ timestamp_start=746203272,
+ timestamp_end=746203272,
+ )
+
+ flow = tutils.tflow(
+ req=netutils.treq(**times),
+ resp=netutils.tresp(**times)
+ )
+
+ with example("har_extractor.py -") as ex:
+ ex.run("response", flow)
+
+ with open(tutils.test_data.path("data/har_extractor.har")) as fp:
+ test_data = json.load(fp)
+ assert json.loads(ex.ctx.HARLog.json()) == test_data["test_response"]
diff --git a/test/mitmproxy/test_flow_export.py b/test/mitmproxy/test_flow_export.py
index 3dc07427..62161d5d 100644
--- a/test/mitmproxy/test_flow_export.py
+++ b/test/mitmproxy/test_flow_export.py
@@ -1,4 +1,3 @@
-import json
from textwrap import dedent
import netlib.tutils
diff --git a/test/mitmproxy/test_har_extractor.py b/test/mitmproxy/test_har_extractor.py
deleted file mode 100644
index 7838f713..00000000
--- a/test/mitmproxy/test_har_extractor.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import json
-import netlib.tutils
-from . import tutils
-
-from examples import har_extractor
-
-
-class Context(object):
- pass
-
-
-trequest = netlib.tutils.treq(
- timestamp_start=746203272,
- timestamp_end=746203272,
-)
-
-tresponse = netlib.tutils.tresp(
- timestamp_start=746203272,
- timestamp_end=746203272,
-)
-
-
-def test_start():
- tutils.raises(ValueError, har_extractor.start, Context(), [])
-
-
-def test_response():
- ctx = Context()
- ctx.HARLog = har_extractor._HARLog([])
- ctx.seen_server = set()
-
- fl = tutils.tflow(req=trequest, resp=tresponse)
- har_extractor.response(ctx, fl)
-
- with open(tutils.test_data.path("data/har_extractor.har")) as fp:
- test_data = json.load(fp)
- assert json.loads(ctx.HARLog.json()) == test_data["test_response"]