@fedify/fedify 2.2.8 → 2.2.10

package/dist/{builder-Hr1c39Ha.mjs → builder-BSmTnJcC.mjs}

@@ -2,7 +2,7 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError, t as Router } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-B_vGx2Ji.mjs";
+import { n as version, t as name } from "./deno-dpXHD1Cg.mjs";
 import { t as ActivityListenerSet } from "./activity-listener-ell7W1s9.mjs";
 import { Tombstone, getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
@@ -58,7 +58,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-Ds3ujCKo.mjs");
+		const { FederationImpl } = await import("./middleware-BoGC27UL.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/compat/transformers.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-BJM6vrlT.mjs";
+import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-De7RGKlL.mjs";
 import { test } from "@fedify/fixture";
 import { Follow, Person } from "@fedify/vocab";
 //#region src/compat/transformers.test.ts

package/dist/{deno-B_vGx2Ji.mjs → deno-dpXHD1Cg.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.2.8";
+var version = "2.2.10";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-DixiMoIZ.mjs → docloader-Cu6YO4sl.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { o as validateCryptoKey } from "./key-6U1u5H_H.mjs";
-import { n as doubleKnock } from "./http-BlHW6_Oi.mjs";
+import { o as validateCryptoKey } from "./key-C6KGyqT_.mjs";
+import { n as doubleKnock } from "./http-CIzMKh05.mjs";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
 import { getLogger } from "@logtape/logtape";
@@ -26,6 +26,17 @@ const logger = getLogger([
 function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedirection, userAgent, specDeterminer, tracerProvider } = {}) {
 	validateCryptoKey(identity.privateKey);
 	async function load(url, options) {
+		await validateUrl(url);
+		return getRemoteDocument(url, await doubleKnock(createActivityPubRequest(url, { userAgent }), identity, {
+			maxRedirection,
+			specDeterminer,
+			log: curry(logRequest)(logger),
+			tracerProvider,
+			signal: options?.signal,
+			validateRedirect: validateUrl
+		}), load);
+	}
+	async function validateUrl(url) {
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(url);
 		} catch (error) {
@@ -35,13 +46,6 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedi
 			});
 			throw error;
 		}
-		return getRemoteDocument(url, await doubleKnock(createActivityPubRequest(url, { userAgent }), identity, {
-			maxRedirection,
-			specDeterminer,
-			log: curry(logRequest)(logger),
-			tracerProvider,
-			signal: options?.signal
-		}), load);
 	}
 	return load;
 }

package/dist/federation/builder.test.mjs

@@ -6,7 +6,7 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { i as assertExists } from "../std__assert-CRDpx_HF.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { n as createFederationBuilder } from "../builder-Hr1c39Ha.mjs";
+import { n as createFederationBuilder } from "../builder-BSmTnJcC.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Note, Person } from "@fedify/vocab";
 //#region src/federation/builder.test.ts

package/dist/federation/handler.test.mjs

@@ -8,11 +8,11 @@ import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { r as parseAcceptSignature } from "../accept-CPkZzmGN.mjs";
-import { s as signRequest } from "../http-BlHW6_Oi.mjs";
+import { s as signRequest } from "../http-CIzMKh05.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-DGu1NFwu.mjs";
-import { a as compactJsonLd, p as signJsonLd } from "../ld-DDBxn1rq.mjs";
+import { a as compactJsonLd, p as signJsonLd } from "../ld-aaLZ9vtX.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-BJM6vrlT.mjs";
+import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-De7RGKlL.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-ell7W1s9.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Activity, Create, Note, Person, Tombstone } from "@fedify/vocab";

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { r as signObject } from "../proof-BGrdGhcb.mjs";
+import { r as signObject } from "../proof-BaKRMbnC.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { o as createFederation } from "../middleware-BJM6vrlT.mjs";
+import { o as createFederation } from "../middleware-De7RGKlL.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, Follow, Person } from "@fedify/vocab";
 //#region src/federation/idempotency.test.ts

package/dist/federation/middleware.test.mjs

@@ -11,14 +11,14 @@ import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-Dmjbg-bA.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-BlHW6_Oi.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-CIzMKh05.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-DGu1NFwu.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-DixiMoIZ.mjs";
-import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-DDBxn1rq.mjs";
-import { t as doesActorOwnKey } from "../owner-vuyMTd_f.mjs";
-import { i as verifyObject, r as signObject } from "../proof-BGrdGhcb.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-Cu6YO4sl.mjs";
+import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-aaLZ9vtX.mjs";
+import { t as doesActorOwnKey } from "../owner-Bxd_RFAX.mjs";
+import { i as verifyObject, r as signObject } from "../proof-BaKRMbnC.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-BJM6vrlT.mjs";
+import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-De7RGKlL.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import * as vocab from "@fedify/vocab";
 import { Create, Offer, Person, getTypeId, lookupObject } from "@fedify/vocab";

package/dist/federation/mod.cjs

@@ -2,7 +2,7 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("../chunk-DDcVe30Y.cjs");
-const require_middleware = require("../middleware-Bj5UFOaT.cjs");
+const require_middleware = require("../middleware-CMx-gvcd.cjs");
 let es_toolkit = require("es-toolkit");
 //#region src/federation/kv.ts
 /**

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-DOkcTiZ-.js";
+import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-CWtQVZ8j.js";
 import { isEqual } from "es-toolkit";
 //#region src/federation/kv.ts
 /**

package/dist/federation/send.test.mjs

@@ -8,10 +8,10 @@ import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { l as verifyRequest } from "../http-BlHW6_Oi.mjs";
+import { l as verifyRequest } from "../http-CIzMKh05.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { t as doesActorOwnKey } from "../owner-vuyMTd_f.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-BvazsIXC.mjs";
+import { t as doesActorOwnKey } from "../owner-Bxd_RFAX.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-B1UTCW8F.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 //#region src/federation/send.test.ts

package/dist/federation/temporal.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import "../std__assert-CRDpx_HF.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-MdUFasAg.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-jgauoetb.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/temporal.test.ts
 test("hasMalformedKnownTemporalLiteral() detects expanded proof timestamps", async () => {

package/dist/federation/webfinger.test.mjs

@@ -5,7 +5,7 @@ import { r as createRequestContext } from "../context-Dk_tacqz.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-BJM6vrlT.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-De7RGKlL.mjs";
 import { test } from "@fedify/fixture";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 //#region src/federation/webfinger.test.ts

package/dist/{http-BlHW6_Oi.mjs → http-CIzMKh05.mjs}

@@ -1,9 +1,9 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-B_vGx2Ji.mjs";
+import { n as version, t as name } from "./deno-dpXHD1Cg.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CPkZzmGN.mjs";
-import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-6U1u5H_H.mjs";
+import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-C6KGyqT_.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";
@@ -824,10 +824,12 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 * @param request The original request.
 * @param location The redirect location.
 * @param body The request body as ArrayBuffer or null.
+* @param validateRedirect The function to validate the redirect URL.
 * @returns A new Request object for the redirect.
 */
-function createRedirectRequest(request, location, body) {
+async function createRedirectRequest(request, location, body, validateRedirect) {
 	const url = new URL(location, request.url);
+	await validateRedirect?.(url.href);
 	return new Request(url, {
 		method: request.method,
 		headers: request.headers,
@@ -925,7 +927,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 	let response = await fetchDoubleKnockRequest(request, signedRequest, signal);
 	if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 		if (redirected >= maximumRedirection) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
-		const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
+		const redirectRequest = await createRedirectRequest(request, response.headers.get("Location"), body, options.validateRedirect);
 		if (visited.has(redirectRequest.url)) throw new FetchError(request.url, `Redirect loop detected: ${redirectRequest.url}`);
 		return doubleKnockInternal(redirectRequest, identity, {
 			...options,
@@ -973,7 +975,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 					redirect: "manual",
 					signal
 				});
-				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) return doubleKnock(createRedirectRequest(request, response.headers.get("Location"), body), identity, {
+				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) return doubleKnock(await createRedirectRequest(request, response.headers.get("Location"), body, options.validateRedirect), identity, {
 					...options,
 					body
 				});
@@ -1000,7 +1002,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 		response = await fetchDoubleKnockRequest(request, signedRequest, signal);
 		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 			if (redirected >= maximumRedirection) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
-			const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
+			const redirectRequest = await createRedirectRequest(request, response.headers.get("Location"), body, options.validateRedirect);
 			if (visited.has(redirectRequest.url)) throw new FetchError(request.url, `Redirect loop detected: ${redirectRequest.url}`);
 			return doubleKnockInternal(redirectRequest, identity, {
 				...options,

package/dist/{http-C-FdpmAl.js → http-l1HqLnRo.js}

@@ -10,7 +10,7 @@ import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } fro
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.2.8";
+var version = "2.2.10";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -387,7 +387,7 @@ async function resolveFetchedKey(document, cacheKey, keyId, cls, { documentLoade
 		}
 	}
 	let key = null;
-	if (object instanceof cls) key = object;
+	if (object instanceof cls && (object.id == null || object.id.href === keyId)) key = object;
 	else if (isActor(object)) {
 		const keys = cls === CryptographicKey ? object.getPublicKeys({
 			documentLoader,
@@ -1316,10 +1316,12 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 * @param request The original request.
 * @param location The redirect location.
 * @param body The request body as ArrayBuffer or null.
+* @param validateRedirect The function to validate the redirect URL.
 * @returns A new Request object for the redirect.
 */
-function createRedirectRequest(request, location, body) {
+async function createRedirectRequest(request, location, body, validateRedirect) {
 	const url = new URL(location, request.url);
+	await validateRedirect?.(url.href);
 	return new Request(url, {
 		method: request.method,
 		headers: request.headers,
@@ -1417,7 +1419,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 	let response = await fetchDoubleKnockRequest(request, signedRequest, signal);
 	if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 		if (redirected >= maximumRedirection) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
-		const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
+		const redirectRequest = await createRedirectRequest(request, response.headers.get("Location"), body, options.validateRedirect);
 		if (visited.has(redirectRequest.url)) throw new FetchError(request.url, `Redirect loop detected: ${redirectRequest.url}`);
 		return doubleKnockInternal(redirectRequest, identity, {
 			...options,
@@ -1465,7 +1467,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 					redirect: "manual",
 					signal
 				});
-				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) return doubleKnock(createRedirectRequest(request, response.headers.get("Location"), body), identity, {
+				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) return doubleKnock(await createRedirectRequest(request, response.headers.get("Location"), body, options.validateRedirect), identity, {
 					...options,
 					body
 				});
@@ -1492,7 +1494,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 		response = await fetchDoubleKnockRequest(request, signedRequest, signal);
 		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 			if (redirected >= maximumRedirection) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
-			const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
+			const redirectRequest = await createRedirectRequest(request, response.headers.get("Location"), body, options.validateRedirect);
 			if (visited.has(redirectRequest.url)) throw new FetchError(request.url, `Redirect loop detected: ${redirectRequest.url}`);
 			return doubleKnockInternal(redirectRequest, identity, {
 				...options,

package/dist/{http-DLRpF855.cjs → http-pf3AXy99.cjs}

@@ -11,7 +11,7 @@ let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conve
 let byte_encodings_base64 = require("byte-encodings/base64");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.2.8";
+var version = "2.2.10";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -388,7 +388,7 @@ async function resolveFetchedKey(document, cacheKey, keyId, cls, { documentLoade
 		}
 	}
 	let key = null;
-	if (object instanceof cls) key = object;
+	if (object instanceof cls && (object.id == null || object.id.href === keyId)) key = object;
 	else if ((0, _fedify_vocab.isActor)(object)) {
 		const keys = cls === _fedify_vocab.CryptographicKey ? object.getPublicKeys({
 			documentLoader,
@@ -1317,10 +1317,12 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 * @param request The original request.
 * @param location The redirect location.
 * @param body The request body as ArrayBuffer or null.
+* @param validateRedirect The function to validate the redirect URL.
 * @returns A new Request object for the redirect.
 */
-function createRedirectRequest(request, location, body) {
+async function createRedirectRequest(request, location, body, validateRedirect) {
 	const url = new URL(location, request.url);
+	await validateRedirect?.(url.href);
 	return new Request(url, {
 		method: request.method,
 		headers: request.headers,
@@ -1418,7 +1420,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 	let response = await fetchDoubleKnockRequest(request, signedRequest, signal);
 	if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 		if (redirected >= maximumRedirection) throw new _fedify_vocab_runtime.FetchError(request.url, `Too many redirections (${redirected + 1})`);
-		const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
+		const redirectRequest = await createRedirectRequest(request, response.headers.get("Location"), body, options.validateRedirect);
 		if (visited.has(redirectRequest.url)) throw new _fedify_vocab_runtime.FetchError(request.url, `Redirect loop detected: ${redirectRequest.url}`);
 		return doubleKnockInternal(redirectRequest, identity, {
 			...options,
@@ -1466,7 +1468,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 					redirect: "manual",
 					signal
 				});
-				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) return doubleKnock(createRedirectRequest(request, response.headers.get("Location"), body), identity, {
+				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) return doubleKnock(await createRedirectRequest(request, response.headers.get("Location"), body, options.validateRedirect), identity, {
 					...options,
 					body
 				});
@@ -1493,7 +1495,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 		response = await fetchDoubleKnockRequest(request, signedRequest, signal);
 		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 			if (redirected >= maximumRedirection) throw new _fedify_vocab_runtime.FetchError(request.url, `Too many redirections (${redirected + 1})`);
-			const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
+			const redirectRequest = await createRedirectRequest(request, response.headers.get("Location"), body, options.validateRedirect);
 			if (visited.has(redirectRequest.url)) throw new _fedify_vocab_runtime.FetchError(request.url, `Redirect loop detected: ${redirectRequest.url}`);
 			return doubleKnockInternal(redirectRequest, identity, {
 				...options,

package/dist/{key-6U1u5H_H.mjs → key-C6KGyqT_.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-B_vGx2Ji.mjs";
+import { n as version, t as name } from "./deno-dpXHD1Cg.mjs";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError, getDocumentLoader } from "@fedify/vocab-runtime";
@@ -242,7 +242,7 @@ async function resolveFetchedKey(document, cacheKey, keyId, cls, { documentLoade
 		}
 	}
 	let key = null;
-	if (object instanceof cls) key = object;
+	if (object instanceof cls && (object.id == null || object.id.href === keyId)) key = object;
 	else if (isActor(object)) {
 		const keys = cls === CryptographicKey ? object.getPublicKeys({
 			documentLoader,

package/dist/{kv-cache-DKprbYof.cjs → kv-cache-B_HA4cvx.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-DLRpF855.cjs");
+const require_http = require("./http-pf3AXy99.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
@@ -25,6 +25,17 @@ const logger$1 = (0, _logtape_logtape.getLogger)([
 function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedirection, userAgent, specDeterminer, tracerProvider } = {}) {
 	require_http.validateCryptoKey(identity.privateKey);
 	async function load(url, options) {
+		await validateUrl(url);
+		return (0, _fedify_vocab_runtime.getRemoteDocument)(url, await require_http.doubleKnock((0, _fedify_vocab_runtime.createActivityPubRequest)(url, { userAgent }), identity, {
+			maxRedirection,
+			specDeterminer,
+			log: (0, es_toolkit.curry)(_fedify_vocab_runtime.logRequest)(logger$1),
+			tracerProvider,
+			signal: options?.signal,
+			validateRedirect: validateUrl
+		}), load);
+	}
+	async function validateUrl(url) {
 		if (!allowPrivateAddress) try {
 			await (0, _fedify_vocab_runtime.validatePublicUrl)(url);
 		} catch (error) {
@@ -34,13 +45,6 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedi
 			});
 			throw error;
 		}
-		return (0, _fedify_vocab_runtime.getRemoteDocument)(url, await require_http.doubleKnock((0, _fedify_vocab_runtime.createActivityPubRequest)(url, { userAgent }), identity, {
-			maxRedirection,
-			specDeterminer,
-			log: (0, es_toolkit.curry)(_fedify_vocab_runtime.logRequest)(logger$1),
-			tracerProvider,
-			signal: options?.signal
-		}), load);
 	}
 	return load;
 }

package/dist/{kv-cache-BjlL4Zk0.js → kv-cache-m9KwvJeU.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { d as validateCryptoKey, t as doubleKnock } from "./http-C-FdpmAl.js";
+import { d as validateCryptoKey, t as doubleKnock } from "./http-l1HqLnRo.js";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";
@@ -24,6 +24,17 @@ const logger$1 = getLogger([
 function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedirection, userAgent, specDeterminer, tracerProvider } = {}) {
 	validateCryptoKey(identity.privateKey);
 	async function load(url, options) {
+		await validateUrl(url);
+		return getRemoteDocument(url, await doubleKnock(createActivityPubRequest(url, { userAgent }), identity, {
+			maxRedirection,
+			specDeterminer,
+			log: curry(logRequest)(logger$1),
+			tracerProvider,
+			signal: options?.signal,
+			validateRedirect: validateUrl
+		}), load);
+	}
+	async function validateUrl(url) {
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(url);
 		} catch (error) {
@@ -33,13 +44,6 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedi
 			});
 			throw error;
 		}
-		return getRemoteDocument(url, await doubleKnock(createActivityPubRequest(url, { userAgent }), identity, {
-			maxRedirection,
-			specDeterminer,
-			log: curry(logRequest)(logger$1),
-			tracerProvider,
-			signal: options?.signal
-		}), load);
 	}
 	return load;
 }

package/dist/{ld-DDBxn1rq.mjs → ld-aaLZ9vtX.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-B_vGx2Ji.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-6U1u5H_H.mjs";
+import { n as version, t as name } from "./deno-dpXHD1Cg.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-C6KGyqT_.mjs";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{middleware-Ds3ujCKo.mjs → middleware-BoGC27UL.mjs}

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as FederationImpl } from "./middleware-BJM6vrlT.mjs";
+import { n as FederationImpl } from "./middleware-De7RGKlL.mjs";
 export { FederationImpl };

package/dist/{middleware-Bj5UFOaT.cjs → middleware-CMx-gvcd.cjs}

@@ -2,10 +2,10 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
-const require_http = require("./http-DLRpF855.cjs");
-const require_proof = require("./proof-BNGY2IU6.cjs");
+const require_http = require("./http-pf3AXy99.cjs");
+const require_proof = require("./proof-BOHbpbMG.cjs");
 const require_types = require("./types-m8u9L86X.cjs");
-const require_kv_cache = require("./kv-cache-DKprbYof.cjs");
+const require_kv_cache = require("./kv-cache-B_HA4cvx.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");
@@ -212,7 +212,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-DNJYfRV4.cjs"));
+		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-VpIBr58-.cjs"));
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/{middleware-DOkcTiZ-.js → middleware-CWtQVZ8j.js}

@@ -2,10 +2,10 @@ import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { t as __exportAll } from "./chunk-CRNNMoPX.js";
 import { r as getDefaultActivityTransformers } from "./transformers-BGMIq1cs.js";
-import { _ as version, a as verifyRequestDetailed, d as validateCryptoKey, f as formatAcceptSignature, g as name, i as verifyRequest, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, u as importJwk } from "./http-C-FdpmAl.js";
-import { _ as hasSignatureLike, b as signJsonLd, c as getKeyOwner, f as compactJsonLd, g as hasSignature, h as getNormalizationContextLoader, i as verifyObject, l as InvalidContextReferenceError, m as detachSignature, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, r as signObject, s as doesActorOwnKey, u as assertSafeJsonLd, v as isClearlyMalformedContextReference, w as wrapContextLoaderForJsonLd, x as verifyCompactJsonLd, y as isInvalidUrlTypeError } from "./proof-DA_wkPds.js";
+import { _ as version, a as verifyRequestDetailed, d as validateCryptoKey, f as formatAcceptSignature, g as name, i as verifyRequest, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, u as importJwk } from "./http-l1HqLnRo.js";
+import { _ as hasSignatureLike, b as signJsonLd, c as getKeyOwner, f as compactJsonLd, g as hasSignature, h as getNormalizationContextLoader, i as verifyObject, l as InvalidContextReferenceError, m as detachSignature, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, r as signObject, s as doesActorOwnKey, u as assertSafeJsonLd, v as isClearlyMalformedContextReference, w as wrapContextLoaderForJsonLd, x as verifyCompactJsonLd, y as isInvalidUrlTypeError } from "./proof-CIoNWttk.js";
 import { n as getNodeInfo, t as nodeInfoToJson } from "./types-DTONwNqL.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-BjlL4Zk0.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-m9KwvJeU.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";

package/dist/{middleware-BJM6vrlT.mjs → middleware-De7RGKlL.mjs}

@@ -2,25 +2,25 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-B_vGx2Ji.mjs";
+import { n as version, t as name } from "./deno-dpXHD1Cg.mjs";
 import { t as formatAcceptSignature } from "./accept-CPkZzmGN.mjs";
-import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-6U1u5H_H.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-BlHW6_Oi.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-DixiMoIZ.mjs";
+import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-C6KGyqT_.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-CIzMKh05.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-Cu6YO4sl.mjs";
 import { n as kvCache } from "./kv-cache-DYsF2MhP.mjs";
-import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-DDBxn1rq.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-vuyMTd_f.mjs";
+import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-aaLZ9vtX.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-Bxd_RFAX.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-CNmZLixq.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-BGrdGhcb.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-BaKRMbnC.mjs";
 import { t as getNodeInfo } from "./client-dx126nMS.mjs";
 import { t as nodeInfoToJson } from "./types-J53Kw7so.mjs";
-import { t as FederationBuilderImpl } from "./builder-Hr1c39Ha.mjs";
+import { t as FederationBuilderImpl } from "./builder-BSmTnJcC.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-D-HqUuA2.mjs";
 import { t as KvKeyCache } from "./keycache-EGATflN-.mjs";
 import { t as acceptsJsonLd } from "./negotiation-SQvQgUqe.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "./temporal-MdUFasAg.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "./temporal-jgauoetb.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-v_sGLH1d.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-BvazsIXC.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-B1UTCW8F.mjs";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";

package/dist/{middleware-DNJYfRV4.cjs → middleware-VpIBr58-.cjs}

@@ -1,4 +1,4 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_middleware = require("./middleware-Bj5UFOaT.cjs");
+const require_middleware = require("./middleware-CMx-gvcd.cjs");
 exports.FederationImpl = require_middleware.FederationImpl;

package/dist/mod.cjs

@@ -4,11 +4,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
 require("./compat/mod.cjs");
-const require_http = require("./http-DLRpF855.cjs");
-const require_middleware = require("./middleware-Bj5UFOaT.cjs");
-const require_proof = require("./proof-BNGY2IU6.cjs");
+const require_http = require("./http-pf3AXy99.cjs");
+const require_middleware = require("./middleware-CMx-gvcd.cjs");
+const require_proof = require("./proof-BOHbpbMG.cjs");
 const require_types = require("./types-m8u9L86X.cjs");
-const require_kv_cache = require("./kv-cache-DKprbYof.cjs");
+const require_kv_cache = require("./kv-cache-B_HA4cvx.cjs");
 const require_federation_mod = require("./federation/mod.cjs");
 require("./nodeinfo/mod.cjs");
 require("./runtime/mod.cjs");

package/dist/mod.js

@@ -3,11 +3,11 @@ import { URLPattern } from "urlpattern-polyfill";
 import "./chunk-CRNNMoPX.js";
 import { n as autoIdAssigner, r as getDefaultActivityTransformers, t as actorDehydrator } from "./transformers-BGMIq1cs.js";
 import "./compat/mod.js";
-import { a as verifyRequestDetailed, c as fetchKeyDetailed, f as formatAcceptSignature, h as validateAcceptSignature, i as verifyRequest, l as generateCryptoKeyPair, m as parseAcceptSignature, o as exportJwk, p as fulfillAcceptSignature, r as signRequest, s as fetchKey, u as importJwk } from "./http-C-FdpmAl.js";
-import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "./middleware-DOkcTiZ-.js";
-import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "./proof-DA_wkPds.js";
+import { a as verifyRequestDetailed, c as fetchKeyDetailed, f as formatAcceptSignature, h as validateAcceptSignature, i as verifyRequest, l as generateCryptoKeyPair, m as parseAcceptSignature, o as exportJwk, p as fulfillAcceptSignature, r as signRequest, s as fetchKey, u as importJwk } from "./http-l1HqLnRo.js";
+import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "./middleware-CWtQVZ8j.js";
+import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "./proof-CIoNWttk.js";
 import { n as getNodeInfo, r as parseNodeInfo, t as nodeInfoToJson } from "./types-DTONwNqL.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-BjlL4Zk0.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-m9KwvJeU.js";
 import { InProcessMessageQueue, MemoryKvStore, ParallelMessageQueue } from "./federation/mod.js";
 import "./nodeinfo/mod.js";
 import "./runtime/mod.js";

package/dist/nodeinfo/handler.test.mjs

@@ -5,7 +5,7 @@ import { r as createRequestContext } from "../context-Dk_tacqz.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { _ as handleNodeInfoJrd, g as handleNodeInfo, o as createFederation } from "../middleware-BJM6vrlT.mjs";
+import { _ as handleNodeInfoJrd, g as handleNodeInfo, o as createFederation } from "../middleware-De7RGKlL.mjs";
 import { test } from "@fedify/fixture";
 //#region src/nodeinfo/handler.test.ts
 test("handleNodeInfo()", async () => {

package/dist/{owner-vuyMTd_f.mjs → owner-Bxd_RFAX.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-B_vGx2Ji.mjs";
-import "./key-6U1u5H_H.mjs";
+import { n as version, t as name } from "./deno-dpXHD1Cg.mjs";
+import "./key-C6KGyqT_.mjs";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{proof-BNGY2IU6.cjs → proof-BOHbpbMG.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-DLRpF855.cjs");
+const require_http = require("./http-pf3AXy99.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");

package/dist/{proof-BGrdGhcb.mjs → proof-BaKRMbnC.mjs}

@@ -1,8 +1,8 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-B_vGx2Ji.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-6U1u5H_H.mjs";
+import { n as version, t as name } from "./deno-dpXHD1Cg.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-C6KGyqT_.mjs";
 import { n as preloadedOnlyDocumentLoader } from "./public-audience-DYFHzm_c.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-CNmZLixq.mjs";
 import { Activity, DataIntegrityProof, Multikey, getTypeId } from "@fedify/vocab";

package/dist/{proof-DA_wkPds.js → proof-CIoNWttk.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { _ as version, d as validateCryptoKey, g as name, s as fetchKey } from "./http-C-FdpmAl.js";
+import { _ as version, d as validateCryptoKey, g as name, s as fetchKey } from "./http-l1HqLnRo.js";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1, PUBLIC_COLLECTION, getTypeId, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{send-BvazsIXC.mjs → send-B1UTCW8F.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-B_vGx2Ji.mjs";
-import { n as doubleKnock } from "./http-BlHW6_Oi.mjs";
+import { n as version, t as name } from "./deno-dpXHD1Cg.mjs";
+import { n as doubleKnock } from "./http-CIzMKh05.mjs";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
 //#region src/federation/send.ts

package/dist/sig/http.test.mjs

@@ -7,8 +7,8 @@ import { i as assertExists, t as assertStringIncludes } from "../std__assert-CRD
 import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { t as exportJwk } from "../key-6U1u5H_H.mjs";
-import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-BlHW6_Oi.mjs";
+import { t as exportJwk } from "../key-C6KGyqT_.mjs";
+import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-CIzMKh05.mjs";
 import { i as rsaPrivateKey2, l as rsaPublicKey5, o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-DGu1NFwu.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, exportSpki } from "@fedify/vocab-runtime";
@@ -794,6 +794,7 @@ test("doubleKnock() function with redirect handling", async () => {
 	esm_default.spyGlobal();
 	const requestedUrls = [];
 	const responseCodes = [];
+	const validatedRedirects = [];
 	esm_default.post("https://example.com/redirect-endpoint", (cl) => {
 		requestedUrls.push(cl.url);
 		responseCodes.push(302);
@@ -811,11 +812,41 @@ test("doubleKnock() function with redirect handling", async () => {
 	}), {
 		keyId: rsaPublicKey2.id,
 		privateKey: rsaPrivateKey2
-	})).status, 202, "Final response status should be 202 Accepted");
+	}, { validateRedirect(url) {
+		validatedRedirects.push(url);
+	} })).status, 202, "Final response status should be 202 Accepted");
 	assertEquals(requestedUrls.length, 2, "Two URLs should have been requested");
 	assertEquals(requestedUrls[0], "https://example.com/redirect-endpoint", "First request should be to redirect-endpoint");
 	assertEquals(requestedUrls[1], "https://example.com/final-endpoint", "Second request should be to final-endpoint");
 	assertEquals(responseCodes, [302, 202], "Response status codes should match expected sequence");
+	assertEquals(validatedRedirects, ["https://example.com/final-endpoint"]);
+	esm_default.hardReset();
+});
+test("doubleKnock() validates redirects after signature fallback", async () => {
+	esm_default.spyGlobal();
+	let requestCount = 0;
+	let privateRequestCount = 0;
+	esm_default.post("https://example.com/redirect-after-fallback", (cl) => {
+		requestCount++;
+		if (cl.request.headers.has("Signature-Input")) return new Response("Unauthorized", { status: 401 });
+		return Response.redirect("http://localhost/private", 302);
+	});
+	esm_default.post("http://localhost/private", () => {
+		privateRequestCount++;
+		return new Response("", { status: 202 });
+	});
+	const request = new Request("https://example.com/redirect-after-fallback", {
+		method: "POST",
+		body: "Test message"
+	});
+	await assertRejects(() => doubleKnock(request, {
+		keyId: rsaPublicKey2.id,
+		privateKey: rsaPrivateKey2
+	}, { validateRedirect(url) {
+		throw new Error(`Disallowed redirect: ${url}`);
+	} }), Error, "Disallowed redirect: http://localhost/private");
+	assertEquals(requestCount, 2);
+	assertEquals(privateRequestCount, 0);
 	esm_default.hardReset();
 });
 test("doubleKnock() function with both specs rejected", async () => {
@@ -1608,6 +1639,37 @@ test("doubleKnock(): Accept-Signature challenge retry succeeds", async () => {
 	assertEquals(requestCount, 2);
 	esm_default.hardReset();
 });
+test("doubleKnock(): validates redirects after Accept-Signature challenge retry", async () => {
+	esm_default.spyGlobal();
+	let requestCount = 0;
+	let privateRequestCount = 0;
+	esm_default.post("https://example.com/inbox-challenge-redirect", () => {
+		requestCount++;
+		if (requestCount === 1) return new Response("Not Authorized", {
+			status: 401,
+			headers: { "Accept-Signature": "sig1=(\"@method\" \"@target-uri\" \"@authority\" \"content-digest\");created;nonce=\"challenge-nonce-redirect\"" }
+		});
+		return Response.redirect("http://localhost/private", 302);
+	});
+	esm_default.post("http://localhost/private", () => {
+		privateRequestCount++;
+		return new Response("", { status: 202 });
+	});
+	const request = new Request("https://example.com/inbox-challenge-redirect", {
+		method: "POST",
+		body: "Test message",
+		headers: { "Content-Type": "text/plain" }
+	});
+	await assertRejects(() => doubleKnock(request, {
+		keyId: rsaPublicKey2.id,
+		privateKey: rsaPrivateKey2
+	}, { validateRedirect(url) {
+		throw new Error(`Disallowed redirect: ${url}`);
+	} }), Error, "Disallowed redirect: http://localhost/private");
+	assertEquals(requestCount, 2);
+	assertEquals(privateRequestCount, 0);
+	esm_default.hardReset();
+});
 test("doubleKnock(): unfulfillable Accept-Signature falls to legacy fallback", async () => {
 	esm_default.spyGlobal();
 	let requestCount = 0;

package/dist/sig/key.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-6U1u5H_H.mjs";
+import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-C6KGyqT_.mjs";
 import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
@@ -303,6 +303,51 @@ test("fetchKeyDetailed() returns detailed fetch errors", async () => {
 	if (detailedError == null || !("error" in detailedError)) throw new Error("Expected non-HTTP fetch error details.");
 	assertEquals(detailedError.error, failure);
 });
+test("fetchKey() rejects standalone keys with a mismatched id", async () => {
+	for (const { keyId, standaloneKey, fetch } of [{
+		keyId: "https://example.com/key",
+		standaloneKey: rsaPublicKey1,
+		fetch: (keyId, options) => fetchKey(keyId, CryptographicKey, options)
+	}, {
+		keyId: "https://example.com/multikey",
+		standaloneKey: ed25519Multikey,
+		fetch: (keyId, options) => fetchKey(keyId, Multikey, options)
+	}]) {
+		const cache = {};
+		const options = {
+			async documentLoader(resource) {
+				if (resource === keyId) return {
+					contextUrl: null,
+					documentUrl: resource,
+					document: {
+						...await standaloneKey.toJsonLd({ contextLoader: mockDocumentLoader }),
+						id: "https://example.com/different-key"
+					}
+				};
+				return await mockDocumentLoader(resource);
+			},
+			contextLoader: mockDocumentLoader,
+			keyCache: {
+				get(keyId) {
+					return Promise.resolve(cache[keyId.href]);
+				},
+				set(keyId, key) {
+					cache[keyId.href] = key;
+					return Promise.resolve();
+				}
+			}
+		};
+		assertEquals(await fetch(keyId, options), {
+			key: null,
+			cached: false
+		});
+		assertEquals(cache, { [keyId]: null });
+		assertEquals(await fetch(keyId, options), {
+			key: null,
+			cached: true
+		});
+	}
+});
 test("fetchKey() returns null for a malformed actor publicKey", async () => {
 	const actorId = "https://example.com/malformed-public-key";
 	const keyId = "https://example.com/malformed-public-key#main-key";

package/dist/sig/ld.test.mjs

@@ -5,9 +5,9 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { i as generateCryptoKeyPair } from "../key-6U1u5H_H.mjs";
+import { i as generateCryptoKeyPair } from "../key-C6KGyqT_.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { a as compactJsonLd, f as isInvalidUrlTypeError, g as verifySignature, h as verifyJsonLd, i as attachSignature, n as UnsafeJsonLdError, o as createSignature, p as signJsonLd, s as detachSignature, u as hasSignatureLike } from "../ld-DDBxn1rq.mjs";
+import { a as compactJsonLd, f as isInvalidUrlTypeError, g as verifySignature, h as verifyJsonLd, i as attachSignature, n as UnsafeJsonLdError, o as createSignature, p as signJsonLd, s as detachSignature, u as hasSignatureLike } from "../ld-aaLZ9vtX.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { CryptographicKey } from "@fedify/vocab";
 import { encodeBase64 } from "byte-encodings/base64";

package/dist/sig/mod.cjs

@@ -1,8 +1,8 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_http = require("../http-DLRpF855.cjs");
-const require_proof = require("../proof-BNGY2IU6.cjs");
+const require_http = require("../http-pf3AXy99.cjs");
+const require_proof = require("../proof-BOHbpbMG.cjs");
 exports.attachSignature = require_proof.attachSignature;
 exports.createProof = require_proof.createProof;
 exports.createSignature = require_proof.createSignature;

package/dist/sig/mod.js

@@ -1,5 +1,5 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as verifyRequestDetailed, c as fetchKeyDetailed, f as formatAcceptSignature, h as validateAcceptSignature, i as verifyRequest, l as generateCryptoKeyPair, m as parseAcceptSignature, o as exportJwk, p as fulfillAcceptSignature, r as signRequest, s as fetchKey, u as importJwk } from "../http-C-FdpmAl.js";
-import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "../proof-DA_wkPds.js";
+import { a as verifyRequestDetailed, c as fetchKeyDetailed, f as formatAcceptSignature, h as validateAcceptSignature, i as verifyRequest, l as generateCryptoKeyPair, m as parseAcceptSignature, o as exportJwk, p as fulfillAcceptSignature, r as signRequest, s as fetchKey, u as importJwk } from "../http-l1HqLnRo.js";
+import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "../proof-CIoNWttk.js";
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, hasProofLike, hasSignatureLike, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/owner.test.mjs

@@ -6,7 +6,7 @@ import "../std__assert-CRDpx_HF.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-DGu1NFwu.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-vuyMTd_f.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-Bxd_RFAX.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 //#region src/sig/owner.test.ts

package/dist/sig/proof.test.mjs

@@ -8,7 +8,7 @@ import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-CNmZLixq.mjs";
-import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-BGrdGhcb.mjs";
+import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-BaKRMbnC.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place } from "@fedify/vocab";
 import { decodeMultibase, importMultibaseKey } from "@fedify/vocab-runtime";

package/dist/{temporal-MdUFasAg.mjs → temporal-jgauoetb.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { c as getNormalizationContextLoader } from "./ld-DDBxn1rq.mjs";
+import { c as getNormalizationContextLoader } from "./ld-aaLZ9vtX.mjs";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/federation/temporal.ts
 function isPlainObject(value) {

package/dist/utils/docloader.test.mjs

@@ -5,9 +5,9 @@ import { t as esm_default } from "../esm-DVILvP5e.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
-import { l as verifyRequest } from "../http-BlHW6_Oi.mjs";
+import { l as verifyRequest } from "../http-CIzMKh05.mjs";
 import { i as rsaPrivateKey2 } from "../keys-DGu1NFwu.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-DixiMoIZ.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-Cu6YO4sl.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { UrlError } from "@fedify/vocab-runtime";
 //#region src/utils/docloader.test.ts
@@ -63,6 +63,39 @@ test("getAuthenticatedDocumentLoader()", async (t) => {
 		esm_default.hardReset();
 	});
 });
+test("getAuthenticatedDocumentLoader() validates redirects", async (t) => {
+	esm_default.spyGlobal();
+	let privateRequestCount = 0;
+	esm_default.get("https://example.com/redirect-to-private", () => Response.redirect("http://localhost/private", 302));
+	esm_default.get("http://localhost/private", () => {
+		privateRequestCount++;
+		return Response.json({ private: true });
+	});
+	await t.step("deny public-to-private redirects", async () => {
+		const loader = getAuthenticatedDocumentLoader({
+			keyId: new URL("https://example.com/key2"),
+			privateKey: rsaPrivateKey2
+		});
+		await assertRejects(() => loader("https://example.com/redirect-to-private"), UrlError);
+		assertEquals(privateRequestCount, 0);
+	});
+	esm_default.get("https://example.com/redirect-to-public", () => Response.redirect("https://www.example.com/document", 302));
+	esm_default.get("https://www.example.com/document", () => Response.json({ public: true }));
+	await t.step("allow public-to-public redirects", async () => {
+		assertEquals((await getAuthenticatedDocumentLoader({
+			keyId: new URL("https://example.com/key2"),
+			privateKey: rsaPrivateKey2
+		})("https://example.com/redirect-to-public")).document, { public: true });
+	});
+	await t.step("allow private redirects when explicitly enabled", async () => {
+		assertEquals((await getAuthenticatedDocumentLoader({
+			keyId: new URL("https://example.com/key2"),
+			privateKey: rsaPrivateKey2
+		}, { allowPrivateAddress: true })("https://example.com/redirect-to-private")).document, { private: true });
+		assertEquals(privateRequestCount, 1);
+	});
+	esm_default.hardReset();
+});
 test("getAuthenticatedDocumentLoader() cancellation", {
 	sanitizeResources: false,
 	sanitizeOps: false

package/dist/utils/mod.cjs

@@ -1,6 +1,6 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_kv_cache = require("../kv-cache-DKprbYof.cjs");
+const require_kv_cache = require("../kv-cache-B_HA4cvx.cjs");
 exports.getAuthenticatedDocumentLoader = require_kv_cache.getAuthenticatedDocumentLoader;
 exports.kvCache = require_kv_cache.kvCache;

package/dist/utils/mod.js

@@ -1,4 +1,4 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-BjlL4Zk0.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-m9KwvJeU.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.2.8",
+  "version": "2.2.10",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -153,9 +153,9 @@
     "uri-template-router": "^1.0.0",
     "url-template": "^3.1.1",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/webfinger": "2.2.8",
-    "@fedify/vocab": "2.2.8",
-    "@fedify/vocab-runtime": "2.2.8"
+    "@fedify/vocab-runtime": "2.2.10",
+    "@fedify/vocab": "2.2.10",
+    "@fedify/webfinger": "2.2.10"
   },
   "devDependencies": {
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
@@ -167,8 +167,8 @@
     "tsx": "^4.19.4",
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
-    "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.2.8"
+    "@fedify/vocab-tools": "^2.2.10",
+    "@fedify/fixture": "2.0.0"
   },
   "scripts": {
     "build:self": "tsdown",