mirror of https://github.com/django/django.git
Simplified django.http.request.split_domain_port().
Use the capture groups from the regular expression that has already been matched to avoid resplitting and the need to special case for IPv6.
This commit is contained in:
parent
c77fbda7ce
commit
ee36c332b2
|
@ -30,7 +30,7 @@ from django.utils.regex_helper import _lazy_re_compile
|
|||
|
||||
RAISE_ERROR = object()
|
||||
host_validation_re = _lazy_re_compile(
|
||||
r"^([a-z0-9.-]+|\[[a-f0-9]*:[a-f0-9\.:]+\])(:[0-9]+)?$"
|
||||
r"^([a-z0-9.-]+|\[[a-f0-9]*:[a-f0-9.:]+\])(?::([0-9]+))?$"
|
||||
)
|
||||
|
||||
|
||||
|
@ -698,19 +698,11 @@ def split_domain_port(host):
|
|||
Returned domain is lowercased. If the host is invalid, the domain will be
|
||||
empty.
|
||||
"""
|
||||
host = host.lower()
|
||||
|
||||
if not host_validation_re.match(host):
|
||||
return "", ""
|
||||
|
||||
if host[-1] == "]":
|
||||
# It's an IPv6 address without a port.
|
||||
return host, ""
|
||||
bits = host.rsplit(":", 1)
|
||||
domain, port = bits if len(bits) == 2 else (bits[0], "")
|
||||
# Remove a trailing dot (if present) from the domain.
|
||||
domain = domain.removesuffix(".")
|
||||
return domain, port
|
||||
if match := host_validation_re.fullmatch(host.lower()):
|
||||
domain, port = match.groups(default="")
|
||||
# Remove a trailing dot (if present) from the domain.
|
||||
return domain.removesuffix("."), port
|
||||
return "", ""
|
||||
|
||||
|
||||
def validate_host(host, allowed_hosts):
|
||||
|
|
Loading…
Reference in New Issue