@fedify/webfinger 2.4.5-dev.2462 → 2.4.5

package/dist/lookup.test.js

@@ -1,10 +1,11 @@
 import { createTestMeterProvider, test } from "@fedify/fixture";
-import { FetchError, UrlError, getUserAgent, validatePublicUrl } from "@fedify/vocab-runtime";
+import { FetchError, UrlError, getUserAgent } from "@fedify/vocab-runtime";
 import { configure, getLogger, reset } from "@logtape/logtape";
 import { withTimeout } from "es-toolkit";
 import { deepStrictEqual, ok } from "node:assert/strict";
-import dns from "node:dns/promises";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
+import { openDirectFetch, openPublicFetch } from "@fedify/vocab-runtime/internal";
+import { test as test$1 } from "node:test";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -1235,7 +1236,7 @@ var esm_default = new class FetchMock {
 //#endregion
 //#region deno.json
 var name = "@fedify/webfinger";
-var version = "2.4.5-dev.2462+46a3f2c5";
+var version = "2.4.5";
 //#endregion
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */
@@ -1311,13 +1312,223 @@ async function readBoundedText(message, maxBytes, url) {
 	}
 }
 //#endregion
-//#region src/lookup.ts
+//#region src/lookup-impl.ts
 const logger = getLogger([
 	"fedify",
 	"webfinger",
 	"lookup"
 ]);
 const DEFAULT_MAX_REDIRECTION = 5;
+/**
+* Looks up a WebFinger resource, opening a fetch session per hop.  This is
+* the implementation of {@link lookupWebFinger}, which is not exported from
+* the package entry point.
+* @param resource The resource URL to look up.
+* @param options Extra options for looking up the resource.
+* @param deps The dependencies.
+* @returns The resource descriptor and terminal lookup classification.
+* @internal
+*/
+async function lookupWebFingerInternal(resource, options = {}, deps = {}) {
+	if (typeof resource === "string") resource = new URL(resource);
+	let protocol = "https:";
+	let server;
+	if (resource.protocol === "acct:" || resource.protocol === "mailto:") {
+		const atPos = resource.pathname.lastIndexOf("@");
+		if (atPos < 0) return {
+			resource: null,
+			result: "invalid"
+		};
+		server = resource.pathname.substring(atPos + 1);
+		if (server === "" || /[/?#]/.test(server)) return {
+			resource: null,
+			result: "invalid"
+		};
+		if (resource.protocol === "acct:" && (resource.search !== "" || resource.hash !== "")) return {
+			resource: null,
+			result: "invalid"
+		};
+	} else {
+		protocol = resource.protocol;
+		server = resource.host;
+	}
+	let url = new URL(`${protocol}//${server}/.well-known/webfinger`);
+	url.searchParams.set("resource", resource.href);
+	const openHop = deps.openHop ?? ((hopUrl) => options.allowPrivateAddress === true ? openDirectFetch(hopUrl) : openPublicFetch(hopUrl, { signal: options.signal }));
+	let redirected = 0;
+	while (true) {
+		logger.debug("Fetching WebFinger resource descriptor from {url}...", { url: url.href });
+		const remoteHost = url.host;
+		const session = await openSession(url, openHop, options.signal);
+		if (session == null) return {
+			resource: null,
+			result: "network_error",
+			remoteHost
+		};
+		let hop;
+		try {
+			hop = await fetchHop(session, url, options);
+		} finally {
+			await session.close();
+		}
+		if ("outcome" in hop) return hop.outcome;
+		redirected++;
+		const maxRedirection = options.maxRedirection ?? DEFAULT_MAX_REDIRECTION;
+		if (redirected > maxRedirection) {
+			logger.error("Too many redirections ({redirections}) while fetching WebFinger resource descriptor.", { redirections: redirected });
+			return {
+				resource: null,
+				result: "invalid",
+				statusCode: hop.statusCode,
+				remoteHost
+			};
+		}
+		let redirectedUrl;
+		try {
+			redirectedUrl = new URL(hop.redirect, url);
+		} catch (error) {
+			logger.error("Invalid Location header while following WebFinger redirect: {error}", {
+				url: url.href,
+				error
+			});
+			return {
+				resource: null,
+				result: "invalid",
+				statusCode: hop.statusCode,
+				remoteHost
+			};
+		}
+		if (redirectedUrl.protocol !== url.protocol) {
+			logger.error("Redirected to a different protocol ({protocol} to {redirectedProtocol}) while fetching WebFinger resource descriptor.", {
+				protocol: url.protocol,
+				redirectedProtocol: redirectedUrl.protocol
+			});
+			return {
+				resource: null,
+				result: "invalid",
+				statusCode: hop.statusCode,
+				remoteHost
+			};
+		}
+		url = redirectedUrl;
+	}
+}
+/**
+* Opens a fetch session for a hop.  A disallowed URL, a failed DNS lookup,
+* or an aborted lookup yields `null` instead of an error.
+*/
+async function openSession(url, openHop, signal) {
+	try {
+		return await openHop(url.href);
+	} catch (e) {
+		if (e instanceof UrlError) {
+			if (e.reason === "dns") logger.debug("DNS lookup failed for {url}", {
+				url: url.href,
+				error: e
+			});
+			else logger.error("Invalid URL for WebFinger resource descriptor: {error}", { error: e });
+			return null;
+		}
+		if (signal?.aborted) {
+			logger.debug("Failed to fetch WebFinger resource descriptor: {error}", {
+				url: url.href,
+				error: e
+			});
+			return null;
+		}
+		throw e;
+	}
+}
+/**
+* Fetches a hop with the given session, and consumes the response body or
+* starts cancelling it before returning.  The caller closes the session.
+*/
+async function fetchHop(session, url, options) {
+	let response;
+	try {
+		response = await session.fetch(url, {
+			headers: {
+				Accept: "application/jrd+json",
+				"User-Agent": typeof options.userAgent === "string" ? options.userAgent : getUserAgent(options.userAgent)
+			},
+			redirect: "manual",
+			signal: options.signal
+		});
+	} catch (error) {
+		logger.debug("Failed to fetch WebFinger resource descriptor: {error}", {
+			url: url.href,
+			error
+		});
+		return { outcome: {
+			resource: null,
+			result: "network_error",
+			remoteHost: url.host
+		} };
+	}
+	if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
+		cancelBody(response, url);
+		return {
+			redirect: response.headers.get("Location"),
+			statusCode: response.status
+		};
+	}
+	if (!response.ok) {
+		logger.debug("Failed to fetch WebFinger resource descriptor: {status} {statusText}.", {
+			url: url.href,
+			status: response.status,
+			statusText: response.statusText
+		});
+		cancelBody(response, url);
+		return { outcome: {
+			resource: null,
+			result: response.status === 404 || response.status === 410 ? "not_found" : "error",
+			statusCode: response.status,
+			remoteHost: url.host
+		} };
+	}
+	try {
+		return { outcome: {
+			resource: JSON.parse(await readBoundedText(response, MAX_BODY_SIZE, url)),
+			result: "found",
+			statusCode: response.status,
+			remoteHost: url.host
+		} };
+	} catch (e) {
+		if (e instanceof BodyTooLargeError) return { outcome: {
+			resource: null,
+			result: "invalid",
+			statusCode: response.status,
+			remoteHost: url.host
+		} };
+		if (e instanceof SyntaxError) {
+			logger.debug("Failed to parse WebFinger resource descriptor as JSON: {error}", { error: e });
+			return { outcome: {
+				resource: null,
+				result: "invalid",
+				statusCode: response.status,
+				remoteHost: url.host
+			} };
+		}
+		throw e;
+	}
+}
+/**
+* Starts cancelling a response body that is not read, without waiting for it
+* to settle.  The cancellation of a branch of a tee (e.g., a body cloned by
+* a fetch mock) settles only after the other branch is cancelled too, per
+* the Streams standard, so awaiting it could block forever.  A failure is
+* only logged.
+*/
+function cancelBody(response, url) {
+	response.body?.cancel().catch((error) => {
+		logger.debug("Failed to cancel the response body from {url}: {error}", {
+			url: url.href,
+			error
+		});
+	});
+}
+//#endregion
+//#region src/lookup.ts
 const WEBFINGER_HISTOGRAM_BUCKETS = [
 	5,
 	10,
@@ -1371,13 +1582,11 @@ function getMetricResourceScheme(scheme) {
 	return WEBFINGER_LOOKUP_SCHEME_WHITELIST.has(scheme) ? scheme : "other";
 }
 /**
-* Looks up a WebFinger resource.
-* @param resource The resource URL to look up.
-* @param options Extra options for looking up the resource.
-* @returns The resource descriptor, or `null` if not found.
-* @since 0.2.0
+* The lookup implementation with injectable hop sessions for tests.
+* Not exported from the package entry point.
+* @internal
 */
-async function lookupWebFinger(resource, options = {}) {
+async function lookupWebFingerWithDependencies(resource, options = {}, deps = {}) {
 	const tracer = (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version);
 	const scheme = getResourceScheme(resource);
 	return await tracer.startActiveSpan("webfinger.lookup", {
@@ -1394,7 +1603,7 @@ async function lookupWebFinger(resource, options = {}) {
 			result: "error"
 		};
 		try {
-			outcome = await lookupWebFingerInternal(resource, options);
+			outcome = await lookupWebFingerInternal(resource, options, deps);
 			span.setStatus({ code: outcome.resource === null ? SpanStatusCode.ERROR : SpanStatusCode.OK });
 			return outcome.resource;
 		} catch (error) {
@@ -1420,181 +1629,56 @@ function recordWebFingerLookup(meterProvider, durationMs, scheme, outcome) {
 	instruments.lookup.add(1, attributes);
 	instruments.lookupDuration.record(durationMs, attributes);
 }
-async function lookupWebFingerInternal(resource, options = {}) {
-	if (typeof resource === "string") resource = new URL(resource);
-	let protocol = "https:";
-	let server;
-	if (resource.protocol === "acct:" || resource.protocol === "mailto:") {
-		const atPos = resource.pathname.lastIndexOf("@");
-		if (atPos < 0) return {
-			resource: null,
-			result: "invalid"
-		};
-		server = resource.pathname.substring(atPos + 1);
-		if (server === "" || /[/?#]/.test(server)) return {
-			resource: null,
-			result: "invalid"
-		};
-		if (resource.protocol === "acct:" && (resource.search !== "" || resource.hash !== "")) return {
-			resource: null,
-			result: "invalid"
-		};
-	} else {
-		protocol = resource.protocol;
-		server = resource.host;
-	}
-	let url = new URL(`${protocol}//${server}/.well-known/webfinger`);
-	url.searchParams.set("resource", resource.href);
-	let redirected = 0;
-	while (true) {
-		const remoteHost = url.host;
-		logger.debug("Fetching WebFinger resource descriptor from {url}...", { url: url.href });
-		let response;
-		if (options.allowPrivateAddress !== true) try {
-			await validatePublicUrl(url.href);
-		} catch (e) {
-			if (e instanceof UrlError) {
-				if (e.reason === "dns") logger.debug("DNS lookup failed for {url}", {
-					url: url.href,
-					error: e
-				});
-				else logger.error("Invalid URL for WebFinger resource descriptor: {error}", { error: e });
-				return {
-					resource: null,
-					result: "network_error",
-					remoteHost
-				};
-			}
-			throw e;
-		}
-		try {
-			response = await fetch(url, {
-				headers: {
-					Accept: "application/jrd+json",
-					"User-Agent": typeof options.userAgent === "string" ? options.userAgent : getUserAgent(options.userAgent)
-				},
-				redirect: "manual",
-				signal: options.signal
-			});
-		} catch (error) {
-			logger.debug("Failed to fetch WebFinger resource descriptor: {error}", {
-				url: url.href,
-				error
-			});
-			return {
-				resource: null,
-				result: "network_error",
-				remoteHost
-			};
-		}
-		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
-			redirected++;
-			const maxRedirection = options.maxRedirection ?? DEFAULT_MAX_REDIRECTION;
-			if (redirected > maxRedirection) {
-				logger.error("Too many redirections ({redirections}) while fetching WebFinger resource descriptor.", { redirections: redirected });
-				return {
-					resource: null,
-					result: "invalid",
-					statusCode: response.status,
-					remoteHost
-				};
-			}
-			let redirectedUrl;
-			try {
-				redirectedUrl = new URL(response.headers.get("Location"), response.url == null || response.url === "" ? url : response.url);
-			} catch (e) {
-				logger.error("Invalid Location header while following WebFinger redirect: {error}", {
-					url: url.href,
-					error: e
-				});
-				return {
-					resource: null,
-					result: "invalid",
-					statusCode: response.status,
-					remoteHost
-				};
-			}
-			if (redirectedUrl.protocol !== url.protocol) {
-				logger.error("Redirected to a different protocol ({protocol} to {redirectedProtocol}) while fetching WebFinger resource descriptor.", {
-					protocol: url.protocol,
-					redirectedProtocol: redirectedUrl.protocol
-				});
-				return {
-					resource: null,
-					result: "invalid",
-					statusCode: response.status,
-					remoteHost
-				};
-			}
-			url = redirectedUrl;
-			continue;
-		}
-		if (!response.ok) {
-			logger.debug("Failed to fetch WebFinger resource descriptor: {status} {statusText}.", {
-				url: url.href,
-				status: response.status,
-				statusText: response.statusText
-			});
-			return {
-				resource: null,
-				result: response.status === 404 || response.status === 410 ? "not_found" : "error",
-				statusCode: response.status,
-				remoteHost
-			};
-		}
-		try {
-			return {
-				resource: JSON.parse(await readBoundedText(response, MAX_BODY_SIZE, url)),
-				result: "found",
-				statusCode: response.status,
-				remoteHost
-			};
-		} catch (e) {
-			if (e instanceof BodyTooLargeError) return {
-				resource: null,
-				result: "invalid",
-				statusCode: response.status,
-				remoteHost
-			};
-			if (e instanceof SyntaxError) {
-				logger.debug("Failed to parse WebFinger resource descriptor as JSON: {error}", { error: e });
-				return {
-					resource: null,
-					result: "invalid",
-					statusCode: response.status,
-					remoteHost
-				};
-			}
-			throw e;
-		}
-	}
-}
 //#endregion
 //#region src/lookup.test.ts
+function lookupMock(resource, options = {}) {
+	if (resource.toString().includes("fedify-test.internal")) return lookupWebFingerWithDependencies(resource, options, { openHop: (url) => Promise.resolve({
+		url: new URL(url),
+		fetch: () => Promise.reject(/* @__PURE__ */ new TypeError("Connection refused")),
+		close: () => Promise.resolve()
+	}) });
+	return lookupWebFingerWithDependencies(resource, options, { openHop: options.allowPrivateAddress === true ? openDirectFetch : openExampleDirectly });
+}
+function lookupDirect(resource, options) {
+	return lookupWebFingerWithDependencies(resource, options, { openHop: openDirectFetch });
+}
+function lookupResolving(addresses) {
+	return () => Promise.resolve(addresses);
+}
+function openExampleDirectly(url) {
+	return new URL(url).hostname === "example.com" ? openDirectFetch(url) : openPublicFetch(url, { lookup: lookupResolving([{
+		address: "93.184.215.14",
+		family: 4
+	}]) });
+}
+async function lookupResourceWithDependencies(resource, options, deps) {
+	return (await lookupWebFingerInternal(resource, options, deps)).resource;
+}
 test({
 	name: "lookupWebFinger()",
 	sanitizeOps: false,
 	sanitizeResources: false,
 	async fn(t) {
+		const responseTimers = [];
 		await t.step("invalid resource", async () => {
-			deepStrictEqual(await lookupWebFinger("acct:johndoe"), null);
-			deepStrictEqual(await lookupWebFinger(new URL("acct:johndoe")), null);
-			deepStrictEqual(await lookupWebFinger("acct:johndoe@"), null);
-			deepStrictEqual(await lookupWebFinger(new URL("acct:johndoe@")), null);
-			deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com/exploit"), null);
-			deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com?x=1"), null);
-			deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com#frag"), null);
+			deepStrictEqual(await lookupMock("acct:johndoe"), null);
+			deepStrictEqual(await lookupMock(new URL("acct:johndoe")), null);
+			deepStrictEqual(await lookupMock("acct:johndoe@"), null);
+			deepStrictEqual(await lookupMock(new URL("acct:johndoe@")), null);
+			deepStrictEqual(await lookupMock("acct:johndoe@example.com/exploit"), null);
+			deepStrictEqual(await lookupMock("acct:johndoe@example.com?x=1"), null);
+			deepStrictEqual(await lookupMock("acct:johndoe@example.com#frag"), null);
 		});
 		await t.step("connection refused", async () => {
-			deepStrictEqual(await lookupWebFinger("acct:johndoe@fedify-test.internal"), null);
-			deepStrictEqual(await lookupWebFinger("https://fedify-test.internal/foo"), null);
+			deepStrictEqual(await lookupMock("acct:johndoe@fedify-test.internal"), null);
+			deepStrictEqual(await lookupMock("https://fedify-test.internal/foo"), null);
 		});
 		esm_default.spyGlobal();
 		try {
 			esm_default.get("begin:https://example.com/.well-known/webfinger?", { status: 404 });
 			await t.step("not found", async () => {
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com"), null);
-				deepStrictEqual(await lookupWebFinger("https://example.com/foo"), null);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com"), null);
+				deepStrictEqual(await lookupMock("https://example.com/foo"), null);
 			});
 			const expected = {
 				subject: "acct:johndoe@example.com",
@@ -1603,7 +1687,7 @@ test({
 			esm_default.removeRoutes();
 			esm_default.get("https://example.com/.well-known/webfinger?resource=acct%3Ajohndoe%40example.com", { body: expected });
 			await t.step("acct", async () => {
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com"), expected);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com"), expected);
 			});
 			const expected2 = {
 				subject: "https://example.com/foo",
@@ -1612,7 +1696,7 @@ test({
 			esm_default.removeRoutes();
 			esm_default.get("https://example.com/.well-known/webfinger?resource=https%3A%2F%2Fexample.com%2Ffoo", { body: expected2 });
 			await t.step("https", async () => {
-				deepStrictEqual(await lookupWebFinger("https://example.com/foo"), expected2);
+				deepStrictEqual(await lookupMock("https://example.com/foo"), expected2);
 			});
 			const mailtoExpected = {
 				subject: "mailto:juliet@example.com",
@@ -1621,7 +1705,7 @@ test({
 			esm_default.removeRoutes();
 			esm_default.get("https://example.com/.well-known/webfinger?resource=mailto%3Ajuliet%40example.com", { body: mailtoExpected });
 			await t.step("mailto", async () => {
-				deepStrictEqual(await lookupWebFinger("mailto:juliet@example.com"), mailtoExpected);
+				deepStrictEqual(await lookupMock("mailto:juliet@example.com"), mailtoExpected);
 			});
 			const mailtoQueryExpected = {
 				subject: "mailto:juliet@example.com?subject=Hi",
@@ -1630,12 +1714,12 @@ test({
 			esm_default.removeRoutes();
 			esm_default.get("https://example.com/.well-known/webfinger?resource=mailto%3Ajuliet%40example.com%3Fsubject%3DHi", { body: mailtoQueryExpected });
 			await t.step("mailto with hfields", async () => {
-				deepStrictEqual(await lookupWebFinger("mailto:juliet@example.com?subject=Hi"), mailtoQueryExpected);
+				deepStrictEqual(await lookupMock("mailto:juliet@example.com?subject=Hi"), mailtoQueryExpected);
 			});
 			esm_default.removeRoutes();
 			esm_default.get("begin:https://example.com/.well-known/webfinger?", { body: "not json" });
 			await t.step("invalid response", async () => {
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com"), null);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com"), null);
 			});
 			esm_default.removeRoutes();
 			esm_default.get("begin:https://localhost/.well-known/webfinger?", {
@@ -1647,8 +1731,8 @@ test({
 				}]
 			});
 			await t.step("private address", async () => {
-				deepStrictEqual(await lookupWebFinger("acct:test@localhost"), null);
-				deepStrictEqual(await lookupWebFinger("acct:test@localhost", { allowPrivateAddress: true }), {
+				deepStrictEqual(await lookupMock("acct:test@localhost"), null);
+				deepStrictEqual(await lookupMock("acct:test@localhost", { allowPrivateAddress: true }), {
 					subject: "acct:test@localhost",
 					links: [{
 						rel: "self",
@@ -1664,7 +1748,7 @@ test({
 			});
 			esm_default.get("begin:https://example.com/.well-known/webfinger2", { body: expected });
 			await t.step("redirection", async () => {
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com"), expected);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com"), expected);
 			});
 			esm_default.removeRoutes();
 			esm_default.get("begin:https://example.com/.well-known/webfinger?", {
@@ -1672,7 +1756,7 @@ test({
 				headers: { Location: "/.well-known/webfinger" }
 			});
 			await t.step("infinite redirection", async () => {
-				deepStrictEqual(await withTimeout(() => lookupWebFinger("acct:johndoe@example.com"), 2e3), null);
+				deepStrictEqual(await withTimeout(() => lookupMock("acct:johndoe@example.com"), 2e3), null);
 			});
 			esm_default.removeRoutes();
 			esm_default.get("begin:https://example.com/.well-known/webfinger?", {
@@ -1680,7 +1764,7 @@ test({
 				headers: { Location: "ftp://example.com/" }
 			});
 			await t.step("redirection to different protocol", async () => {
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com"), null);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com"), null);
 			});
 			esm_default.removeRoutes();
 			esm_default.get("begin:https://example.com/.well-known/webfinger?", {
@@ -1688,7 +1772,7 @@ test({
 				headers: { Location: "https://localhost/" }
 			});
 			await t.step("redirection to private address", async () => {
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com"), null);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com"), null);
 			});
 			esm_default.removeRoutes();
 			let redirectCount = 0;
@@ -1702,13 +1786,13 @@ test({
 			});
 			await t.step("custom maxRedirection", async () => {
 				redirectCount = 0;
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com", { maxRedirection: 1 }), null);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com", { maxRedirection: 1 }), null);
 				redirectCount = 0;
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com", { maxRedirection: 2 }), expected);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com", { maxRedirection: 2 }), expected);
 				redirectCount = 0;
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com", { maxRedirection: 3 }), expected);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com", { maxRedirection: 3 }), expected);
 				redirectCount = 0;
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com"), expected);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com"), expected);
 			});
 			await t.step("maxRedirection: 1 follows exactly one redirect", async () => {
 				esm_default.removeRoutes();
@@ -1720,7 +1804,7 @@ test({
 						headers: { Location: "/.well-known/webfinger?after=1" }
 					} : { body: expected };
 				});
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com", { maxRedirection: 1 }), expected);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com", { maxRedirection: 1 }), expected);
 				esm_default.removeRoutes();
 				count = 0;
 				esm_default.get("begin:https://example.com/.well-known/webfinger", () => {
@@ -1730,18 +1814,18 @@ test({
 						headers: { Location: `/.well-known/webfinger?after=${count}` }
 					} : { body: expected };
 				});
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com", { maxRedirection: 1 }), null);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com", { maxRedirection: 1 }), null);
 			});
 			esm_default.removeRoutes();
 			esm_default.get("begin:https://example.com/.well-known/webfinger?", () => new Promise((resolve) => {
 				const timeoutId = setTimeout(() => {
 					resolve({ body: expected });
 				}, 1e3);
-				return () => clearTimeout(timeoutId);
+				responseTimers.push(timeoutId);
 			}));
 			await t.step("request cancellation", async () => {
 				const controller = new AbortController();
-				const promise = lookupWebFinger("acct:johndoe@example.com", { signal: controller.signal });
+				const promise = lookupMock("acct:johndoe@example.com", { signal: controller.signal });
 				controller.abort();
 				deepStrictEqual(await promise, null);
 			});
@@ -1757,12 +1841,12 @@ test({
 					const timeoutId = setTimeout(() => {
 						resolve({ body: expected });
 					}, 1e3);
-					return () => clearTimeout(timeoutId);
+					responseTimers.push(timeoutId);
 				});
 			});
 			await t.step("cancellation during redirection", async () => {
 				const controller = new AbortController();
-				const promise = lookupWebFinger("acct:johndoe@example.com", { signal: controller.signal });
+				const promise = lookupMock("acct:johndoe@example.com", { signal: controller.signal });
 				setTimeout(() => controller.abort(), 100);
 				deepStrictEqual(await promise, null);
 			});
@@ -1771,19 +1855,20 @@ test({
 				const timeoutId = setTimeout(() => {
 					resolve({ body: expected });
 				}, 500);
-				return () => clearTimeout(timeoutId);
+				responseTimers.push(timeoutId);
 			}));
 			await t.step("cancellation with immediate abort", async () => {
 				const controller = new AbortController();
 				controller.abort();
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com", { signal: controller.signal }), null);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com", { signal: controller.signal }), null);
 			});
 			esm_default.removeRoutes();
 			esm_default.get("begin:https://example.com/.well-known/webfinger?", { body: expected });
 			await t.step("successful request with signal", async () => {
-				deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com", { signal: new AbortController().signal }), expected);
+				deepStrictEqual(await lookupMock("acct:johndoe@example.com", { signal: new AbortController().signal }), expected);
 			});
 		} finally {
+			for (const timer of responseTimers) clearTimeout(timer);
 			esm_default.removeRoutes();
 			esm_default.hardReset();
 		}
@@ -1803,7 +1888,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 			esm_default.removeRoutes();
 			esm_default.get("https://example.com/.well-known/webfinger?resource=acct%3Ajohndoe%40example.com", { body: expected });
 			const [meterProvider, recorder] = createTestMeterProvider();
-			deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com", { meterProvider }), expected);
+			deepStrictEqual(await lookupMock("acct:johndoe@example.com", { meterProvider }), expected);
 			const counters = recorder.getMeasurements("webfinger.lookup");
 			deepStrictEqual(counters.length, 1);
 			deepStrictEqual(counters[0].type, "counter");
@@ -1826,7 +1911,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 				links: []
 			} });
 			const [meterProvider, recorder] = createTestMeterProvider();
-			await lookupWebFinger("https://example.com/foo", { meterProvider });
+			await lookupMock("https://example.com/foo", { meterProvider });
 			const counters = recorder.getMeasurements("webfinger.lookup");
 			deepStrictEqual(counters.length, 1);
 			deepStrictEqual(counters[0].attributes["webfinger.resource.scheme"], "https");
@@ -1839,7 +1924,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 				links: []
 			} });
 			const [meterProvider, recorder] = createTestMeterProvider();
-			await lookupWebFinger("https://example.com:8443/foo", { meterProvider });
+			await lookupMock("https://example.com:8443/foo", { meterProvider });
 			const counter = recorder.getMeasurement("webfinger.lookup");
 			ok(counter != null);
 			deepStrictEqual(counter.attributes["activitypub.remote.host"], "example.com:8443");
@@ -1848,7 +1933,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 			esm_default.removeRoutes();
 			esm_default.get("begin:https://example.com/.well-known/webfinger?", { status: 404 });
 			const [meterProvider, recorder] = createTestMeterProvider();
-			deepStrictEqual(await lookupWebFinger("acct:johndoe@example.com", { meterProvider }), null);
+			deepStrictEqual(await lookupMock("acct:johndoe@example.com", { meterProvider }), null);
 			const counters = recorder.getMeasurements("webfinger.lookup");
 			deepStrictEqual(counters.length, 1);
 			deepStrictEqual(counters[0].attributes["webfinger.lookup.result"], "not_found");
@@ -1862,7 +1947,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 			esm_default.removeRoutes();
 			esm_default.get("begin:https://example.com/.well-known/webfinger?", { status: 410 });
 			const [meterProvider, recorder] = createTestMeterProvider();
-			await lookupWebFinger("acct:johndoe@example.com", { meterProvider });
+			await lookupMock("acct:johndoe@example.com", { meterProvider });
 			const counter = recorder.getMeasurement("webfinger.lookup");
 			ok(counter != null);
 			deepStrictEqual(counter.attributes["webfinger.lookup.result"], "not_found");
@@ -1872,7 +1957,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 			esm_default.removeRoutes();
 			esm_default.get("begin:https://example.com/.well-known/webfinger?", { status: 500 });
 			const [meterProvider, recorder] = createTestMeterProvider();
-			await lookupWebFinger("acct:johndoe@example.com", { meterProvider });
+			await lookupMock("acct:johndoe@example.com", { meterProvider });
 			const counter = recorder.getMeasurement("webfinger.lookup");
 			ok(counter != null);
 			deepStrictEqual(counter.attributes["webfinger.lookup.result"], "error");
@@ -1882,7 +1967,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 			esm_default.removeRoutes();
 			esm_default.get("begin:https://example.com/.well-known/webfinger?", { body: "not json" });
 			const [meterProvider, recorder] = createTestMeterProvider();
-			await lookupWebFinger("acct:johndoe@example.com", { meterProvider });
+			await lookupMock("acct:johndoe@example.com", { meterProvider });
 			const counter = recorder.getMeasurement("webfinger.lookup");
 			ok(counter != null);
 			deepStrictEqual(counter.attributes["webfinger.lookup.result"], "invalid");
@@ -1891,7 +1976,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 		await t.step("records result=network_error when fetch never reaches the remote", async () => {
 			esm_default.removeRoutes();
 			const [meterProvider, recorder] = createTestMeterProvider();
-			deepStrictEqual(await lookupWebFinger("acct:johndoe@fedify-test.internal", { meterProvider }), null);
+			deepStrictEqual(await lookupMock("acct:johndoe@fedify-test.internal", { meterProvider }), null);
 			const counter = recorder.getMeasurement("webfinger.lookup");
 			ok(counter != null);
 			deepStrictEqual(counter.attributes["webfinger.lookup.result"], "network_error");
@@ -1900,7 +1985,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 		});
 		await t.step("records result=invalid for malformed acct: resources", async () => {
 			const [meterProvider, recorder] = createTestMeterProvider();
-			deepStrictEqual(await lookupWebFinger("acct:johndoe", { meterProvider }), null);
+			deepStrictEqual(await lookupMock("acct:johndoe", { meterProvider }), null);
 			const counter = recorder.getMeasurement("webfinger.lookup");
 			ok(counter != null);
 			deepStrictEqual(counter.attributes["webfinger.lookup.result"], "invalid");
@@ -1914,7 +1999,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 				headers: { Location: "/.well-known/webfinger" }
 			});
 			const [meterProvider, recorder] = createTestMeterProvider();
-			deepStrictEqual(await withTimeout(() => lookupWebFinger("acct:johndoe@example.com", {
+			deepStrictEqual(await withTimeout(() => lookupMock("acct:johndoe@example.com", {
 				meterProvider,
 				maxRedirection: 3
 			}), 2e3), null);
@@ -1931,7 +2016,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 				headers: { Location: "ftp://example.com/" }
 			});
 			const [meterProvider, recorder] = createTestMeterProvider();
-			await lookupWebFinger("acct:johndoe@example.com", { meterProvider });
+			await lookupMock("acct:johndoe@example.com", { meterProvider });
 			const counter = recorder.getMeasurement("webfinger.lookup");
 			ok(counter != null);
 			deepStrictEqual(counter.attributes["webfinger.lookup.result"], "invalid");
@@ -1944,7 +2029,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 				headers: { Location: "https://localhost/" }
 			});
 			const [meterProvider, recorder] = createTestMeterProvider();
-			await lookupWebFinger("acct:johndoe@example.com", { meterProvider });
+			await lookupMock("acct:johndoe@example.com", { meterProvider });
 			const counter = recorder.getMeasurement("webfinger.lookup");
 			ok(counter != null);
 			deepStrictEqual(counter.attributes["webfinger.lookup.result"], "network_error");
@@ -1957,7 +2042,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 				headers: { Location: "http://[bad" }
 			});
 			const [meterProvider, recorder] = createTestMeterProvider();
-			await lookupWebFinger("acct:johndoe@example.com", { meterProvider });
+			await lookupMock("acct:johndoe@example.com", { meterProvider });
 			const counter = recorder.getMeasurement("webfinger.lookup");
 			ok(counter != null);
 			deepStrictEqual(counter.attributes["webfinger.lookup.result"], "invalid");
@@ -1967,7 +2052,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 		await t.step("buckets unknown resource schemes as 'other' to keep metric cardinality bounded", async () => {
 			esm_default.removeRoutes();
 			const [meterProvider, recorder] = createTestMeterProvider();
-			await lookupWebFinger("ssh://example.com/foo", { meterProvider });
+			await lookupMock("ssh://example.com/foo", { meterProvider });
 			const counter = recorder.getMeasurement("webfinger.lookup");
 			ok(counter != null);
 			deepStrictEqual(counter.attributes["webfinger.resource.scheme"], "other");
@@ -1976,7 +2061,7 @@ test("lookupWebFinger() records webfinger.lookup counter and duration", {
 			esm_default.removeRoutes();
 			esm_default.get("https://example.com/.well-known/webfinger?resource=acct%3Ajohndoe%40example.com", { body: expected });
 			const [_unused, recorder] = createTestMeterProvider();
-			await lookupWebFinger("acct:johndoe@example.com");
+			await lookupMock("acct:johndoe@example.com");
 			deepStrictEqual(recorder.getMeasurements("webfinger.lookup").length, 0);
 			deepStrictEqual(recorder.getMeasurements("webfinger.lookup.duration").length, 0);
 		});
@@ -1993,25 +2078,23 @@ test("lookupWebFinger() bounds resource descriptors", async () => {
 			"Content-Type": "application/jrd+json",
 			"Content-Length": "1"
 		} }));
-		deepStrictEqual(await lookupWebFinger("acct:alice@example.com", { allowPrivateAddress: true }), null);
+		deepStrictEqual(await lookupMock("acct:alice@example.com", { allowPrivateAddress: true }), null);
 		oversized = false;
-		deepStrictEqual(await lookupWebFinger("acct:alice@example.com", { allowPrivateAddress: true }), { subject: "acct:alice@example.com" });
+		deepStrictEqual(await lookupMock("acct:alice@example.com", { allowPrivateAddress: true }), { subject: "acct:alice@example.com" });
 	} finally {
 		esm_default.hardReset();
 	}
 });
 test("lookupWebFinger() logs DNS failures as such", async (t) => {
-	if ("Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted") return;
 	for (const result of [
 		"throws",
 		"empty",
 		"private"
 	]) await t.step(result, async () => {
-		const originalLookup = dns.lookup;
-		dns.lookup = (() => result === "throws" ? Promise.reject(/* @__PURE__ */ new Error("Resolver unavailable")) : Promise.resolve(result === "empty" ? [] : [{
+		const lookup = () => result === "throws" ? Promise.reject(/* @__PURE__ */ new Error("Resolver unavailable")) : Promise.resolve(result === "empty" ? [] : [{
 			address: "127.0.0.1",
 			family: 4
-		}]));
+		}]);
 		const records = [];
 		await configure({
 			sinks: { buffer: (record) => records.push(record) },
@@ -2026,7 +2109,7 @@ test("lookupWebFinger() logs DNS failures as such", async (t) => {
 			reset: true
 		});
 		try {
-			deepStrictEqual(await lookupWebFinger("acct:alice@dns-failure.invalid"), null);
+			deepStrictEqual(await lookupResourceWithDependencies("acct:alice@dns-failure.invalid", {}, { openHop: (url) => openPublicFetch(url, { lookup }) }), null);
 			const failures = records.filter((r) => r.rawMessage !== "Fetching WebFinger resource descriptor from {url}...");
 			deepStrictEqual(failures.map((r) => [r.level, r.rawMessage]), [result === "private" ? ["error", "Invalid URL for WebFinger resource descriptor: {error}"] : ["debug", "DNS lookup failed for {url}"]]);
 			const { error } = failures[0].properties;
@@ -2034,9 +2117,267 @@ test("lookupWebFinger() logs DNS failures as such", async (t) => {
 			deepStrictEqual(error.reason, result === "private" ? "disallowed" : "dns");
 		} finally {
 			await reset();
-			dns.lookup = originalLookup;
 		}
 	});
 });
+function recordHops(respond) {
+	const events = [];
+	const unsettled = [];
+	let opens = 0;
+	let closes = 0;
+	let responses = 0;
+	return {
+		events,
+		async openHop(url) {
+			opens++;
+			events.push(`open ${url}`);
+			const states = [];
+			let closed = false;
+			return {
+				url: new URL(url),
+				async fetch(input) {
+					if (closed) throw new TypeError("The fetch session is closed.");
+					const target = new URL(input instanceof Request ? input.url : input);
+					const id = ++responses;
+					events.push(`fetch ${target.href} #${id}`);
+					const fake = respond(target);
+					const state = {
+						id,
+						settled: false
+					};
+					states.push(state);
+					let sent = false;
+					const body = new ReadableStream({
+						pull(controller) {
+							if (!sent && fake.body != null && fake.body !== "") {
+								sent = true;
+								controller.enqueue(new TextEncoder().encode(fake.body));
+								return;
+							}
+							state.settled = true;
+							events.push(`consumed #${id}`);
+							controller.close();
+						},
+						cancel() {
+							state.settled = true;
+							events.push(`cancel #${id}`);
+							if (fake.cancelFails) throw new Error("Cancellation failed");
+							if (fake.cancelNeverSettles) return new Promise(() => {});
+						}
+					}, { highWaterMark: 0 });
+					const response = new Response(body, {
+						status: fake.status ?? 200,
+						headers: fake.headers
+					});
+					if (fake.url != null) Object.defineProperty(response, "url", { value: fake.url });
+					return response;
+				},
+				async close() {
+					if (closed) return;
+					closed = true;
+					closes++;
+					for (const state of states) if (!state.settled) unsettled.push(`#${state.id}`);
+					events.push(`close ${url}`);
+				}
+			};
+		},
+		assertInvariants() {
+			deepStrictEqual(closes, opens);
+			deepStrictEqual(unsettled, []);
+		}
+	};
+}
+test("lookupWebFinger() closes each hop after cleaning up its body", async (t) => {
+	const descriptor = {
+		subject: "acct:johndoe@example.com",
+		links: []
+	};
+	const first = "https://example.com/.well-known/webfinger?resource=acct%3Ajohndoe%40example.com";
+	const second = "https://example.com/.well-known/webfinger2";
+	await t.step("redirect", async () => {
+		const recorder = recordHops((url) => url.pathname === "/.well-known/webfinger" ? {
+			status: 302,
+			headers: { Location: "/.well-known/webfinger2" },
+			body: "redirecting",
+			url: url.href.replace("example.com", "93.184.215.14")
+		} : { body: JSON.stringify(descriptor) });
+		deepStrictEqual(await lookupResourceWithDependencies("acct:johndoe@example.com", {}, { openHop: recorder.openHop }), descriptor);
+		deepStrictEqual(recorder.events, [
+			`open ${first}`,
+			`fetch ${first} #1`,
+			"cancel #1",
+			`close ${first}`,
+			`open ${second}`,
+			`fetch ${second} #2`,
+			"consumed #2",
+			`close ${second}`
+		]);
+		recorder.assertInvariants();
+	});
+	await t.step("non-2xx response", async () => {
+		const recorder = recordHops(() => ({
+			status: 404,
+			body: "not found"
+		}));
+		deepStrictEqual(await lookupResourceWithDependencies("acct:johndoe@example.com", {}, { openHop: recorder.openHop }), null);
+		deepStrictEqual(recorder.events, [
+			`open ${first}`,
+			`fetch ${first} #1`,
+			"cancel #1",
+			`close ${first}`
+		]);
+		recorder.assertInvariants();
+	});
+	await t.step("too many redirections", async () => {
+		const recorder = recordHops(() => ({
+			status: 302,
+			headers: { Location: "/.well-known/webfinger2" },
+			body: "redirecting"
+		}));
+		deepStrictEqual(await lookupResourceWithDependencies("acct:johndoe@example.com", { maxRedirection: 1 }, { openHop: recorder.openHop }), null);
+		deepStrictEqual(recorder.events, [
+			`open ${first}`,
+			`fetch ${first} #1`,
+			"cancel #1",
+			`close ${first}`,
+			`open ${second}`,
+			`fetch ${second} #2`,
+			"cancel #2",
+			`close ${second}`
+		]);
+		recorder.assertInvariants();
+	});
+	await t.step("failed redirect body cancellation", async () => {
+		const recorder = recordHops((url) => url.pathname === "/.well-known/webfinger" ? {
+			status: 302,
+			headers: { Location: "/.well-known/webfinger2" },
+			body: "redirecting",
+			cancelFails: true
+		} : { body: JSON.stringify(descriptor) });
+		const records = [];
+		await configure({
+			sinks: { buffer: (record) => records.push(record) },
+			loggers: [{
+				category: "fedify",
+				sinks: ["buffer"],
+				lowestLevel: "debug"
+			}, {
+				category: ["logtape", "meta"],
+				sinks: []
+			}],
+			reset: true
+		});
+		try {
+			deepStrictEqual(await lookupResourceWithDependencies("acct:johndoe@example.com", {}, { openHop: recorder.openHop }), descriptor);
+			const failures = records.filter((r) => r.rawMessage === "Failed to cancel the response body from {url}: {error}");
+			deepStrictEqual(failures.map((r) => [r.level, r.properties.url]), [["debug", first]]);
+			const { error } = failures[0].properties;
+			ok(error instanceof Error);
+			deepStrictEqual(error.message, "Cancellation failed");
+		} finally {
+			await reset();
+		}
+		deepStrictEqual(recorder.events, [
+			`open ${first}`,
+			`fetch ${first} #1`,
+			"cancel #1",
+			`close ${first}`,
+			`open ${second}`,
+			`fetch ${second} #2`,
+			"consumed #2",
+			`close ${second}`
+		]);
+		recorder.assertInvariants();
+	});
+	await t.step("never-settling body cancellation", async () => {
+		const recorder = recordHops((url) => url.pathname === "/.well-known/webfinger" ? {
+			status: 302,
+			headers: { Location: "/.well-known/webfinger2" },
+			body: "redirecting",
+			cancelNeverSettles: true
+		} : {
+			status: 404,
+			body: "not found",
+			cancelNeverSettles: true
+		});
+		deepStrictEqual(await settleWithin(lookupResourceWithDependencies("acct:johndoe@example.com", {}, { openHop: recorder.openHop })), null);
+		deepStrictEqual(recorder.events, [
+			`open ${first}`,
+			`fetch ${first} #1`,
+			"cancel #1",
+			`close ${first}`,
+			`open ${second}`,
+			`fetch ${second} #2`,
+			"cancel #2",
+			`close ${second}`
+		]);
+		recorder.assertInvariants();
+	});
+});
+/**
+* Rejects if the given promise does not settle within the timeout, so that
+* a hang fails the test instead of blocking it.
+*/
+async function settleWithin(promise, ms = 5e3) {
+	let timer;
+	try {
+		return await Promise.race([promise, new Promise((_, reject) => {
+			timer = setTimeout(() => reject(/* @__PURE__ */ new Error(`Did not settle within ${ms} ms.`)), ms);
+		})]);
+	} finally {
+		clearTimeout(timer);
+	}
+}
+function neverCancellableResponse(init) {
+	return new Response(new ReadableStream({
+		start(controller) {
+			controller.enqueue(new TextEncoder().encode("never cancelled"));
+		},
+		cancel: () => new Promise(() => {})
+	}), init);
+}
+test("lookupWebFinger() does not wait for cancelling response bodies", async (t) => {
+	const descriptor = {
+		subject: "acct:johndoe@example.com",
+		links: []
+	};
+	esm_default.mockGlobal();
+	try {
+		await t.step("redirect", async () => {
+			esm_default.removeRoutes();
+			esm_default.get("begin:https://example.com/.well-known/webfinger?", () => neverCancellableResponse({
+				status: 302,
+				headers: { Location: "/.well-known/webfinger2" }
+			}));
+			esm_default.get("https://example.com/.well-known/webfinger2", () => new Response(JSON.stringify(descriptor), { headers: { "Content-Type": "application/jrd+json" } }));
+			deepStrictEqual(await settleWithin(lookupDirect("acct:johndoe@example.com")), descriptor);
+		});
+		await t.step("non-2xx response", async () => {
+			esm_default.removeRoutes();
+			esm_default.get("begin:https://example.com/.well-known/webfinger?", () => neverCancellableResponse({ status: 404 }));
+			deepStrictEqual(await settleWithin(lookupDirect("acct:johndoe@example.com")), null);
+		});
+	} finally {
+		esm_default.hardReset();
+	}
+});
+test$1("lookupWebFinger() records network_error for rejected hop addresses", async () => {
+	for (const lookup of [
+		() => Promise.reject(/* @__PURE__ */ new Error("DNS unavailable")),
+		() => Promise.resolve([]),
+		() => Promise.resolve([{
+			address: "127.0.0.1",
+			family: 4
+		}])
+	]) {
+		const [meterProvider, recorder] = createTestMeterProvider();
+		deepStrictEqual(await lookupWebFingerWithDependencies("acct:alice@dns-failure.invalid", { meterProvider }, { openHop: (url) => openPublicFetch(url, { lookup }) }), null);
+		const counter = recorder.getMeasurement("webfinger.lookup");
+		ok(counter != null);
+		deepStrictEqual(counter.attributes["webfinger.lookup.result"], "network_error");
+		deepStrictEqual(counter.attributes["activitypub.remote.host"], "dns-failure.invalid");
+		deepStrictEqual("http.response.status_code" in counter.attributes, false);
+	}
+});
 //#endregion
 export {};