@fedify/fedify 2.4.0-dev.2108 → 2.4.0-dev.2122

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-DDw0i9b1.mjs";
-import { l as signRequest } from "../http-CHEYA5fH.mjs";
+import { i as signObject, s as verifyPortableObjectProof } from "../proof-BCOg7Njv.mjs";
+import { l as signRequest } from "../http-B9BQDNIy.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-B-rZ7oE-.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-CgOqRkK-.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-CHEYA5fH.mjs";
+import { d as verifyRequest } from "../http-B9BQDNIy.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-CY--JSqO.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-CU3sHGPt.mjs";
+import { t as doesActorOwnKey } from "../owner-CPFM-sqo.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-C8eOPat3.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

@@ -4,7 +4,7 @@ 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-B-rZ7oE-.mjs";
+import { o as createFederation } from "../../middleware-CgOqRkK-.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

@@ -4,8 +4,8 @@ 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-B-rZ7oE-.mjs";
-import { r as createFederationBuilder } from "../../builder-BRlYEsrV.mjs";
+import { o as createFederation } from "../../middleware-CgOqRkK-.mjs";
+import { r as createFederationBuilder } from "../../builder-BCXywsZF.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-NHiSpGcW.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-vjHOhBpy.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

@@ -6,7 +6,7 @@ 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-B-rZ7oE-.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-CgOqRkK-.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { parseIri } from "@fedify/vocab-runtime";

package/dist/{federation-dqo6ZzgT.cjs → federation-Ml6NrgRV.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-B7wEqv49.cjs");
+const require_http = require("./http-4bmgw-mA.cjs");
 const require_types = require("./types-Be2zbyeG.cjs");
-const require_owner = require("./owner-CGnHPl4k.cjs");
-const require_kv_cache = require("./kv-cache-0pYMPrkL.cjs");
+const require_owner = require("./owner-DkA0Lz7v.cjs");
+const require_kv_cache = require("./kv-cache-D2Bz6t_c.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,
@@ -2236,6 +2236,11 @@ async function routeActivity({ context: ctx, json, originalJson, normalizedActiv
 //#region src/federation/keycache.ts
 const Temporal$9 = require_http.Temporal;
 const KEY_CACHE_GENERATION = "2";
+const COMPATIBLE_KEY_SEGMENT = "__compatible";
+const MAX_COMPATIBLE_KEY_TTL = Temporal$9.Duration.from({ hours: 1 });
+function isCompatibleKeyEntry(value) {
+	return value != null && typeof value === "object" && "key" in value && "expires" in value && typeof value.expires === "number";
+}
 var KvKeyCache = class {
 	kv;
 	prefix;
@@ -2298,6 +2303,69 @@ var KvKeyCache = class {
 		const serialized = await key.toJsonLd(this.options);
 		await this.kv.set(this.#entryKey(keyId), serialized, { ttl: this.keyTtl });
 	}
+	/**
+	* Returns the namespace of keys at FEP-ef61 compatible identifiers looked
+	* up for the given purpose.  Its entries carry the time they expire, which
+	* is checked when they are read, so that an entry is never used after
+	* the proof that vouched for its key expired, however late the underlying
+	* store evicts it.
+	* @param scope The purpose of the lookups.
+	* @returns The namespace.
+	* @internal
+	*/
+	compatibleKeyScope(scope) {
+		const now = this.options.now ?? (() => Temporal$9.Now.instant());
+		const entryKey = (keyId) => [
+			...this.prefix,
+			COMPATIBLE_KEY_SEGMENT,
+			scope,
+			keyId.href
+		];
+		const isExpired = (entry) => entry.expires <= now().epochMilliseconds;
+		const keyTtl = Math.min(this.keyTtl.total("millisecond"), MAX_COMPATIBLE_KEY_TTL.total("millisecond"));
+		const unavailableKeyTtl = this.unavailableKeyTtl.total("millisecond");
+		return {
+			get: async (keyId) => {
+				const entry = await this.kv.get(entryKey(keyId));
+				if (entry === void 0) return void 0;
+				if (!isCompatibleKeyEntry(entry) || isExpired(entry)) {
+					await this.kv.delete(entryKey(keyId));
+					return;
+				}
+				if (entry.key === null) return null;
+				let key;
+				try {
+					key = await _fedify_vocab.CryptographicKey.fromJsonLd(entry.key, this.options);
+				} catch {
+					try {
+						key = await _fedify_vocab.Multikey.fromJsonLd(entry.key, this.options);
+					} catch {
+						await this.kv.delete(entryKey(keyId));
+						return;
+					}
+				}
+				return isExpired(entry) ? void 0 : key;
+			},
+			set: async (keyId, key, options) => {
+				const serialized = key == null ? null : await key.toJsonLd(this.options);
+				const current = now();
+				let expires = current.epochMilliseconds + (key == null ? unavailableKeyTtl : keyTtl);
+				if (options?.expires != null) expires = Math.min(expires, options.expires.epochMilliseconds);
+				const ttl = expires - current.epochMilliseconds;
+				if (ttl <= 0) {
+					await this.kv.delete(entryKey(keyId));
+					return;
+				}
+				await this.kv.set(entryKey(keyId), {
+					key: serialized,
+					expires
+				}, { ttl: Temporal$9.Duration.from({ milliseconds: ttl }) });
+			},
+			delete: async (keyId) => {
+				await this.kv.delete(entryKey(keyId));
+			}
+		};
+	}
 	async getFetchError(keyId) {
 		const cached = await this.kv.get(this.#getFetchErrorKey(keyId));
 		if (cached == null || typeof cached !== "object") return void 0;
@@ -3468,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.
@@ -3515,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;
@@ -8320,10 +8403,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,