Skip to content

Reject trailing newlines in hostnames and ports #513

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

Open
xiehuanyi wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −3
Open

Reject trailing newlines in hostnames and ports #513

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
6 changes: 3 additions & 3 deletions src/validators/hostname.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ def _port_validator(value: str):
if value.count("]:") == 1:
# with ipv6
host_seg, port_seg = value.rsplit(":", 1)
if _port_regex().match(f":{port_seg}"):
if _port_regex().fullmatch(f":{port_seg}"):
return host_seg.lstrip("[").rstrip("]")

if value.count(":") == 1:
# with ipv4 or simple hostname
host_seg, port_seg = value.rsplit(":", 1)
if _port_regex().match(f":{port_seg}"):
if _port_regex().fullmatch(f":{port_seg}"):
return host_seg

return None
Expand Down Expand Up @@ -120,7 +120,7 @@ def _matches_simple_hostname(host: str):
# hostname, not only on the dotted names handled by `domain()`.
if rfc_1034 and host.endswith("."):
host = host[:-1]
return _simple_hostname_regex().match(host)
return _simple_hostname_regex().fullmatch(host)

if may_have_port and (host_seg := _port_validator(value)):
return (
Expand Down
16 changes: 16 additions & 0 deletions tests/test_hostname.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,19 @@ def test_returns_true_on_hostname_within_rfc_length_limits(value: str):
def test_returns_failed_validation_on_hostname_beyond_rfc_limits(value: str):
"""Test returns failed validation on hostname beyond RFC limits."""
assert isinstance(hostname(value), ValidationError)


@pytest.mark.parametrize(
"value",
[
"ubuntu-pc\n",
"ubuntu-pc:443\n",
"example.com:443\n",
"127.0.0.1:22\n",
"[::1]:22\n",
"[dead:beef:0:0:0:0000:42:1]:5731\n",
],
)
def test_rejects_trailing_newline_in_hostnames_and_ports(value: str):
"""Test rejects trailing newline in hostnames and ports."""
assert isinstance(hostname(value), ValidationError)
Loading