Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

parse_url: Handle invalid IPv6 addresses

This commit is contained in:
Aldo Cortesi 2013-03-03 15:12:58 +13:00
parent 7b9300743e
commit b21a7da142
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netlib/http.py
View File

@ -21,7 +21,10 @@ def parse_url(url):
host is a valid IDNA-encoded hostname with no null-bytes host is a valid IDNA-encoded hostname with no null-bytes
path is valid ASCII path is valid ASCII
""" """
try:
scheme, netloc, path, params, query, fragment = urlparse.urlparse(url) scheme, netloc, path, params, query, fragment = urlparse.urlparse(url)
except ValueError:
return None
if not scheme: if not scheme:
return None return None
if ':' in netloc: if ':' in netloc:

7
test/test_http.py
View File

@ -294,11 +294,14 @@ def test_parse_url():
# Invalid IDNA # Invalid IDNA
assert not http.parse_url("http://\xfafoo") assert not http.parse_url("http://\xfafoo")
# Invalid PATH
assert not http.parse_url("http:/\xc6/localhost:56121") assert not http.parse_url("http:/\xc6/localhost:56121")
# Null byte in host
assert not http.parse_url("http://foo\0") assert not http.parse_url("http://foo\0")
# Port out of range
assert not http.parse_url("http://foo:999999") assert not http.parse_url("http://foo:999999")
# Invalid IPv6 URL - see http://www.ietf.org/rfc/rfc2732.txt
assert not http.parse_url('http://lo[calhost')
def test_parse_http_basic_auth(): def test_parse_http_basic_auth():
vals = ("basic", "foo", "bar") vals = ("basic", "foo", "bar")