Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2025-01-30 14:58:38 +00:00
Code Issues Projects Releases Wiki Activity

Further simplifcation and testing of contentviews.

Browse Source
This commit is contained in:
Aldo Cortesi 2012-08-18 17:29:29 +12:00
parent 11c63dcb9f
commit e8553f966f
3 changed files with 37 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmproxy/console/__init__.py
View File

@ -255,7 +255,7 @@ class ConsoleState(flow.State):
flow.State.__init__(self) flow.State.__init__(self)
self.focus = None self.focus = None
self.follow_focus = None self.follow_focus = None
self.default_body_view = contentview.ViewAuto self.default_body_view = contentview.get("Auto")
self.view_flow_mode = common.VIEW_FLOW_REQUEST self.view_flow_mode = common.VIEW_FLOW_REQUEST
self.last_script = "" self.last_script = ""
self.last_saveload = "" self.last_saveload = ""

41
libmproxy/console/contentview.py
View File

@ -42,6 +42,18 @@ class ViewAuto:
name = "Auto" name = "Auto"
prompt = ("auto", "a") prompt = ("auto", "a")
content_types = [] content_types = []
def __call__(self, hdrs, content, limit):
ctype = hdrs.get("content-type")
if ctype:
ctype = ctype[0]
ct = utils.parse_content_type(ctype) if ctype else None
if ct:
ct = "%s/%s"%(ct[0], ct[1])
if ct in content_types_map:
return content_types_map[ct][0](hdrs, content, limit)
elif utils.isXML(content):
return get("XML")(hdrs, content, limit)
return get("Raw")(hdrs, content, limit)
class ViewRaw: class ViewRaw:
@ -324,26 +336,6 @@ def get(name):
return i return i
def get_view_func(viewmode, hdrs, content):
"""
Returns a function object.
"""
if viewmode.name == "Auto":
ctype = hdrs.get("content-type")
if ctype:
ctype = ctype[0]
ct = utils.parse_content_type(ctype) if ctype else None
if ct:
ct = "%s/%s"%(ct[0], ct[1])
if ct in content_types_map:
return content_types_map[ct][0]
elif utils.isXML(content):
return ViewXML
return ViewRaw
else:
return viewmode
def get_content_view(viewmode, hdrItems, content, limit): def get_content_view(viewmode, hdrItems, content, limit):
""" """
Returns a (msg, body) tuple. Returns a (msg, body) tuple.
@ -358,13 +350,12 @@ def get_content_view(viewmode, hdrItems, content, limit):
if decoded: if decoded:
content = decoded content = decoded
msg.append("[decoded %s]"%enc[0]) msg.append("[decoded %s]"%enc[0])
func = get_view_func(viewmode, hdrs, content)
try: try:
ret = func(hdrs, content, limit) ret = viewmode(hdrs, content, limit)
# Third-party viewers can fail in unexpected ways... # Third-party viewers can fail in unexpected ways...
except Exception, e: except Exception, e:
#s = traceback.format_exc() s = traceback.format_exc()
#return "", _view_text(s, len(s), len(s)) return "", _view_text(s, len(s), len(s))
ret = None ret = None
if not ret: if not ret:
ret = get("Raw")(hdrs, content, limit) ret = get("Raw")(hdrs, content, limit)
@ -372,5 +363,3 @@ def get_content_view(viewmode, hdrItems, content, limit):
else: else:
msg.append(ret[0]) msg.append(ret[0])
return " ".join(msg), ret[1] return " ".join(msg), ret[1]

58
test/test_console_contentview.py
View File

@ -11,61 +11,42 @@ class TestContentView:
cv.trailer(cv.VIEW_CUTOFF + 10, txt, cv.VIEW_CUTOFF) cv.trailer(cv.VIEW_CUTOFF + 10, txt, cv.VIEW_CUTOFF)
assert txt assert txt
def test_get_view_func(self): def test_view_auto(self):
f = cv.get_view_func( v = cv.ViewAuto()
cv.get("Hex"), f = v(
flow.ODictCaseless(), flow.ODictCaseless(),
"foo" "foo",
1000
) )
assert f.name == "Hex" assert f[0] == "Raw"
f = cv.get_view_func( f = v(
cv.get("Auto"),
flow.ODictCaseless(),
"foo"
)
assert f.name == "Raw"
f = cv.get_view_func(
cv.get("Auto"),
flow.ODictCaseless( flow.ODictCaseless(
[["content-type", "text/html"]], [["content-type", "text/html"]],
), ),
"foo" "<html></html>",
1000
) )
assert f.name == "HTML" assert f[0] == "HTML"
f = cv.get_view_func( f = v(
cv.get("Auto"),
flow.ODictCaseless( flow.ODictCaseless(
[["content-type", "text/flibble"]], [["content-type", "text/flibble"]],
), ),
"foo" "foo",
1000
) )
assert f.name == "Raw" assert f[0] == "Raw"
f = cv.get_view_func( f = v(
cv.get("Auto"),
flow.ODictCaseless( flow.ODictCaseless(
[["content-type", "text/flibble"]], [["content-type", "text/flibble"]],
), ),
"<xml></xml>" "<xml></xml>",
1000
) )
assert f.name == "XML" assert f[0].startswith("XML")
try:
import pyamf
f = cv.get_view_func(
cv.get("Auto"),
flow.ODictCaseless(
[["content-type", "application/x-amf"]],
),
""
)
assert f.name == "AMF"
except ImportError:
pass
def test_view_urlencoded(self): def test_view_urlencoded(self):
d = utils.urlencode([("one", "two"), ("three", "four")]) d = utils.urlencode([("one", "two"), ("three", "four")])
@ -223,3 +204,6 @@ Larry
assert "decoded gzip" in r[0] assert "decoded gzip" in r[0]
assert "Raw" in r[0] assert "Raw" in r[0]
def test_get_by_shortcut():
assert cv.get_by_shortcut("h")