aboutsummaryrefslogtreecommitdiff
path: root/webmentions_ssg
diff options
context:
space:
mode:
Diffstat (limited to 'webmentions_ssg')
-rw-r--r--webmentions_ssg/net.py27
1 files changed, 14 insertions, 13 deletions
diff --git a/webmentions_ssg/net.py b/webmentions_ssg/net.py
index b88e2d8..9a6ecfb 100644
--- a/webmentions_ssg/net.py
+++ b/webmentions_ssg/net.py
@@ -197,6 +197,18 @@ def is_public_address(address: ipaddress.IPv4Address | ipaddress.IPv6Address) ->
return address.is_global
+def resolve_hostname(
+ hostname: str, *, lifetime: float | None = None
+) -> tuple[ipaddress.IPv4Address | ipaddress.IPv6Address, ...]:
+ try:
+ answers = dns.resolver.resolve_name(hostname, lifetime=lifetime)
+ return tuple(ipaddress.ip_address(a) for a in answers.addresses())
+ except (dns.exception.DNSException, ValueError) as exc:
+ raise AddressResolutionError(
+ f"Could not resolve hostname {hostname!r}"
+ ) from exc
+
+
def public_addresses(
hostname: str, *, lifetime: float | None = None
) -> tuple[str, ...]:
@@ -208,20 +220,9 @@ def public_addresses(
them and then connecting to ``hostname`` reintroduces DNS rebinding.
"""
try:
- literal = ipaddress.ip_address(hostname)
+ addresses = (ipaddress.ip_address(hostname),)
except ValueError:
- literal = None
-
- if literal is not None:
- addresses = (literal,)
- else:
- try:
- answers = dns.resolver.resolve_name(hostname, lifetime=lifetime)
- addresses = tuple(ipaddress.ip_address(a) for a in answers.addresses())
- except (dns.exception.DNSException, ValueError) as exc:
- raise AddressResolutionError(
- f"Could not resolve hostname {hostname!r}"
- ) from exc
+ addresses = resolve_hostname(hostname, lifetime=lifetime)
if not addresses:
raise AddressResolutionError(f"Could not resolve hostname {hostname!r}")