@fedify/fedify 2.4.0-dev.2115 → 2.4.0-dev.2127

package/dist/federation/portable.test.mjs

@@ -1,4 +1,4 @@
-import "temporal-polyfill";
+import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
@@ -8,10 +8,10 @@ import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { i as signObject, s as verifyPortableObjectProof } from "../proof-xdPYGPaA.mjs";
-import { l as signRequest } from "../http-BcLnr2do.mjs";
+import { i as signObject, s as verifyPortableObjectProof } from "../proof-CW8k0R1G.mjs";
+import { l as signRequest } from "../http-BFeK9sBg.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-BpwKvOpU.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-BdhvduR9.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Collection, Create, Note, Object as Object$1, Person, Tombstone, lookupObject } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
@@ -220,18 +220,6 @@ test("Federation.fetch() applies the FEP-ef61 proof policy to portable objects",
 			inbox: parseIri(`ap+ef61://${did}/objects/unsigned-actor/inbox`),
 			outbox: parseIri(`ap+ef61://${did}/objects/unsigned-actor/outbox`),
 			gateways: [new URL("https://example.com/")]
-		})),
-		"tombstone": () => sign(new Tombstone({
-			id: parseIri(`ap+ef61://${did}/objects/tombstone`),
-			formerType: Note
-		})),
-		"unsigned-tombstone": () => Promise.resolve(new Tombstone({
-			id: parseIri(`ap+ef61://${did}/objects/unsigned-tombstone`),
-			formerType: Note
-		})),
-		"mismatched-tombstone": () => sign(new Tombstone({
-			id: parseIri(`ap+ef61://${did}/objects/other`),
-			formerType: Note
 		}))
 	};
 	federation.setObjectDispatcher(Object$1, "/objects/{id}", (_ctx, { id }) => objects[id]?.() ?? null);
@@ -246,10 +234,7 @@ test("Federation.fetch() applies the FEP-ef61 proof policy to portable objects",
 		"activity": 200,
 		"actor": 200,
 		"mutated-id": 404,
-		"unsigned-actor": 500,
-		"tombstone": 200,
-		"unsigned-tombstone": 500,
-		"mismatched-tombstone": 404
+		"unsigned-actor": 500
 	})) await t.step(`${id} → ${status}`, async () => {
 		const response = await federation.fetch(gatewayRequest(`/objects/${id}`), { contextData: void 0 });
 		assertEquals(response.status, status);
@@ -260,17 +245,129 @@ test("Federation.fetch() applies the FEP-ef61 proof policy to portable objects",
 		assertEquals(response.status, 500);
 		assertEquals(response.body, null);
 	});
-	await t.step("serves a signed tombstone with its body", async () => {
-		const response = await federation.fetch(gatewayRequest("/objects/tombstone"), { contextData: void 0 });
-		assertEquals(response.status, 200);
-		const body = await response.json();
-		assertEquals(body.type, "Tombstone");
-		assertEquals(body.id, `ap+ef61://${did}/objects/tombstone`);
+});
+test("Federation.fetch() serves tombstones of portable objects", async (t) => {
+	const federation = createTestFederation();
+	const compatible = (path) => new URL(`https://example.com/.well-known/apgateway/${did}${path}`);
+	const tombstoneFromJsonLd = (path, properties) => Tombstone.fromJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		type: "Tombstone",
+		id: `ap+ef61://${did}${path}`,
+		...properties
+	}, {
+		contextLoader: mockDocumentLoader,
+		documentLoader: mockDocumentLoader
 	});
-	await t.step("responds to HEAD for a tombstone without a body", async () => {
-		const response = await federation.fetch(gatewayRequest("/objects/tombstone", { method: "HEAD" }), { contextData: void 0 });
-		assertEquals(response.status, 200);
-		assertEquals(response.body, null);
+	const tombstones = {
+		"signed": () => sign(new Tombstone({
+			id: parseIri(`ap+ef61://${did}/notes/signed`),
+			formerType: Note,
+			deleted: Temporal.Instant.from("2026-01-01T00:00:00Z")
+		})),
+		"compatible": () => sign(new Tombstone({
+			id: compatible("/notes/compatible"),
+			formerType: Note
+		})),
+		"signed-collection": async () => sign(await tombstoneFromJsonLd("/notes/signed-collection", { totalItems: 0 })),
+		"unsigned": () => Promise.resolve(new Tombstone({
+			id: parseIri(`ap+ef61://${did}/notes/unsigned`),
+			formerType: Note
+		})),
+		"wrong-did": () => sign(new Tombstone({ id: parseIri(`ap+ef61://${did}/notes/wrong-did`) }), otherKeyPair.privateKey, otherKeyId),
+		"tampered": async () => (await sign(new Tombstone({ id: parseIri(`ap+ef61://${did}/notes/tampered`) }))).clone({ formerType: Note }),
+		"unsigned-collection": () => tombstoneFromJsonLd("/notes/unsigned-collection", { totalItems: 0 }),
+		"link": () => tombstoneFromJsonLd("/notes/link", { href: "https://example.com/" }),
+		"mismatched": () => sign(new Tombstone({ id: parseIri(`ap+ef61://${did}/notes/other`) })),
+		"mutated-id": async () => {
+			const signed = await sign(new Tombstone({ id: parseIri(`ap+ef61://${did}/notes/original`) }));
+			const tombstone = await Tombstone.fromJsonLd(await signed.toJsonLd({ contextLoader: mockDocumentLoader }), {
+				contextLoader: mockDocumentLoader,
+				documentLoader: mockDocumentLoader
+			});
+			tombstone.id.pathname = tombstone.id.pathname.replace(/original$/, "mutated-id");
+			return tombstone;
+		}
+	};
+	federation.setObjectDispatcher(Note, "/notes/{id}", (_ctx, { id }) => tombstones[id]?.() ?? null).authorize((ctx) => ctx.request.headers.get("X-Deny") == null);
+	for (const [id, reason] of globalThis.Object.entries({
+		"unsigned": "missingProof",
+		"wrong-did": "verificationMethodMismatch",
+		"tampered": "invalidProof",
+		"unsigned-collection": "unsecuredCollection",
+		"link": "unsupportedObjectType"
+	})) {
+		const result = await verifyPortableObjectProof(await (await tombstones[id]()).toJsonLd({ contextLoader: mockDocumentLoader }), { contextLoader: mockDocumentLoader });
+		assert(!result.verified, id);
+		assertEquals(result.reason.type, reason, id);
+	}
+	for (const [id, status] of globalThis.Object.entries({
+		"signed": 410,
+		"compatible": 410,
+		"signed-collection": 410,
+		"unsigned": 404,
+		"wrong-did": 500,
+		"tampered": 500,
+		"unsigned-collection": 500,
+		"link": 500,
+		"mismatched": 404,
+		"mutated-id": 404
+	})) await t.step(`${id} → ${status}`, async () => {
+		let notFound = false;
+		const response = await federation.fetch(gatewayRequest(`/notes/${id}`), {
+			contextData: void 0,
+			onNotFound() {
+				notFound = true;
+				return new Response("Not found", { status: 404 });
+			}
+		});
+		assertEquals(response.status, status);
+		assertEquals(notFound, status === 404);
+		if (status === 410) {
+			assertEquals(response.headers.get("Content-Type"), PORTABLE_OBJECT_CONTENT_TYPE);
+			assertEquals(response.headers.get("Vary"), "Accept");
+			const body = await response.json();
+			assertEquals(body.type, "Tombstone");
+			assert((await verifyPortableObjectProof(body, { contextLoader: mockDocumentLoader })).verified);
+		} else if (status === 500) assertEquals(await response.text(), "Internal server error.");
+	});
+	await t.step("serves the tombstone as the dispatcher returns it", async () => {
+		let response = await federation.fetch(gatewayRequest("/notes/signed"), { contextData: void 0 });
+		let body = await response.json();
+		assertEquals(body.id, `ap+ef61://${did}/notes/signed`);
+		assertEquals(body.formerType, "as:Note");
+		assertEquals(body.deleted, "2026-01-01T00:00:00Z");
+		response = await federation.fetch(gatewayRequest("/notes/compatible"), { contextData: void 0 });
+		body = await response.json();
+		assertEquals(body.id, compatible("/notes/compatible").href);
+	});
+	await t.step("responds to HEAD without a body", async () => {
+		for (const [id, status] of [["signed", 410], ["unsigned", 404]]) {
+			const response = await federation.fetch(gatewayRequest(`/notes/${id}`, { method: "HEAD" }), { contextData: void 0 });
+			assertEquals(response.status, status, id);
+			assertEquals(response.body, null, id);
+			if (status === 410) {
+				assertEquals(response.headers.get("Content-Type"), PORTABLE_OBJECT_CONTENT_TYPE);
+				assertEquals(response.headers.get("Vary"), "Accept");
+			}
+		}
+	});
+	await t.step("authorizes before serving a tombstone", async () => {
+		for (const id of ["signed", "unsigned"]) {
+			let unauthorized = false;
+			assertEquals((await federation.fetch(gatewayRequest(`/notes/${id}`, { headers: { "X-Deny": "1" } }), {
+				contextData: void 0,
+				onUnauthorized() {
+					unauthorized = true;
+					return new Response("Unauthorized", { status: 401 });
+				}
+			})).status, 401, id);
+			assertEquals(unauthorized, true, id);
+		}
+	});
+	await t.step("does not warn about tombstones with compatible IDs", async () => {
+		assertEquals((await captureWarnings(async () => {
+			assertEquals((await federation.fetch(gatewayRequest("/notes/compatible"), { contextData: void 0 })).status, 410);
+		})).filter((record) => record.category[2] === "object"), []);
 	});
 });
 test("Federation.fetch() authorizes portable object requests", async (t) => {

package/dist/federation/send.test.mjs

@@ -10,10 +10,10 @@ import { t as assertNotEquals } from "../assert_not_equals-CpPK2t89.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { d as verifyRequest } from "../http-BcLnr2do.mjs";
+import { d as verifyRequest } from "../http-BFeK9sBg.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { t as doesActorOwnKey } from "../owner-9LiHmOv1.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-Bf8rSWch.mjs";
+import { t as doesActorOwnKey } from "../owner-CCfdL83M.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send--FORaIc4.mjs";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";

package/dist/federation/tasks/enqueue.test.mjs

@@ -3,8 +3,8 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../../kv-DCHkaJ9-.mjs";
 import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, t as MockQueue } from "../../tasks-dbCShlCb.mjs";
-import "../../testing-BWq1dCzx.mjs";
-import { o as createFederation } from "../../middleware-BpwKvOpU.mjs";
+import "../../testing-otQhu4aD.mjs";
+import { o as createFederation } from "../../middleware-BdhvduR9.mjs";
 import { n as ParallelMessageQueue } from "../../mq-Dm1Wmtm-.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { delay } from "es-toolkit";

package/dist/federation/tasks/tasks.test.mjs

@@ -3,9 +3,9 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../../kv-DCHkaJ9-.mjs";
 import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, t as MockQueue } from "../../tasks-dbCShlCb.mjs";
-import "../../testing-BWq1dCzx.mjs";
-import { o as createFederation } from "../../middleware-BpwKvOpU.mjs";
-import { r as createFederationBuilder } from "../../builder-CZcBWrBd.mjs";
+import "../../testing-otQhu4aD.mjs";
+import { o as createFederation } from "../../middleware-BdhvduR9.mjs";
+import { r as createFederationBuilder } from "../../builder-B2bgGYbP.mjs";
 import { t as TaskCodec } from "../../codec-C6rTrpIp.mjs";
 import { t as InProcessMessageQueue } from "../../mq-Dm1Wmtm-.mjs";
 import { W3CTraceContextPropagator } from "@opentelemetry/core";

package/dist/federation/temporal.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-tAtwv6vX.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-CffY_XOJ.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

@@ -1,12 +1,12 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { r as createRequestContext } from "../context-CoNRxGYp.mjs";
+import { r as createRequestContext } from "../context-DfSVPcJ8.mjs";
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-CpPK2t89.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-BpwKvOpU.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-BdhvduR9.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { parseIri } from "@fedify/vocab-runtime";

package/dist/{federation-DYr384xz.cjs → federation-B6IHuS6n.cjs}

@@ -1,10 +1,10 @@
 const { URLPattern } = require("urlpattern-polyfill");
 const require_rolldown_runtime = require("./rolldown-runtime-Dmm3t92W.cjs");
 const require_transformers = require("./transformers-BalCrSsr.cjs");
-const require_http = require("./http-B4mQvNcv.cjs");
+const require_http = require("./http-o8l4QeUY.cjs");
 const require_types = require("./types-Be2zbyeG.cjs");
-const require_owner = require("./owner-BtoMCv6Z.cjs");
-const require_kv_cache = require("./kv-cache-Dqp_E-1g.cjs");
+const require_portable_collection = require("./portable-collection-DXogVs__.cjs");
+const require_kv_cache = require("./kv-cache-BUkgZAcX.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_uri_template = require("@fedify/uri-template");
 let _fedify_vocab = require("@fedify/vocab");
@@ -750,7 +750,7 @@ function warnMismatchedTombstoneId(context, cls, values, tombstone) {
 		});
 		return;
 	}
-	if (tombstone.id.protocol === "ap:" || tombstone.id.protocol === "ap+ef61:") return;
+	if (require_http.isPortableId(tombstone.id)) return;
 	const expected = context.getObjectUri(cls, values);
 	if (tombstone.id.href !== expected.href) logger.warn("Object dispatcher for {class} returned a tombstone with an id property {tombstoneId} that does not match the object URI {objectUri}.  Set the property with Context.getObjectUri().", {
 		class: cls.name,
@@ -3536,6 +3536,11 @@ async function handleObject(request, { values, context, objectDispatcher, author
 * dispatcher, or the actor dispatcher adapted to one.  The object is served
 * only if its ID canonically matches the requested portable ID and it
 * satisfies the FEP-ef61 proof policy.
+*
+* A {@link Tombstone} is served with `410 Gone` if it has an Object Integrity
+* Proof made with a key of the DID in its ID.  An unsigned tombstone cannot
+* be served as a portable object, so the response is the same as for
+* an object that this server does not store, i.e., `404 Not Found`.
 * @template TContextData The context data to pass to the context.
 * @param request The HTTP request.
 * @param parameters The parameters for handling the portable object.
@@ -3583,17 +3588,27 @@ async function handlePortableObject(request, { values, context, objectDispatcher
 		logger.debug("The serialized object does not match the requested portable object {portableId}.", { portableId: canonicalId });
 		return await onNotFound(request);
 	}
-	if (!result.verified && result.reason.type !== "unsecuredCollection" && result.reason.type !== "unsupportedObjectType") {
-		logger.error("Refusing to serve the portable object {portableId}, as it does not satisfy the FEP-ef61 proof policy: {reason}.  Portable actors, activities, and objects need an Object Integrity Proof made with a key of the DID in their ID.", {
-			portableId: canonicalId,
-			reason: result.reason.type
-		});
-		return portableObjectInternalServerError(request);
+	const tombstone = object instanceof _fedify_vocab.Tombstone;
+	if (!result.verified) {
+		if (tombstone && result.reason.type === "missingProof") {
+			logger.debug("Not serving the tombstone of the portable object {portableId}, as it has no Object Integrity Proof; responding as if this server did not store the object.", { portableId: canonicalId });
+			return await onNotFound(request);
+		}
+		if (tombstone || result.reason.type !== "unsecuredCollection" && result.reason.type !== "unsupportedObjectType") {
+			logger.error("Refusing to serve the portable object {portableId}, as it does not satisfy the FEP-ef61 proof policy: {reason}.  Portable actors, activities, objects, and tombstones need an Object Integrity Proof made with a key of the DID in their ID.", {
+				portableId: canonicalId,
+				reason: result.reason.type
+			});
+			return portableObjectInternalServerError(request);
+		}
 	}
-	return new Response(request.method === "HEAD" ? null : JSON.stringify(jsonLd), { headers: {
-		"Content-Type": PORTABLE_OBJECT_CONTENT_TYPE,
-		Vary: "Accept"
-	} });
+	return new Response(request.method === "HEAD" ? null : JSON.stringify(jsonLd), {
+		status: tombstone ? 410 : 200,
+		headers: {
+			"Content-Type": PORTABLE_OBJECT_CONTENT_TYPE,
+			Vary: "Accept"
+		}
+	});
 }
 function isRequestedPortableObject(object, canonicalId) {
 	return object.id != null && require_http.getCanonicalPortableId(object.id) === canonicalId;
@@ -4497,7 +4512,8 @@ async function handleInboxInternal(request, parameters, span) {
 				documentLoader: ctx.documentLoader,
 				keyCache,
 				meterProvider,
-				tracerProvider
+				tracerProvider,
+				verifyPortableObject: ctx.verifyPortableObject
 			});
 		} catch (error) {
 			if (error instanceof RangeError && await hasMalformedKnownTemporalLiteral(jsonWithoutSig, ctx.contextLoader)) return await respondInvalidActivity(error);
@@ -4699,7 +4715,7 @@ async function handleInboxInternal(request, parameters, span) {
 			});
 		}
 	}
-	if (httpSigKey != null && !await require_owner.doesActorOwnKey(activity, httpSigKey, ctx)) {
+	if (httpSigKey != null && !await require_portable_collection.doesActorOwnKey(activity, httpSigKey, ctx)) {
 		if (deferredLdSignatureError != null) throw deferredLdSignatureError;
 		require_http.getFederationMetrics(parameters.meterProvider).recordSignatureVerificationFailure("actorKeyMismatch", httpSigKey.id == null ? void 0 : require_http.getRemoteHost(httpSigKey.id));
 		logger.error("The signer ({keyId}) and the actor ({actorId}) do not match.", {
@@ -7196,11 +7212,16 @@ var FederationImpl = class extends FederationBuilderImpl {
 			});
 			return parsedActorIds;
 		};
-		const parseActivity = () => _fedify_vocab.Activity.fromJsonLd(message.activity, {
-			contextLoader: this.contextLoaderFactory(loaderOptions),
-			documentLoader: rsaKeyPair == null ? this.documentLoaderFactory(loaderOptions) : this.authenticatedDocumentLoaderFactory(rsaKeyPair, loaderOptions),
-			tracerProvider: this.tracerProvider
-		});
+		const parseActivity = () => {
+			const contextLoader = this.contextLoaderFactory(loaderOptions);
+			const documentLoader = rsaKeyPair == null ? this.documentLoaderFactory(loaderOptions) : this.authenticatedDocumentLoaderFactory(rsaKeyPair, loaderOptions);
+			return _fedify_vocab.Activity.fromJsonLd(message.activity, {
+				contextLoader,
+				documentLoader,
+				tracerProvider: this.tracerProvider,
+				verifyPortableObject: createPortableObjectVerifier(documentLoader, contextLoader, this)
+			});
+		};
 		const enqueueHeldOutboxMessage = async (delay, heldSince) => {
 			const { outboxQueue } = this;
 			if (outboxQueue == null) return;
@@ -8388,10 +8409,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			return await handlePortableObject(request, {
 				values: { identifier },
 				context,
-				objectDispatcher: actorDispatcher == null ? void 0 : async (ctx) => {
-					const actor = await actorDispatcher(ctx, identifier);
-					return actor instanceof _fedify_vocab.Tombstone ? null : actor;
-				},
+				objectDispatcher: actorDispatcher == null ? void 0 : (ctx) => actorDispatcher(ctx, identifier),
 				authorizePredicate: authorizePredicate == null ? void 0 : (ctx) => authorizePredicate(ctx, identifier),
 				canonicalId: portable.canonicalId,
 				onUnauthorized,
@@ -8679,12 +8697,28 @@ function getCollectionMetricRoute(routeName) {
 	}
 }
 const FANOUT_THRESHOLD = 5;
+/**
+* Creates the FEP-ef61 portable object verifier that a context applies to
+* portable objects it dereferences: `verifyPortableObject()` with the given
+* loaders and the federation's tracer provider as defaults.  Other options,
+* such as the document URL, gateways, and referrer, are passed through as
+* they are.
+*/
+function createPortableObjectVerifier(documentLoader, contextLoader, federation) {
+	return (document, options = {}) => require_portable_collection.verifyPortableObject(document, {
+		...options,
+		documentLoader: options.documentLoader ?? documentLoader,
+		contextLoader: options.contextLoader ?? contextLoader,
+		tracerProvider: options.tracerProvider ?? federation.tracerProvider
+	});
+}
 var ContextImpl = class ContextImpl {
 	url;
 	federation;
 	data;
 	documentLoader;
 	contextLoader;
+	verifyPortableObject;
 	invokedFromActorKeyPairsDispatcher;
 	#codec;
 	constructor({ url, federation, data, documentLoader, contextLoader, invokedFromActorKeyPairsDispatcher }) {
@@ -8693,6 +8727,7 @@ var ContextImpl = class ContextImpl {
 		this.data = data;
 		this.documentLoader = documentLoader;
 		this.contextLoader = contextLoader;
+		this.verifyPortableObject = createPortableObjectVerifier(documentLoader, contextLoader, federation);
 		this.invokedFromActorKeyPairsDispatcher = invokedFromActorKeyPairsDispatcher;
 	}
 	/**
@@ -9044,7 +9079,7 @@ var ContextImpl = class ContextImpl {
 			userAgent: options.userAgent ?? this.federation.userAgent,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
 			meterProvider: options.meterProvider ?? this.meterProvider,
-			verifyPortableObject: options.verifyPortableObject ?? require_http.verifyPortableObjectProof,
+			verifyPortableObject: options.verifyPortableObject ?? this.verifyPortableObject,
 			allowPrivateAddress: this.federation.allowPrivateAddress
 		});
 	}
@@ -9052,7 +9087,8 @@ var ContextImpl = class ContextImpl {
 		return (0, _fedify_vocab.traverseCollection)(collection, {
 			...options,
 			documentLoader: options.documentLoader ?? this.documentLoader,
-			contextLoader: options.contextLoader ?? this.contextLoader
+			contextLoader: options.contextLoader ?? this.contextLoader,
+			verifyPortableObject: options.verifyPortableObject ?? this.verifyPortableObject
 		});
 	}
 	lookupNodeInfo(url, options = {}) {
@@ -9478,7 +9514,7 @@ var RequestContextImpl = class RequestContextImpl extends ContextImpl {
 		const key = await this.getSignedKey(options);
 		if (key == null) return this.#signedKeyOwner = null;
 		try {
-			return this.#signedKeyOwner = await require_owner.getKeyOwner(key, {
+			return this.#signedKeyOwner = await require_portable_collection.getKeyOwner(key, {
 				contextLoader: options.contextLoader ?? this.contextLoader,
 				documentLoader: options.documentLoader ?? this.documentLoader,
 				tracerProvider: options.tracerProvider ?? this.tracerProvider

package/dist/{http-BcLnr2do.mjs → http-BFeK9sBg.mjs}

@@ -1,11 +1,11 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CCABdw7r.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-em_7lwhG.mjs";
+import { n as version, t as name } from "./deno-Be9xoxps.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-DDE9S63Q.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CPVqki78.mjs";
-import { a as fetchKeyDetailed, c as validateCryptoKey, t as bypassKeyCacheReads } from "./key-CkNxztNV.mjs";
-import { n as verifyPortableGatewayKeyDocument } from "./portable-key-9ck61lI0.mjs";
+import { a as fetchKeyDetailed, c as validateCryptoKey, t as bypassKeyCacheReads } from "./key-Cc1b6pW9.mjs";
+import { n as verifyPortableGatewayKeyDocument } from "./portable-key-C-fPq_Yf.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{http-Ce6_Lf7k.js → http-Rmbiu-5S.js}

@@ -14,7 +14,7 @@ import serialize from "json-canon";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.2115+e2feaf2b";
+var version = "2.4.0-dev.2127+c41ce2eb";
 //#endregion
 //#region src/sig/portable-key-id.ts
 const COMPATIBLE_KEY_ID_PATH_PATTERN = /^\/\.well-known\/apgateway\/did(?::|%3A)/i;

package/dist/{http-B4mQvNcv.cjs → http-o8l4QeUY.cjs}

@@ -16,7 +16,7 @@ json_canon = require_rolldown_runtime.__toESM(json_canon, 1);
 let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conventions");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.2115+e2feaf2b";
+var version = "2.4.0-dev.2127+c41ce2eb";
 //#endregion
 //#region src/sig/portable-key-id.ts
 const COMPATIBLE_KEY_ID_PATH_PATTERN = /^\/\.well-known\/apgateway\/did(?::|%3A)/i;

package/dist/{key-CkNxztNV.mjs → key-Cc1b6pW9.mjs}

@@ -1,8 +1,8 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CCABdw7r.mjs";
-import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-em_7lwhG.mjs";
+import { n as version, t as name } from "./deno-Be9xoxps.mjs";
+import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-DDE9S63Q.mjs";
 import { a as isCompatibleKeyId, o as isPortableActorDocument, s as isPortableId } from "./portable-key-id-T7lecIbt.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Multikey, Object as Object$1, isActor } from "@fedify/vocab";

package/dist/{kv-cache-Dqp_E-1g.cjs → kv-cache-BUkgZAcX.cjs}

@@ -1,5 +1,5 @@
 const { URLPattern } = require("urlpattern-polyfill");
-const require_http = require("./http-B4mQvNcv.cjs");
+const require_http = require("./http-o8l4QeUY.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
 let es_toolkit = require("es-toolkit");
@@ -23,21 +23,21 @@ 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);
+		await validateUrl(url, options);
 		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);
+			validateRedirect: (url) => validateUrl(url, options)
+		}), load, options);
 	}
-	async function validateUrl(url) {
+	async function validateUrl(url, options) {
 		if (!allowPrivateAddress) try {
 			await (0, _fedify_vocab_runtime.validatePublicUrl)(url);
 		} catch (error) {
-			if (error instanceof _fedify_vocab_runtime.UrlError) logger$1.error("Disallowed private URL: {url}", {
+			if (error instanceof _fedify_vocab_runtime.UrlError) logger$1[options?.suppressError ? "warn" : "error"]("Disallowed private URL: {url}", {
 				url,
 				error
 			});

package/dist/{kv-cache-DwzXzchj.js → kv-cache-BweDce2I.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { H as validateCryptoKey, et as recordDocumentCache, t as doubleKnock } from "./http-Ce6_Lf7k.js";
+import { H as validateCryptoKey, et as recordDocumentCache, t as doubleKnock } from "./http-Rmbiu-5S.js";
 import { getLogger } from "@logtape/logtape";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";
 import { curry } from "es-toolkit";
@@ -24,21 +24,21 @@ const logger$1 = getLogger([
 function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedirection, userAgent, specDeterminer, tracerProvider } = {}) {
 	validateCryptoKey(identity.privateKey);
 	async function load(url, options) {
-		await validateUrl(url);
+		await validateUrl(url, options);
 		return getRemoteDocument(url, await doubleKnock(createActivityPubRequest(url, { userAgent }), identity, {
 			maxRedirection,
 			specDeterminer,
 			log: curry(logRequest)(logger$1),
 			tracerProvider,
 			signal: options?.signal,
-			validateRedirect: validateUrl
-		}), load);
+			validateRedirect: (url) => validateUrl(url, options)
+		}), load, options);
 	}
-	async function validateUrl(url) {
+	async function validateUrl(url, options) {
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(url);
 		} catch (error) {
-			if (error instanceof UrlError) logger$1.error("Disallowed private URL: {url}", {
+			if (error instanceof UrlError) logger$1[options?.suppressError ? "warn" : "error"]("Disallowed private URL: {url}", {
 				url,
 				error
 			});

package/dist/{kv-cache-iFaRIcIL.mjs → kv-cache-tLKBfxHc.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { p as recordDocumentCache } from "./metrics-em_7lwhG.mjs";
+import { p as recordDocumentCache } from "./metrics-DDE9S63Q.mjs";
 import { getLogger } from "@logtape/logtape";
 import { preloadedContexts } from "@fedify/vocab-runtime";
 //#region src/utils/kv-cache.ts

package/dist/{ld-CnT0f1nU.mjs → ld-DQNTIrAe.mjs}

@@ -1,9 +1,9 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CCABdw7r.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-em_7lwhG.mjs";
-import { c as validateCryptoKey, i as fetchKey, t as bypassKeyCacheReads } from "./key-CkNxztNV.mjs";
+import { n as version, t as name } from "./deno-Be9xoxps.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-DDE9S63Q.mjs";
+import { c as validateCryptoKey, i as fetchKey, t as bypassKeyCacheReads } from "./key-Cc1b6pW9.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{metrics-em_7lwhG.mjs → metrics-DDE9S63Q.mjs}

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CCABdw7r.mjs";
+import { n as version, t as name } from "./deno-Be9xoxps.mjs";
 import { metrics } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";
 //#region src/federation/metrics.ts