@fedify/fedify 2.4.0-dev.2155 → 2.4.0-dev.2157

package/dist/{builder-CxHALSwA.mjs → builder-CLaS4-yA.mjs}

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-YLLbRq06.mjs";
+import { n as version, t as name } from "./deno-D1gcWWqB.mjs";
 import { c as isPortableId, r as getPortableDid, t as getCanonicalPortableId } from "./portable-key-id-Bg259c4Z.mjs";
 import { t as ActivityListenerSet } from "./activity-listener-C-BSbKI7.mjs";
 import { getLogger } from "@logtape/logtape";
@@ -89,7 +89,7 @@ var FederationBuilderImpl = class {
 	* specified.
 	*/
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-BahNnLfD.mjs");
+		const { FederationImpl } = await import("./middleware-TrCVULgs.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/{client-DpnpgjyX.mjs → client-CEnNz8O7.mjs}

@@ -93,8 +93,8 @@ const DEFAULT_MAX_REDIRECTION = 5;
 * bounce the request to an internal address.
 * @param url The URL to fetch.
 * @param headers The request headers.
-* @returns The final response, or `null` if the URL is disallowed or there
-*          are too many redirects.
+* @returns The final response, or `null` if the URL is disallowed, its
+*          hostname cannot be resolved, or there are too many redirects.
 */
 async function fetchPublicUrl(url, headers) {
 	let current = url instanceof URL ? url : new URL(url);
@@ -104,7 +104,11 @@ async function fetchPublicUrl(url, headers) {
 			await validatePublicUrl(current.href);
 		} catch (e) {
 			if (e instanceof UrlError) {
-				logger.error("Refused to fetch a private or invalid URL {url}: {error}", {
+				if (e.reason === "dns") logger.error("DNS lookup failed for {url}: {error}", {
+					url: current.href,
+					error: e
+				});
+				else logger.error("Refused to fetch a private or invalid URL {url}: {error}", {
 					url: current.href,
 					error: e
 				});

package/dist/compat/transformers.test.mjs

@@ -5,7 +5,7 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { E as autoIdAssigner, T as actorDehydrator, n as FederationImpl } from "../middleware-DDa8pCUa.mjs";
+import { E as autoIdAssigner, T as actorDehydrator, n as FederationImpl } from "../middleware-xdukzV3x.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/compat/transformers.test.ts

package/dist/{compound-proof-nhrXTRQO.mjs → compound-proof-D7K94KPz.mjs}

@@ -3,8 +3,8 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { c as isPortableId, i as getRawCanonicalPortableId, t as getCanonicalPortableId } from "./portable-key-id-Bg259c4Z.mjs";
 import { n as preloadedOnlyDocumentLoader } from "./public-audience--klBIOk1.mjs";
-import { c as getNormalizationContextLoader } from "./ld-Djxsq6JR.mjs";
-import { l as verifyPortableObjectProofPolicy, n as classifyFep2277CoreType, o as verifyMapLocalProof } from "./proof-vZ04IAjq.mjs";
+import { c as getNormalizationContextLoader } from "./ld-lU_ZqzsQ.mjs";
+import { l as verifyPortableObjectProofPolicy, n as classifyFep2277CoreType, o as verifyMapLocalProof } from "./proof-C2YwD8a_.mjs";
 import { parseIri, preloadedContexts } from "@fedify/vocab-runtime";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/sig/compound-proof.ts

package/dist/{context-OrnjnuMq.mjs → context-B2rlkkyJ.mjs}

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as mockDocumentLoader } from "./dist-BQvArojP.mjs";
+import { t as mockDocumentLoader } from "./dist-DJQM4u7i.mjs";
 import { RouterError } from "@fedify/uri-template";
 import { lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";

package/dist/{deno-YLLbRq06.mjs → deno-D1gcWWqB.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.2155+2ccc5085";
+var version = "2.4.0-dev.2157+b76e5888";
 //#endregion
 export { version as n, name as t };

package/dist/{dist-BQvArojP.mjs → dist-DJQM4u7i.mjs}

@@ -6,6 +6,7 @@ import { configure, getConsoleSink, getLogger, reset } from "@logtape/logtape";
 import "@opentelemetry/sdk-trace-base";
 import "@opentelemetry/core";
 //#region ../fixture/dist/mod.js
+const fixtureFetch = globalThis.fetch.bind(globalThis);
 const logger = getLogger(["fixture", "docloader"]);
 /**
 * A mock of the document loader.  This does not make any actual HTTP requests
@@ -20,7 +21,7 @@ async function mockDocumentLoader(resource, _options) {
 	if ("navigator" in globalThis && navigator.userAgent === "Cloudflare-Workers") {
 		const testUrl = new URL(url);
 		testUrl.hostname += ".test";
-		const resp = await fetch(testUrl);
+		const resp = await fixtureFetch(testUrl);
 		if (resp.ok) {
 			const document = await resp.json();
 			logger.debug("Successfully fetched fixture {resource}: {status} {statusText}\n{body}", {

package/dist/docloader-BMqr3hji.mjs

@@ -0,0 +1,79 @@
+import "temporal-polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { c as validateCryptoKey } from "./key-CPM4r6tP.mjs";
+import { n as doubleKnock } from "./http-CGcLv8rh.mjs";
+import { getLogger } from "@logtape/logtape";
+import { curry } from "es-toolkit";
+import { FetchError, UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
+//#region src/utils/docloader.ts
+const logger = getLogger([
+	"fedify",
+	"utils",
+	"docloader"
+]);
+const DEFAULT_MAX_REDIRECTION = 20;
+/**
+* Gets an authenticated {@link DocumentLoader} for the given identity.
+* Note that an authenticated document loader intentionally does not cache
+* the fetched documents.
+* At most 20 HTTP redirects and alternate document links are followed in total
+* per call.  Revisiting a URL within that chain throws a {@link FetchError}.
+* @param identity The identity to get the document loader for.
+*                 The actor's key pair.
+* @param options The options for the document loader.
+* @returns The authenticated document loader.
+* @throws {TypeError} If the key is invalid or unsupported.
+* @since 0.4.0
+*/
+function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedirection, userAgent, specDeterminer, tracerProvider } = {}) {
+	validateCryptoKey(identity.privateKey);
+	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
+		options?.signal?.throwIfAborted();
+		let currentUrl = new URL(url).href;
+		await validateUrl(currentUrl, options);
+		visited.add(currentUrl);
+		const originalRequest = createActivityPubRequest(currentUrl, { userAgent });
+		function follow(nextUrl) {
+			options?.signal?.throwIfAborted();
+			if (redirected >= DEFAULT_MAX_REDIRECTION) throw new FetchError(currentUrl, `Too many redirections (${redirected + 1})`);
+			if (visited.has(nextUrl)) throw new FetchError(currentUrl, `Redirect loop detected: ${nextUrl}`);
+			redirected++;
+		}
+		const response = await doubleKnock(originalRequest, identity, {
+			maxRedirection,
+			specDeterminer,
+			log: curry(logRequest)(logger),
+			tracerProvider,
+			signal: options?.signal,
+			validateRedirect: async (nextUrl) => {
+				follow(nextUrl);
+				await validateUrl(nextUrl, options);
+				visited.add(nextUrl);
+				currentUrl = nextUrl;
+			}
+		});
+		return getRemoteDocument(currentUrl, response, (alternateUrl) => {
+			follow(alternateUrl);
+			return load(alternateUrl, options, redirected, visited);
+		}, options);
+	}
+	async function validateUrl(url, options) {
+		if (!allowPrivateAddress) try {
+			await validatePublicUrl(url);
+		} catch (error) {
+			if (error instanceof UrlError) if (error.reason === "dns") logger.debug("DNS lookup failed for {url}", {
+				url,
+				error
+			});
+			else logger[options?.suppressError ? "warn" : "error"]("Disallowed private URL: {url}", {
+				url,
+				error
+			});
+			throw error;
+		}
+	}
+	return (url, options) => load(url, options);
+}
+//#endregion
+export { getAuthenticatedDocumentLoader as t };

package/dist/federation/builder.test.mjs

@@ -6,7 +6,7 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertExists } from "../assert_exists-cffSpJ7X.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { r as createFederationBuilder } from "../builder-CxHALSwA.mjs";
+import { r as createFederationBuilder } from "../builder-CLaS4-yA.mjs";
 import { DisallowedOperatorError, DisallowedVarSpecModifierError, DuplicateRouteVariableError, RouteTemplateOptionsNotMatchedError, RouterError } from "@fedify/uri-template";
 import { Activity, Note, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";

package/dist/federation/compound-fanout.test.mjs

@@ -6,11 +6,11 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { n as exportJwk } from "../key-BZ-Z4uez.mjs";
+import { n as exportJwk } from "../key-CPM4r6tP.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { a as signObject, d as verifyProof } from "../proof-vZ04IAjq.mjs";
+import { a as signObject, d as verifyProof } from "../proof-C2YwD8a_.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as FederationImpl } from "../middleware-DDa8pCUa.mjs";
+import { n as FederationImpl } from "../middleware-xdukzV3x.mjs";
 import { Create, DataIntegrityProof, Note } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";

package/dist/federation/handler-compound-proof.test.mjs

@@ -1,14 +1,14 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { r as createRequestContext, t as createInboxContext } from "../context-OrnjnuMq.mjs";
+import { r as createRequestContext, t as createInboxContext } from "../context-B2rlkkyJ.mjs";
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { a as compactJsonLd, m as verifyCompactJsonLd, p as signJsonLd } from "../ld-Djxsq6JR.mjs";
-import { l as signRequest } from "../http-CXnNbRe_.mjs";
+import { a as compactJsonLd, m as verifyCompactJsonLd, p as signJsonLd } from "../ld-lU_ZqzsQ.mjs";
+import { l as signRequest } from "../http-CGcLv8rh.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { f as handleInbox, o as createFederation } from "../middleware-DDa8pCUa.mjs";
+import { f as handleInbox, o as createFederation } from "../middleware-xdukzV3x.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
 import { t as map_local_create_note_default } from "../map-local-create-note-B0SeXJms.mjs";
 import { Create, CryptographicKey, Multikey, Person, Update } from "@fedify/vocab";

package/dist/federation/handler.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-OrnjnuMq.mjs";
+import { n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-B2rlkkyJ.mjs";
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertGreaterOrEqual } from "../assert_greater_or_equal-BlafOF4-.mjs";
@@ -10,12 +10,12 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as parseAcceptSignature } from "../accept-CPVqki78.mjs";
-import { o as generateCryptoKeyPair } from "../key-BZ-Z4uez.mjs";
-import { a as compactJsonLd, p as signJsonLd } from "../ld-Djxsq6JR.mjs";
-import { a as signObject } from "../proof-vZ04IAjq.mjs";
-import { l as signRequest } from "../http-CXnNbRe_.mjs";
+import { o as generateCryptoKeyPair } from "../key-CPM4r6tP.mjs";
+import { a as compactJsonLd, p as signJsonLd } from "../ld-lU_ZqzsQ.mjs";
+import { a as signObject } from "../proof-C2YwD8a_.mjs";
+import { l as signRequest } from "../http-CGcLv8rh.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { d as handleCustomCollection, f as handleInbox, g as respondWithObjectIfAcceptable, h as respondWithObject, l as handleActor, m as handleOutbox, o as createFederation, p as handleObject, u as handleCollection } from "../middleware-DDa8pCUa.mjs";
+import { d as handleCustomCollection, f as handleInbox, g as respondWithObjectIfAcceptable, h as respondWithObject, l as handleActor, m as handleOutbox, o as createFederation, p as handleObject, u as handleCollection } from "../middleware-xdukzV3x.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
 import { Activity, Create, CryptographicKey, Multikey, Note, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/hashlink-media.test.mjs

@@ -10,8 +10,8 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation, x as parseHashlinkGatewayRequest } from "../middleware-DDa8pCUa.mjs";
-import { r as createFederationBuilder } from "../builder-CxHALSwA.mjs";
+import { o as createFederation, x as parseHashlinkGatewayRequest } from "../middleware-xdukzV3x.mjs";
+import { r as createFederationBuilder } from "../builder-CLaS4-yA.mjs";
 import { n as RouterError } from "../router-u5O5KCQr.mjs";
 import { Note } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { a as signObject } from "../proof-vZ04IAjq.mjs";
+import { a as signObject } from "../proof-C2YwD8a_.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-DDa8pCUa.mjs";
+import { o as createFederation } from "../middleware-xdukzV3x.mjs";
 import { Create, Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/federation/idempotency.test.ts

package/dist/federation/metrics.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
-import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-CBHhbHgG.mjs";
+import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-B41pRPfd.mjs";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { FetchError } from "@fedify/vocab-runtime";
 import { DataPointType, MeterProvider, MetricReader } from "@opentelemetry/sdk-metrics";

package/dist/federation/middleware.test.mjs

@@ -4,8 +4,8 @@ globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-BHXXx4Wx.mjs";
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as ManualClockKvStore } from "../kv-DBRWVx3Q.mjs";
-import { a as numberSchema, r as envelopeSchema, t as MockQueue } from "../tasks-dbCShlCb.mjs";
-import "../testing-CKaJhcA0.mjs";
+import { a as numberSchema, r as envelopeSchema, t as MockQueue } from "../tasks-IG3pHfvZ.mjs";
+import "../testing-C1itIjqW.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertExists } from "../assert_exists-cffSpJ7X.mjs";
 import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
@@ -16,14 +16,14 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { g as recordInboxActivity } from "../metrics-CBHhbHgG.mjs";
-import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-Djxsq6JR.mjs";
-import { a as signObject, s as verifyObject } from "../proof-vZ04IAjq.mjs";
-import { d as verifyRequest, l as signRequest } from "../http-CXnNbRe_.mjs";
+import { g as recordInboxActivity } from "../metrics-B41pRPfd.mjs";
+import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-lU_ZqzsQ.mjs";
+import { a as signObject, s as verifyObject } from "../proof-C2YwD8a_.mjs";
+import { d as verifyRequest, l as signRequest } from "../http-CGcLv8rh.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-vc-pSu9-.mjs";
-import { S as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-DDa8pCUa.mjs";
-import { t as doesActorOwnKey } from "../owner-OdWSE8am.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-BMqr3hji.mjs";
+import { S as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-xdukzV3x.mjs";
+import { t as doesActorOwnKey } from "../owner-D63yPo_i.mjs";
 import { t as CircuitBreaker } from "../circuit-breaker-C5NqoLBJ.mjs";
 import { t as TaskCodec } from "../codec-C6rTrpIp.mjs";
 import { t as markCircuitBreakerLegacySweepDone } from "../circuit-breaker-test-utils-DW6YC_Pe.mjs";
@@ -34,8 +34,9 @@ import { Create, Note, Offer, Person, getTypeId, lookupObject } from "@fedify/vo
 import { SpanStatusCode, metrics } from "@opentelemetry/api";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError, getDocumentLoader } from "@fedify/vocab-runtime";
-import serialize from "json-canon";
+import dns from "node:dns/promises";
 import { deepStrictEqual, ok, rejects, strictEqual } from "node:assert/strict";
+import serialize from "json-canon";
 import { DataPointType, MeterProvider as MeterProvider$1, MetricReader } from "@opentelemetry/sdk-metrics";
 //#region ../fixture/src/fixtures/example.com/create.json
 var create_default = {
@@ -1175,6 +1176,31 @@ test({
 		esm_default.hardReset();
 	}
 });
+test("Federation.fetch() [rfc9421] multiple POST signatures", async (t) => {
+	for (const validSecond of [true, false]) await t.step(validSecond ? "valid second signature" : "both signatures invalid", async () => {
+		const inbox = [];
+		const federation = createFederation({
+			kv: new MemoryKvStore(),
+			documentLoaderFactory: () => mockDocumentLoader,
+			contextLoaderFactory: () => mockDocumentLoader
+		});
+		federation.setActorDispatcher("/users/{identifier}", (ctx, identifier) => new vocab.Person({ id: ctx.getActorUri(identifier) }));
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, (_ctx, activity) => {
+			inbox.push(activity.id.href);
+		});
+		const signed = await signRequest(new Request("https://example.com/inbox", {
+			method: "POST",
+			headers: { "Content-Type": "application/activity+json" },
+			body: JSON.stringify(create_default)
+		}), rsaPrivateKey2, rsaPublicKey2.id, { spec: "rfc9421" });
+		const input = signed.headers.get("Signature-Input");
+		const signature = signed.headers.get("Signature");
+		signed.headers.set("Signature-Input", `${input}, ${input.replace(/^sig1=/, "sig2=")}`);
+		signed.headers.set("Signature", `sig1=:AAAAAA==:, ${validSecond ? signature.replace(/^sig1=/, "sig2=") : "sig2=:AAAAAA==:"}`);
+		assertEquals((await federation.fetch(signed, { contextData: void 0 })).status, validSecond ? 202 : 401);
+		assertEquals(inbox, validSecond ? [create_default.id] : []);
+	});
+});
 test("Federation.fetch()", async (t) => {
 	esm_default.spyGlobal();
 	esm_default.get("https://example.com/key2", {
@@ -4943,6 +4969,157 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 		assertEquals(queuedMessages, []);
 	});
 });
+test({
+	name: "FederationImpl.processQueuedTask() accounts for destination validation failures",
+	ignore: "Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted",
+	async fn(t) {
+		for (const result of [
+			"throws",
+			"empty",
+			"private"
+		]) for (const failureThreshold of [1, 5]) for (const redirected of [false, true]) await t.step(`${result}, threshold: ${failureThreshold}, redirected: ${redirected}`, async () => {
+			const destination = "https://delivery.invalid/inbox";
+			const publicInbox = "https://8.8.8.8/inbox";
+			const queuedMessages = [];
+			const delays = [];
+			const errors = [];
+			const activities = [];
+			const attempts = [];
+			const delay = Temporal.Duration.from({ seconds: 5 });
+			const kv = new MemoryKvStore();
+			await markCircuitBreakerLegacySweepDone(kv);
+			const [meterProvider, recorder] = createTestMeterProvider();
+			const recoveryDelay = Temporal.Duration.from({ minutes: 30 });
+			const federation = new FederationImpl({
+				kv,
+				meterProvider,
+				circuitBreaker: {
+					failureThreshold,
+					recoveryDelay
+				},
+				queue: {
+					enqueue(message, options) {
+						queuedMessages.push(message);
+						delays.push(options?.delay);
+						return Promise.resolve();
+					},
+					listen() {
+						return Promise.resolve();
+					}
+				},
+				documentLoaderFactory: () => mockDocumentLoader,
+				contextLoaderFactory: () => mockDocumentLoader,
+				onOutboxError(error, activity) {
+					errors.push(error);
+					activities.push(activity);
+				},
+				outboxRetryPolicy(options) {
+					attempts.push(options.attempts);
+					return delay;
+				}
+			});
+			const message = {
+				type: "outbox",
+				id: crypto.randomUUID(),
+				baseUrl: "https://example.com",
+				keys: [],
+				activity: {
+					"@context": "https://www.w3.org/ns/activitystreams",
+					type: "Create",
+					id: "https://example.com/activities/dns-failure",
+					actor: "https://example.com/users/alice",
+					object: {
+						type: "Note",
+						content: "test"
+					}
+				},
+				activityType: "https://www.w3.org/ns/activitystreams#Create",
+				inbox: redirected ? publicInbox : destination,
+				sharedInbox: false,
+				started: (/* @__PURE__ */ new Date()).toISOString(),
+				attempt: 0,
+				headers: {},
+				traceContext: {}
+			};
+			const originalLookup = dns.lookup;
+			const resolverError = /* @__PURE__ */ new Error("Resolver unavailable");
+			const lookups = [];
+			dns.lookup = ((hostname) => {
+				lookups.push(hostname);
+				assertEquals(hostname, "delivery.invalid");
+				if (result === "throws") return Promise.reject(resolverError);
+				return Promise.resolve(result === "empty" ? [] : [{
+					address: "127.0.0.1",
+					family: 4
+				}]);
+			});
+			try {
+				esm_default.mockGlobal().catch(202);
+				if (redirected) esm_default.route(publicInbox, {
+					status: 307,
+					headers: { Location: destination }
+				});
+				await federation.processQueuedTask(void 0, message);
+				assertEquals(errors.length, 1);
+				const error = errors[0];
+				if (result === "private") {
+					assertInstanceOf(error, UrlError);
+					assertEquals(error.reason, "disallowed");
+				} else {
+					assertInstanceOf(error, FetchError);
+					assertEquals(error.url.href, destination);
+					assertInstanceOf(error.cause, UrlError);
+					assertEquals(error.cause.reason, "dns");
+					assertStrictEquals(error.cause.cause, result === "throws" ? resolverError : void 0);
+				}
+				assertEquals(activities.length, 1);
+				assertInstanceOf(activities[0], Create);
+				assertEquals(activities[0].id?.href, "https://example.com/activities/dns-failure");
+				assertEquals(attempts, [0]);
+				const host = new URL(message.inbox).host;
+				const state = await kv.get([
+					"_fedify",
+					"circuit",
+					host
+				]);
+				if (result === "private") assertEquals(state, void 0);
+				else {
+					assertExists(state);
+					assertEquals(state.failures.length, 1);
+					assertEquals(state.state, failureThreshold === 1 ? "open" : "closed");
+				}
+				if (result !== "private" && failureThreshold === 1) {
+					assertEquals(queuedMessages.length, 1);
+					const held = queuedMessages[0];
+					assertEquals(held.attempt, 0);
+					assertEquals(held.circuitHeld, true);
+					assertExists(held.circuitHeldSince);
+					assertEquals(delays, [recoveryDelay]);
+				} else {
+					assertEquals(queuedMessages, [{
+						...message,
+						attempt: 1
+					}]);
+					assertEquals(delays, [delay]);
+				}
+				const expectedCount = result === "private" && !redirected ? 0 : 1;
+				const sent = recorder.getMeasurements("activitypub.delivery.sent");
+				assertEquals(sent.length, expectedCount);
+				if (expectedCount === 1) {
+					assertEquals(sent[0].value, 1);
+					assertEquals(sent[0].attributes["activitypub.delivery.success"], false);
+					assertEquals(sent[0].attributes["activitypub.remote.host"], host);
+				}
+				assertEquals(lookups, ["delivery.invalid"]);
+				assertEquals(esm_default.callHistory.calls(destination).length, 0);
+				assertEquals(esm_default.callHistory.calls().length, redirected ? 1 : 0);
+			} finally {
+				dns.lookup = originalLookup;
+				esm_default.hardReset();
+			}
+		});
+	}
+});
 test("FederationImpl.processQueuedTask() permanent failure", async (t) => {
 	esm_default.spyGlobal();
 	esm_default.post("https://gone.example/inbox", {

package/dist/federation/mod.cjs

@@ -1,6 +1,6 @@
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_federation = require("../federation-D9TufmIO.cjs");
+const require_federation = require("../federation-2e8XrN7q.cjs");
 exports.CircuitBreaker = require_federation.CircuitBreaker;
 exports.InProcessMessageQueue = require_federation.InProcessMessageQueue;
 exports.MemoryKvStore = require_federation.MemoryKvStore;

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as respondWithObjectIfAcceptable, c as digest, d as parseCircuitBreakerKvState, f as createFederationBuilder, i as respondWithObject, l as CircuitBreaker, n as handleWebFinger, o as SendActivityError, r as createExponentialBackoffPolicy, s as buildCollectionSynchronizationHeader, t as createFederation, u as normalizeCircuitBreakerOptions } from "../middleware-BDUR99k3.js";
+import { a as respondWithObjectIfAcceptable, c as digest, d as parseCircuitBreakerKvState, f as createFederationBuilder, i as respondWithObject, l as CircuitBreaker, n as handleWebFinger, o as SendActivityError, r as createExponentialBackoffPolicy, s as buildCollectionSynchronizationHeader, t as createFederation, u as normalizeCircuitBreakerOptions } from "../middleware-BYWyYjmX.js";
 import { getLogger } from "@logtape/logtape";
 import { Router as Router$1, RouterError as RouterError$1, assertPath, isPath } from "@fedify/uri-template";
 import { isEqual } from "es-toolkit";