Skip to content

Reject malformed port values #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Mirochill wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −5
Draft

Reject malformed port values #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/hyperlink/_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ def __nonzero__(self):
r"|(?P<bad_host>.*?))?"
r"(?::(?P<port>.*))?$"
)
_PORT_RE = re.compile(r"\A[0-9]+\Z")


_HEX_CHAR_MAP = dict(
Expand Down Expand Up @@ -1407,12 +1408,11 @@ def from_text(cls, text):
host = au_gs["ipv6_host"] or au_gs["plain_host"]
port = au_gs["port"]
if port is not None:
try:
port = int(port) # type: ignore[assignment] # FIXME, see below
except ValueError:
if not port: # TODO: excessive?
raise URLParseError("port must not be empty: %r" % au_text)
if not port: # TODO: excessive?
raise URLParseError("port must not be empty: %r" % au_text)
if not _PORT_RE.match(port):
raise URLParseError("expected integer for port, not %r" % port)
port = int(port) # type: ignore[assignment] # FIXME, see below

scheme = gs["scheme"] or u""
fragment = gs["fragment"] or u""
Expand Down
8 changes: 8 additions & 0 deletions src/hyperlink/test/test_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,6 +1114,14 @@ def test_invalid_ipv6(self):
def test_invalid_port(self):
# type: () -> None
self.assertRaises(URLParseError, URL.from_text, "ftp://portmouth:smash")
for url_text in [
"http://example.com: 11",
"http://example.com:+11",
"http://example.com:-11",
"http://example.com:1_1",
u"http://example.com:\u0ed1",
]:
self.assertRaises(URLParseError, URL.from_text, url_text)
self.assertRaises(
ValueError,
URL.from_text,
Expand Down