diff options
Diffstat (limited to 'libmproxy/console/contentview.py')
| -rw-r--r-- | libmproxy/console/contentview.py | 166 |
1 files changed, 87 insertions, 79 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index 446eb350..c6e43a27 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/console/contentview.py @@ -1,6 +1,6 @@ import urwid import common -from .. import utils, encoding +from .. import utils, encoding, flow VIEW_CUTOFF = 1024*100 @@ -20,19 +20,18 @@ VIEW_CONTENT_PRETTY_TYPE_XML = 2 VIEW_CONTENT_PRETTY_TYPE_URLENCODED = 3 CONTENT_PRETTY_NAMES = { - VIEW_CONTENT_PRETTY_TYPE_JSON: "json", - VIEW_CONTENT_PRETTY_TYPE_XML: "xmlish", - VIEW_CONTENT_PRETTY_TYPE_URLENCODED: "urlencoded" + VIEW_CONTENT_PRETTY_TYPE_JSON: "JSON", + VIEW_CONTENT_PRETTY_TYPE_XML: "XML", + VIEW_CONTENT_PRETTY_TYPE_URLENCODED: "URL-encoded" } -CONTENT_PRETTY_TYPES = { +CONTENT_TYPES_MAP = { "text/html": VIEW_CONTENT_PRETTY_TYPE_XML, "application/json": VIEW_CONTENT_PRETTY_TYPE_JSON, "text/xml": VIEW_CONTENT_PRETTY_TYPE_XML, "multipart/form-data": VIEW_CONTENT_PRETTY_TYPE_URLENCODED } - def trailer(clen, txt): rem = clen - VIEW_CUTOFF if rem > 0: @@ -45,16 +44,18 @@ def trailer(clen, txt): ) ) -def view_flow_raw(content): + +def view_raw(hdrs, content): txt = [] for i in utils.cleanBin(content[:VIEW_CUTOFF]).splitlines(): txt.append( urwid.Text(("text", i)) ) trailer(len(content), txt) - return txt + return "Raw", txt + -def view_flow_binary(content): +def view_hex(hdrs, content): txt = [] for offset, hexa, s in utils.hexdump(content[:VIEW_CUTOFF]): txt.append(urwid.Text([ @@ -65,31 +66,37 @@ def view_flow_binary(content): ("text", s), ])) trailer(len(content), txt) - return txt + return "HEX", txt -def view_flow_xmlish(content): + +def view_xmlish(hdrs, content): txt = [] for i in utils.pretty_xmlish(content[:VIEW_CUTOFF]): txt.append( urwid.Text(("text", i)), ) trailer(len(content), txt) - return txt + return "XML-like data", txt + + +def view_json(hdrs, content): + lines = utils.pretty_json(content) + if lines: + txt = [] + sofar = 0 + for i in lines: + sofar += len(i) + txt.append( + urwid.Text(("text", i)), + ) + if sofar > VIEW_CUTOFF: + break + trailer(sum(len(i) for i in lines), txt) + return "JSON", txt -def view_flow_json(lines): - txt = [] - sofar = 0 - for i in lines: - sofar += len(i) - txt.append( - urwid.Text(("text", i)), - ) - if sofar > VIEW_CUTOFF: - break - trailer(sum(len(i) for i in lines), txt) - return txt -def view_flow_formdata(content, boundary): +# FIXME +def view_formdata(content, boundary): rx = re.compile(r'\bname="([^"]+)"') keys = [] vals = [] @@ -113,65 +120,66 @@ def view_flow_formdata(content, boundary): )) return r -def view_flow_urlencoded(lines): - return common.format_keyvals( - [(k+":", v) for (k, v) in lines], - key = "header", - val = "text" - ) - -def find_pretty_view(content, hdrItems, pretty_type=VIEW_CONTENT_PRETTY_TYPE_AUTO): - ctype = None - if pretty_type == VIEW_CONTENT_PRETTY_TYPE_AUTO: - pretty_type == None - for i in hdrItems: - if i[0].lower() == "content-type": - ctype = i[1] - break - ct = utils.parse_content_type(ctype) if ctype else None - if ct: - pretty_type = CONTENT_PRETTY_TYPES.get("%s/%s"%(ct[0], ct[1])) - if not pretty_type and utils.isXML(content): - pretty_type = VIEW_CONTENT_PRETTY_TYPE_XML - - if pretty_type == VIEW_CONTENT_PRETTY_TYPE_URLENCODED: - data = utils.urldecode(content) - if data: - return "URLEncoded form", view_flow_urlencoded(data) - - if pretty_type == VIEW_CONTENT_PRETTY_TYPE_XML: - return "Indented XML-ish", view_flow_xmlish(content) - if pretty_type == VIEW_CONTENT_PRETTY_TYPE_JSON: - lines = utils.pretty_json(content) - if lines: - return "JSON", view_flow_json(lines) +def view_urlencoded(hdrs, content): + lines = utils.urldecode(content) + if lines: + body = common.format_keyvals( + [(k+":", v) for (k, v) in lines], + key = "header", + val = "text" + ) + return "URLEncoded form", body - return "Falling back to raw.", view_flow_raw(content) +PRETTY_FUNCTION_MAP = { + VIEW_CONTENT_PRETTY_TYPE_XML: view_xmlish, + VIEW_CONTENT_PRETTY_TYPE_JSON: view_json, + VIEW_CONTENT_PRETTY_TYPE_URLENCODED: view_urlencoded +} -def get_content_view(viewmode, pretty_type, enc, content, hdrItems): +def get_view_func(viewmode, pretty_type, hdrs, content): """ - Returns a (msg, body) tuple. + Returns a function object. """ - msg = "" if viewmode == VIEW_CONTENT_HEX: - body = view_flow_binary(content) - elif viewmode == VIEW_CONTENT_PRETTY: - emsg = "" - if enc: - decoded = encoding.decode(enc, content) - if decoded: - content = decoded - if enc and enc != "identity": - emsg = "[decoded %s]"%enc - msg, body = find_pretty_view(content, hdrItems, pretty_type) - if pretty_type != VIEW_CONTENT_PRETTY_TYPE_AUTO: - emsg += " (forced to %s)"%(CONTENT_PRETTY_NAMES[pretty_type]) - if emsg: - msg = emsg + " " + msg + return view_hex + elif viewmode == VIEW_CONTENT_RAW: + return view_raw else: - body = view_flow_raw(content) - return msg, body - - + if pretty_type == VIEW_CONTENT_PRETTY_TYPE_AUTO: + ctype = hdrs.get("content-type") + if ctype: + ctype = ctype[0] + ct = utils.parse_content_type(ctype) if ctype else None + if ct: + pretty_type = CONTENT_TYPES_MAP.get("%s/%s"%(ct[0], ct[1])) + if not pretty_type and utils.isXML(content): + pretty_type = VIEW_CONTENT_PRETTY_TYPE_XML + return PRETTY_FUNCTION_MAP.get(pretty_type, view_raw) + + +def get_content_view(viewmode, pretty_type, hdrItems, content): + """ + Returns a (msg, body) tuple. + """ + msg = [] + + hdrs = flow.ODictCaseless([list(i) for i in hdrItems]) + + enc = hdrs.get("content-encoding") + if enc and enc[0] != "identity": + decoded = encoding.decode(enc[0], content) + if decoded: + content = decoded + msg.append("[decoded %s]"%enc[0]) + + if viewmode == VIEW_CONTENT_PRETTY and pretty_type != VIEW_CONTENT_PRETTY_TYPE_AUTO: + msg.append("[forced to %s]"%(CONTENT_PRETTY_NAMES[pretty_type])) + func = get_view_func(viewmode, pretty_type, hdrs, content) + + ret = func(hdrs, content) + if not ret: + ret = view_raw(hdrs, content) + msg.append(ret[0]) + return " ".join(msg), ret[1] |