FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Let hostname() accept a bare single-label name with the RFC 1034 dot by afonsojanu · Pull Request #479 · python-validators/validators · GitHub

  1. python-validators
  2. validators

Repository navigation

Let hostname() accept a bare single-label name with the RFC 1034 dot #479

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

Closed
afonsojanu wants to merge 1 commit into from
Conversation 1 Commits 1 Checks 0 Files changed
Closed

Let hostname() accept a bare single-label name with the RFC 1034 dot #479

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 .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
18 changes: 16 additions & 2 deletions src/validators/hostname.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,20 @@ def _simple_hostname_regex():
return re.compile(r"^(?!-)[a-z0-9](?:[a-z0-9-]{0,59}[a-z0-9])?(?<!-)$", re.IGNORECASE)


def _simple_hostname_match(value: str, rfc_1034: bool):
"""Match value against the simple hostname regex.

rfc_1034 promises an optional trailing dot is allowed, but the simple
regex above has no notion of one, so a bare single-label name like
"yu" would pass without the dot and fail with it. Strip a lone
trailing dot first when that flag is set, same as domain() already
does for its own regex, so the two paths agree.
"""
if rfc_1034 and value.endswith(".") and len(value) > 1:
value = value[:-1]
return _simple_hostname_regex().match(value)


def _port_validator(value: str):
"""Returns host segment if port is valid."""
if value.count("]:") == 1:
Expand Down Expand Up @@ -115,14 +129,14 @@ def hostname(

if may_have_port and (host_seg := _port_validator(value)):
return (
(_simple_hostname_regex().match(host_seg) if maybe_simple else False)
(_simple_hostname_match(host_seg, rfc_1034) if maybe_simple else False)
or domain(host_seg, consider_tld=consider_tld, rfc_1034=rfc_1034, rfc_2782=rfc_2782)
or (False if skip_ipv4_addr else ipv4(host_seg, cidr=False, private=private))
or (False if skip_ipv6_addr else ipv6(host_seg, cidr=False))
)

return (
(_simple_hostname_regex().match(value) if maybe_simple else False)
(_simple_hostname_match(value, rfc_1034) if maybe_simple else False)
or domain(value, consider_tld=consider_tld, rfc_1034=rfc_1034, rfc_2782=rfc_2782)
or (False if skip_ipv4_addr else ipv4(value, cidr=False, private=private))
or (False if skip_ipv6_addr else ipv6(value, cidr=False))
Expand Down
7 changes: 7 additions & 0 deletions tests/test_hostname.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
("[dead:beef:0:0:0:0000:42:1]:5731", False, False),
("[0:0:0:0:0:ffff:1.2.3.4]:80", False, False),
("[0:a:b:c:d:e:f::]:53", False, False),
# bare single-label name with the RFC 1034 trailing dot, GH-442
("yu.", True, False),
("yu.:443", True, False),
],
)
def test_returns_true_on_valid_hostname(value: str, rfc_1034: bool, rfc_2782: bool):
Expand Down Expand Up @@ -60,6 +63,10 @@ def test_returns_true_on_valid_hostname(value: str, rfc_1034: bool, rfc_2782: bo
("[dead:beef:0:-:0:-:42:1]:5731", False, False),
("[0:0:0:0:0:ffff:1.2.3.4]:-65538", False, False),
("[0:&:b:c:@:e:f:::9999", False, False),
# bad (trailing dot only allowed when rfc_1034 is requested)
("yu.", False, False),
# bad (a lone dot has no label to strip down to)
(".", True, False),
],
)
def test_returns_failed_validation_on_invalid_hostname(value: str, rfc_1034: bool, rfc_2782: bool):
Expand Down
Back | FazBrowse Home | New Git URL