rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changing suggested flaws

Browse Source
This commit is contained in:
Jesko 2018-08-08 18:30:12 +02:00
parent 484a22f111
commit 972b3ae960
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/utils/urlmatch.py
View File

@ -183,8 +183,8 @@ class UrlPattern:
# Using QUrl parsing to minimize ipv6 addresses
url = QUrl()
url.setHost("[" + parsed.hostname + "]")
if url.host() == "":
raise ParseError("Invalid IPv6 URL"+parsed.hostname)
if not url.isValid():
raise ParseError(url.errorString())
self._host = url.host()
return

17
tests/unit/utils/test_urlmatch.py
View File

@ -85,16 +85,17 @@ from qutebrowser.utils import urlmatch
# Additional tests
("http://[", "Invalid IPv6 URL"),
("http://[fc2e:bb88::edac]:", "Invalid port: Port is empty"),
("http://[fc2e::bb88::edac]", "Invalid IPv6 URL"),
("http://[fc2e:0e35:bb88::edac:fc2e:0e35:bb88:edac]", "Invalid IPv6 URL"),
("http://[fc2e:0e35:bb88:af:edac:fc2e:0e35:bb88:edac]", "Invalid IPv6 URL"),
("http://[127.0.0.1:fc2e::bb88:edac]", "Invalid IPv6 URL"),
("http://[fc2e::bb88::edac]", """Invalid IPv6 address (character ':' not permitted); source was "[fc2e::bb88::edac]"; host = """""),
("http://[fc2e:0e35:bb88::edac:fc2e:0e35:bb88:edac]", 'Invalid IPv6 address; source was "[fc2e:0e35:bb88::edac:fc2e:0e35:bb88:edac]"; host = ""'),
("http://[fc2e:0e35:bb88:af:edac:fc2e:0e35:bb88:edac]", 'Invalid IPv6 address; source was "[fc2e:0e35:bb88:af:edac:fc2e:0e35:bb88:edac]"; host = ""'),
("http://[127.0.0.1:fc2e::bb88:edac]", """Invalid IPv6 address (character '1' not permitted); source was "[127.0.0.1:fc2e::bb88:edac]"; host = """""),
("http://[]:20", "Pattern without host"),
("http://[fc2e::bb88", "Invalid IPv6 URL"),
("http://[[fc2e::bb88:edac]", "Invalid IPv6 URL"),
("http://[fc2e::bb88:edac]]", "Invalid IPv6 URL"),
("http://[fc2e:bb88:edac]", "Invalid IPv6 URL"),
("http://[fc2e:bb88:edac::z]", "Invalid IPv6 URL"),
("http://[[fc2e::bb88:edac]", """Invalid IPv6 address (character '[' not permitted); source was "[[fc2e::bb88:edac]"; host = """""),
pytest.param("http://[fc2e::bb88:edac]]", "Invalid IPv6 URL", marks=pytest.mark.xfail(
reason="https://bugs.python.org/issue34360")),
("http://[fc2e:bb88:edac]", 'Invalid IPv6 address; source was "[fc2e:bb88:edac]"; host = ""'),
("http://[fc2e:bb88:edac::z]", """Invalid IPv6 address (character 'z' not permitted); source was "[fc2e:bb88:edac::z]"; host = """""),
("http://[fc2e:bb88:edac::2]:2a2", "Invalid port: invalid literal for int() with base 10: '2a2'"),
])