eyhc
/
rendercv
mirror of https://github.com/eyhc1/rendercv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hostname validity (not domain name)

This commit is contained in:
Jeffrey Goldberg 2023-12-03 01:24:05 -06:00
parent 7aa7e66523
commit ac4d0e3484
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rendercv/data_model.py
View File

@ -1057,12 +1057,11 @@ class Connection(BaseModel):
value: str value: str
@staticmethod @staticmethod
def is_valid_fqdn(hostname: str) -> bool: def is_valid_hostname(hostname: str) -> bool:
"""Is hostname a valid fully qualified domain name.""" """Is hostname a valid hostname by RFCs 952 and 1123"""
# cribbed from # slightly modified from
# https://stackoverflow.com/a/33214423/1304076 # https://stackoverflow.com/a/33214423/1304076
# because I couldn't find a useful method in dnspython.
if hostname[-1] == ".": if hostname[-1] == ".":
# strip exactly one dot from the right, if present # strip exactly one dot from the right, if present
hostname = hostname[:-1] hostname = hostname[:-1]
@ -1071,7 +1070,7 @@ class Connection(BaseModel):
labels = hostname.split(".") labels = hostname.split(".")
# the TLD must be not all-numeric # the last label must be not all-numeric
if re.match(r"[0-9]+$", labels[-1]): if re.match(r"[0-9]+$", labels[-1]):
return False return False
@ -1113,7 +1112,8 @@ class Connection(BaseModel):
# MENTION_RE = %r{(?<![=/[:word:]])@((#{USERNAME_RE})(?:@[[:word:].-]+[[:word:]]+)?)}i # MENTION_RE = %r{(?<![=/[:word:]])@((#{USERNAME_RE})(?:@[[:word:].-]+[[:word:]]+)?)}i
# #
# `[[:word:]]` in Ruby includes lots of things that could never be in a # domain name. As my intent here is to construct an HTTPS URL, # `[[:word:]]` in Ruby includes lots of things that could never be in a # domain name. As my intent here is to construct an HTTPS URL,
# I will use a more restrictive set of characters. # What we need are valid hostnames,
# and so need to satisfy the constraints of RFC 952 and and 1123.
pattern = re.compile( pattern = re.compile(
r""" r"""
@ -1135,7 +1135,7 @@ class Connection(BaseModel):
# the domain part of pattern allows some things that are not # the domain part of pattern allows some things that are not
# valid names. So we run a stricter check # valid names. So we run a stricter check
if not Connection.is_valid_fqdn(domain): if not Connection.is_valid_hostname(domain):
raise ValueError("Invalid hostname in mastodon address") raise ValueError("Invalid hostname in mastodon address")
url = HttpUrl(f"https://{domain}/@{uname}") url = HttpUrl(f"https://{domain}/@{uname}")