diff options
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/console/contentview.py | 4 | ||||
| -rw-r--r-- | libmproxy/protocol/http_wrappers.py | 13 | ||||
| -rw-r--r-- | libmproxy/utils.py | 56 |
3 files changed, 2 insertions, 71 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index ce5ac6ea..95ea7b17 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/console/contentview.py @@ -76,7 +76,7 @@ class ViewAuto: def __call__(self, hdrs, content, limit): ctype = hdrs.get_first("content-type") if ctype: - ct = utils.parse_content_type(ctype) if ctype else None + ct = netlib.utils.parse_content_type(ctype) if ctype else None ct = "%s/%s" % (ct[0], ct[1]) if ct in content_types_map: return content_types_map[ct][0](hdrs, content, limit) @@ -241,7 +241,7 @@ class ViewMultipart: content_types = ["multipart/form-data"] def __call__(self, hdrs, content, limit): - v = utils.multipartdecode(hdrs, content) + v = netlib.utils.multipartdecode(hdrs, content) if v: r = [ urwid.Text(("highlight", "Form data:\n")), diff --git a/libmproxy/protocol/http_wrappers.py b/libmproxy/protocol/http_wrappers.py index 758ebfe0..ed5759ea 100644 --- a/libmproxy/protocol/http_wrappers.py +++ b/libmproxy/protocol/http_wrappers.py @@ -219,14 +219,6 @@ class HTTPRequest(MessageMixin, semantics.Request): is_replay=bool ) - # This list is adopted legacy code. - # We probably don't need to strip off keep-alive. - _headers_to_strip_off = ['Proxy-Connection', - 'Keep-Alive', - 'Connection', - 'Transfer-Encoding', - 'Upgrade'] - @classmethod def from_state(cls, state): f = cls( @@ -360,11 +352,6 @@ class HTTPResponse(MessageMixin, semantics.Response): msg=str ) - _headers_to_strip_off = ['Proxy-Connection', - 'Alternate-Protocol', - 'Alt-Svc'] - - @classmethod def from_state(cls, state): f = cls(None, None, None, None, None) diff --git a/libmproxy/utils.py b/libmproxy/utils.py index 22ab4344..3ac3cc01 100644 --- a/libmproxy/utils.py +++ b/libmproxy/utils.py @@ -61,34 +61,6 @@ def pretty_json(s): return json.dumps(p, sort_keys=True, indent=4).split("\n") -def multipartdecode(hdrs, content): - """ - Takes a multipart boundary encoded string and returns list of (key, value) tuples. - """ - v = hdrs.get_first("content-type") - if v: - v = parse_content_type(v) - if not v: - return [] - boundary = v[2].get("boundary") - if not boundary: - return [] - - rx = re.compile(r'\bname="([^"]+)"') - r = [] - - for i in content.split("--" + boundary): - parts = i.splitlines() - if len(parts) > 1 and parts[0][0:2] != "--": - match = rx.search(parts[1]) - if match: - key = match.group(1) - value = "".join(parts[3 + parts[2:].index(""):]) - r.append((key, value)) - return r - return [] - - def pretty_duration(secs): formatters = [ (100, "{:.0f}s"), @@ -154,34 +126,6 @@ class LRUCache: return ret -def parse_content_type(c): - """ - A simple parser for content-type values. Returns a (type, subtype, - parameters) tuple, where type and subtype are strings, and parameters - is a dict. If the string could not be parsed, return None. - - E.g. the following string: - - text/html; charset=UTF-8 - - Returns: - - ("text", "html", {"charset": "UTF-8"}) - """ - parts = c.split(";", 1) - ts = parts[0].split("/", 1) - if len(ts) != 2: - return None - d = {} - if len(parts) == 2: - for i in parts[1].split(";"): - clause = i.split("=", 1) - if len(clause) == 2: - d[clause[0].strip()] = clause[1].strip() - return ts[0].lower(), ts[1].lower(), d - - - def clean_hanging_newline(t): """ Many editors will silently add a newline to the final line of a |