aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Fink2026-11-13 17:00:10 +0100
committerDennis Fink2026-11-13 17:00:10 +0100
commit6d9cfbabafd373aaca7b9f9ed607f9aa4b39f3b9 (patch)
treec057f5cfa5f066a85537efa2da56afd49b8ae7d7
parent3496b3882ca08e74c108d5abe417eccec5ed4f48 (diff)
downloadwebmentions-ssg-6d9cfbabafd373aaca7b9f9ed607f9aa4b39f3b9.tar.gz
webmentions-ssg-6d9cfbabafd373aaca7b9f9ed607f9aa4b39f3b9.zip
refactor(core): extract hostname resolution helper
Move DNS resolution and address parsing into a dedicated helper so public address validation resolves hostnames through a single, testable path.
-rw-r--r--tests/test_net.py10
-rw-r--r--webmentions_ssg/net.py27
2 files changed, 24 insertions, 13 deletions
diff --git a/tests/test_net.py b/tests/test_net.py
index 928a0d5..05ae5a4 100644
--- a/tests/test_net.py
+++ b/tests/test_net.py
@@ -191,6 +191,16 @@ def test_ip_literal_does_not_use_dns() -> None:
dns_resolve.assert_not_called()
+def test_public_addresses_resolves_hostname_once() -> None:
+ with patch("webmentions_ssg.net.dns.resolver.resolve_name") as resolve:
+ resolve.return_value.addresses.return_value = ["93.184.216.34", "8.8.8.8"]
+ assert public_addresses("example.com", lifetime=1.5) == (
+ "93.184.216.34",
+ "8.8.8.8",
+ )
+ resolve.assert_called_once_with("example.com", lifetime=1.5)
+
+
@pytest.mark.parametrize(
"address",
[
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}")