@fedify/fedify 2.0.28-dev.1974 → 2.0.28-dev.1982

package/dist/{assert_instance_of-C4Ri6VuN.mjs → assert-BhQd8QHP.mjs}

@@ -34,4 +34,22 @@ import { l as AssertionError } from "./assert_equals-Ew3jOFa3.mjs";
 	throw new AssertionError(msg);
 }
 //#endregion
-export { assertInstanceOf as t };
+//#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert.js
+/**
+* Make an assertion, error will be thrown if `expr` does not have truthy value.
+*
+* @example Usage
+* ```ts no-eval
+* import { assert } from "@std/assert/assert";
+*
+* assert("hello".includes("ello")); // Doesn't throw
+* assert("hello".includes("world")); // Throws
+* ```
+*
+* @param expr The expression to test.
+* @param msg The optional message to display if the assertion fails.
+*/ function assert(expr, msg = "") {
+	if (!expr) throw new AssertionError(msg);
+}
+//#endregion
+export { assertInstanceOf as n, assert as t };

package/dist/{builder-DBKy92BX.mjs → builder-DG5rS_Zv.mjs}

@@ -2,8 +2,8 @@ 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-CGtm12Ft.mjs";
-import { t as InboxListenerSet } from "./inbox-BZNyUPzW.mjs";
+import { n as version, t as name } from "./deno-eqaJj6JL.mjs";
+import { t as InboxListenerSet } from "./inbox-Hou2ZAjv.mjs";
 import { getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
@@ -42,7 +42,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-sbzAVAzo.mjs");
+		const { FederationImpl } = await import("./middleware-DXPBIbm6.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/{client-HLLGHiTU.mjs → client-glFHmpn4.mjs}

@@ -1,8 +1,82 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { UrlError, getUserAgent, validatePublicUrl } from "@fedify/vocab-runtime";
+import { FetchError, UrlError, getUserAgent, validatePublicUrl } from "@fedify/vocab-runtime";
 import { getLogger } from "@logtape/logtape";
+//#region src/utils/body.ts
+/** Decoded JSON body limit: 16 MiB.  @internal */
+const MAX_BODY_SIZE = 16 * 1024 * 1024;
+/** A body exceeded the byte limit.  @internal */
+var BodyTooLargeError = class extends FetchError {
+	/** Creates an error for a body exceeding the given limit. */
+	constructor(url, maxBytes) {
+		super(url, `Body exceeds the limit of ${maxBytes} bytes`);
+		this.name = "BodyTooLargeError";
+	}
+};
+/** Validates a finite, positive byte limit.  @internal */
+function validateBodySizeLimit(maxBytes) {
+	if (!Number.isSafeInteger(maxBytes) || maxBytes <= 0) throw new RangeError("The body size limit must be a positive safe integer.");
+}
+/**
+* Reads UTF-8 text while limiting bytes received from the body stream.
+* Fetch responses are already decompressed, so the stream count is authoritative.
+* @param message The response or request to read.
+* @param maxBytes The maximum number of decoded bytes to read.
+* @param url The URL to include in errors and logs.
+* @returns The decoded body text.
+* @throws {BodyTooLargeError} If the body exceeds the limit.
+* @internal
+*/
+async function readBoundedText(message, maxBytes, url) {
+	validateBodySizeLimit(maxBytes);
+	const reader = message.body?.getReader();
+	const tooLarge = () => {
+		getLogger([
+			"fedify",
+			"runtime",
+			"body"
+		]).warn("Body from {url} exceeds the limit of {maxBytes} bytes.", {
+			url: url.toString(),
+			maxBytes
+		});
+		throw new BodyTooLargeError(url, maxBytes);
+	};
+	try {
+		const length = message.headers.get("Content-Length");
+		const encoding = message.headers.get("Content-Encoding");
+		if ((encoding == null || encoding.toLowerCase() === "identity") && length != null && /^\d+$/.test(length) && Number(length) > maxBytes) tooLarge();
+		if (reader == null) return "";
+		let size = 0;
+		const textReader = new ReadableStream({ async pull(controller) {
+			const { done, value } = await reader.read();
+			if (done) {
+				controller.close();
+				return;
+			}
+			size += value.byteLength;
+			if (size > maxBytes) tooLarge();
+			controller.enqueue(value);
+		} }, { highWaterMark: 0 }).pipeThrough(new TextDecoderStream()).getReader();
+		try {
+			const chunks = [];
+			while (true) {
+				const { done, value } = await textReader.read();
+				if (done) break;
+				chunks.push(value);
+			}
+			return chunks.join("");
+		} finally {
+			textReader.releaseLock();
+		}
+	} catch (error) {
+		if (reader != null) reader.cancel(error).catch(() => {});
+		throw error;
+	} finally {
+		reader?.releaseLock();
+	}
+}
+//#endregion
 //#region src/nodeinfo/client.ts
 const logger = getLogger([
 	"fedify",
@@ -83,7 +157,7 @@ async function getNodeInfo(url, options = {}) {
 				});
 				return;
 			}
-			const wellKnownRd = await wellKnownResponse.json();
+			const wellKnownRd = JSON.parse(await readBoundedText(wellKnownResponse, MAX_BODY_SIZE, wellKnownUrl));
 			const link = wellKnownRd?.links?.find((link) => link != null && "rel" in link && (link.rel === "http://nodeinfo.diaspora.software/ns/schema/2.0" || link.rel === "http://nodeinfo.diaspora.software/ns/schema/2.1") && "href" in link && link.href != null);
 			if (link == null || link.href == null) {
 				logger.error("Failed to find a NodeInfo document link from {url}: {resourceDescriptor}", {
@@ -107,7 +181,7 @@ async function getNodeInfo(url, options = {}) {
 			});
 			return;
 		}
-		const data = await response.json();
+		const data = JSON.parse(await readBoundedText(response, MAX_BODY_SIZE, nodeInfoUrl));
 		if (options.parse === "none") return data;
 		return parseNodeInfo(data, { tryBestEffort: options.parse === "best-effort" }) ?? void 0;
 	} catch (error) {
@@ -311,4 +385,4 @@ function parseUsage(data, options = {}) {
 	};
 }
 //#endregion
-export { parseProtocol as a, parseUsage as c, parseOutboundService as i, parseInboundService as n, parseServices as o, parseNodeInfo as r, parseSoftware as s, getNodeInfo as t };
+export { parseProtocol as a, parseUsage as c, readBoundedText as d, parseOutboundService as i, BodyTooLargeError as l, parseInboundService as n, parseServices as o, parseNodeInfo as r, parseSoftware as s, getNodeInfo as t, MAX_BODY_SIZE as u };

package/dist/compat/mod.d.cts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { bt as ActivityTransformer, n as Context } from "../context-CJZHWLmz.cjs";
+import { bt as ActivityTransformer, n as Context } from "../context-M_MxoQgC.cjs";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/mod.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { bt as ActivityTransformer, n as Context } from "../context-DnsFj3yK.js";
+import { bt as ActivityTransformer, n as Context } from "../context-B21klrfz.js";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/transformers.test.mjs

@@ -2,10 +2,9 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 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-ddO5KLpe.mjs";
-import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-DpEJSmjy.mjs";
+import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
+import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
+import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-BuVM1K-J.mjs";
 import { test } from "@fedify/fixture";
 import { Follow, Person } from "@fedify/vocab";
 //#region src/compat/transformers.test.ts

package/dist/{context-DnsFj3yK.d.ts → context-B21klrfz.d.ts}

@@ -1,7 +1,7 @@
 /// <reference lib="esnext.temporal" />
 import { o as JsonValue, s as NodeInfo, t as GetNodeInfoOptions } from "./client-CSddvgWN.js";
-import { t as HttpMessageSignaturesSpec } from "./http-C4D0ajx0.js";
-import { n as GetKeyOwnerOptions } from "./owner-CnngXDNJ.js";
+import { t as HttpMessageSignaturesSpec } from "./http-CDupyfOc.js";
+import { n as GetKeyOwnerOptions } from "./owner-CiBPcC6F.js";
 import { n as KvStore, t as KvKey } from "./kv-D6hNiMTK.js";
 import { Activity, Actor, Collection, CryptographicKey, Hashtag, Link, LookupObjectOptions, Multikey, Object as Object$1, Recipient, TraverseCollectionOptions } from "@fedify/vocab";
 import { Span, Tracer, TracerProvider } from "@opentelemetry/api";
@@ -1391,7 +1391,8 @@ interface FederationOptions<TContextData> {
   */
   authenticatedDocumentLoaderFactory?: AuthenticatedDocumentLoaderFactory;
   /**
-  * Whether to allow fetching private network addresses in the document loader.
+  * Whether to allow private network addresses in the document loader and
+  * outbound activity delivery, including redirects.
   *
   * If turned on, {@link FederationOptions.documentLoader},
   * {@link FederationOptions.contextLoader}, and

package/dist/{context-CJZHWLmz.d.cts → context-M_MxoQgC.d.cts}

@@ -1,7 +1,7 @@
 /// <reference lib="esnext.temporal" />
 import { o as JsonValue, s as NodeInfo, t as GetNodeInfoOptions } from "./client-CAM_bQXx.cjs";
-import { t as HttpMessageSignaturesSpec } from "./http-RYvZHWMc.cjs";
-import { n as GetKeyOwnerOptions } from "./owner-DEvZuyOE.cjs";
+import { t as HttpMessageSignaturesSpec } from "./http-Bs6thuCC.cjs";
+import { n as GetKeyOwnerOptions } from "./owner-B3hNQCG8.cjs";
 import { n as KvStore, t as KvKey } from "./kv-gJ8LYbxX.cjs";
 import { Activity, Actor, Collection, CryptographicKey, Hashtag, Link, LookupObjectOptions, Multikey, Object as Object$1, Recipient, TraverseCollectionOptions } from "@fedify/vocab";
 import { AuthenticatedDocumentLoaderFactory, DocumentLoader, DocumentLoaderFactory, GetUserAgentOptions } from "@fedify/vocab-runtime";
@@ -1391,7 +1391,8 @@ interface FederationOptions<TContextData> {
   */
   authenticatedDocumentLoaderFactory?: AuthenticatedDocumentLoaderFactory;
   /**
-  * Whether to allow fetching private network addresses in the document loader.
+  * Whether to allow private network addresses in the document loader and
+  * outbound activity delivery, including redirects.
   *
   * If turned on, {@link FederationOptions.documentLoader},
   * {@link FederationOptions.contextLoader}, and

package/dist/{deno-CGtm12Ft.mjs → deno-eqaJj6JL.mjs}

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

package/dist/{docloader-_hXTUC-b.mjs → docloader-BXUqhXNd.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { a as validateCryptoKey } from "./key-rC9mW1U5.mjs";
-import { n as doubleKnock } from "./http--P33qRwW.mjs";
+import { o as validateCryptoKey } from "./key-bSphUqhB.mjs";
+import { n as doubleKnock } from "./http-Bu3NxfGb.mjs";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
 import { getLogger } from "@logtape/logtape";

package/dist/federation/builder.test.mjs

@@ -4,8 +4,8 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { a as assertExists } from "../std__assert-Duiq_YC9.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { n as createFederationBuilder } from "../builder-DBKy92BX.mjs";
+import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
+import { n as createFederationBuilder } from "../builder-DG5rS_Zv.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Note, Person } from "@fedify/vocab";
 //#region src/federation/builder.test.ts

package/dist/federation/collection.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.mjs";
-import { n as digest, t as buildCollectionSynchronizationHeader } from "../collection-ChgDTHLz.mjs";
+import { n as digest, t as buildCollectionSynchronizationHeader } from "../collection-DI6YzYpd.mjs";
 import { test } from "@fedify/fixture";
 import { decodeHex } from "byte-encodings/hex";
 //#region src/federation/collection.test.ts

package/dist/federation/handler.test.mjs

@@ -5,15 +5,17 @@ import { n as createRequestContext, t as createInboxContext } from "../context-J
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
-import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { s as signRequest } from "../http--P33qRwW.mjs";
-import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-CtZLJq76.mjs";
-import { a as compactJsonLd, f as signJsonLd } from "../ld-CN2nacLy.mjs";
-import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { a as createFederation, c as handleCollection, d as handleObject, f as respondWithObject, l as handleCustomCollection, p as respondWithObjectIfAcceptable, s as handleActor, u as handleInbox } from "../middleware-DpEJSmjy.mjs";
-import { t as InboxListenerSet } from "../inbox-BZNyUPzW.mjs";
+import { t as assert } from "../assert-BhQd8QHP.mjs";
+import { i as generateCryptoKeyPair } from "../key-bSphUqhB.mjs";
+import { s as signRequest } from "../http-Bu3NxfGb.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-CCxRJhWa.mjs";
+import { a as compactJsonLd, f as signJsonLd } from "../ld-D0uFMLmq.mjs";
+import { n as signObject } from "../proof-CgLA51pO.mjs";
+import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
+import { a as createFederation, c as handleCollection, d as handleObject, f as respondWithObject, l as handleCustomCollection, p as respondWithObjectIfAcceptable, s as handleActor, u as handleInbox } from "../middleware-BuVM1K-J.mjs";
+import { t as InboxListenerSet } from "../inbox-Hou2ZAjv.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
-import { Create, Note, Person } from "@fedify/vocab";
+import { Create, CryptographicKey, Multikey, Note, Person } from "@fedify/vocab";
 //#region src/federation/handler.test.ts
 test("handleActor()", async () => {
 	let context = createRequestContext({
@@ -2856,5 +2858,120 @@ test("handleInbox() records OpenTelemetry span events", async () => {
 	assertEquals(recordedActivity.id, "https://example.com/activity");
 	assertEquals(recordedActivity.type, "Create");
 });
+test("handleInbox() rejects forged key ownership", async () => {
+	const impersonated = "https://example.com/person2";
+	const attackerKeyId = new URL("https://attacker.example/key");
+	const attackerMultikeyId = new URL("https://attacker.example/multikey");
+	const { privateKey, publicKey } = await generateCryptoKeyPair("RSASSA-PKCS1-v1_5");
+	const forgedKeyDocument = await new CryptographicKey({
+		id: attackerKeyId,
+		owner: new URL(impersonated),
+		publicKey
+	}).toJsonLd({ contextLoader: mockDocumentLoader });
+	const ed25519 = await generateCryptoKeyPair("Ed25519");
+	const forgedMultikeyDocument = await new Multikey({
+		id: attackerMultikeyId,
+		controller: new URL(impersonated),
+		publicKey: ed25519.publicKey
+	}).toJsonLd({ contextLoader: mockDocumentLoader });
+	const documentLoader = (resource) => {
+		if (resource === attackerKeyId.href) return Promise.resolve({
+			contextUrl: null,
+			documentUrl: resource,
+			document: forgedKeyDocument
+		});
+		if (resource === attackerMultikeyId.href) return Promise.resolve({
+			contextUrl: null,
+			documentUrl: resource,
+			document: forgedMultikeyDocument
+		});
+		return mockDocumentLoader(resource);
+	};
+	const federation = createFederation({ kv: new MemoryKvStore() });
+	const inboxOptions = {
+		kv: new MemoryKvStore(),
+		kvPrefixes: {
+			activityIdempotence: ["_fedify", "activityIdempotence"],
+			publicKey: ["_fedify", "publicKey"]
+		},
+		actorDispatcher: ((_ctx, identifier) => identifier === "someone" ? new Person({ name: "Someone" }) : null),
+		inboxListeners: new InboxListenerSet(),
+		onNotFound: () => new Response("Not found", { status: 404 }),
+		signatureTimeWindow: { minutes: 5 },
+		skipSignatureVerification: false
+	};
+	const handle = async (request) => {
+		const context = createRequestContext({
+			federation,
+			request,
+			url: new URL(request.url),
+			data: void 0,
+			documentLoader,
+			contextLoader: mockDocumentLoader
+		});
+		return await handleInbox(request, {
+			recipient: null,
+			context,
+			inboxContextFactory(_activity) {
+				return createInboxContext({
+					...context,
+					clone: void 0
+				});
+			},
+			...inboxOptions
+		});
+	};
+	const activity = {
+		"@context": [
+			"https://www.w3.org/ns/activitystreams",
+			"https://w3id.org/identity/v1",
+			"https://w3id.org/security/v1",
+			"https://w3id.org/security/data-integrity/v1"
+		],
+		id: "https://attacker.example/activities/1",
+		type: "Create",
+		actor: impersonated,
+		object: {
+			id: "https://attacker.example/notes/1",
+			type: "Note",
+			attributedTo: impersonated,
+			content: "Hello World!"
+		}
+	};
+	const httpSignedResponse = await handle(await signRequest(new Request("https://example.com/", {
+		method: "POST",
+		body: JSON.stringify(activity)
+	}), privateKey, attackerKeyId));
+	const ldSignedResponse = await handle(new Request("https://example.com/", {
+		method: "POST",
+		body: JSON.stringify(await signJsonLd(activity, privateKey, attackerKeyId, { contextLoader: mockDocumentLoader }))
+	}));
+	const signedObject = await signObject(await Create.fromJsonLd(activity, {
+		documentLoader,
+		contextLoader: mockDocumentLoader
+	}), ed25519.privateKey, attackerMultikeyId, {
+		documentLoader,
+		contextLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	});
+	const proofSignedResponse = await handle(new Request("https://example.com/", {
+		method: "POST",
+		body: JSON.stringify(await signedObject.toJsonLd({
+			format: "compact",
+			contextLoader: mockDocumentLoader,
+			context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+		}))
+	}));
+	assertEquals([
+		httpSignedResponse.status,
+		ldSignedResponse.status,
+		proofSignedResponse.status
+	], [
+		401,
+		401,
+		401
+	]);
+	assertEquals(await httpSignedResponse.text(), "Failed to verify the request signature.");
+});
 //#endregion
 export {};

package/dist/federation/idempotency.test.mjs

@@ -3,10 +3,10 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.mjs";
-import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-CtZLJq76.mjs";
-import { n as signObject } from "../proof-CpEH24hi.mjs";
-import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { a as createFederation } from "../middleware-DpEJSmjy.mjs";
+import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-CCxRJhWa.mjs";
+import { n as signObject } from "../proof-CgLA51pO.mjs";
+import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
+import { a as createFederation } from "../middleware-BuVM1K-J.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, Follow, Person } from "@fedify/vocab";
 //#region src/federation/idempotency.test.ts

package/dist/federation/inbox.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as InboxListenerSet } from "../inbox-BZNyUPzW.mjs";
+import { t as InboxListenerSet } from "../inbox-Hou2ZAjv.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
 //#region src/federation/inbox.test.ts

package/dist/federation/keycache.test.mjs

@@ -2,10 +2,9 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 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-ddO5KLpe.mjs";
-import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { t as KvKeyCache } from "../keycache-DaQ3ndaJ.mjs";
+import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
+import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
+import { t as KvKeyCache } from "../keycache-D239uGT9.mjs";
 import { test } from "@fedify/fixture";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 //#region src/federation/keycache.test.ts
@@ -13,25 +12,41 @@ test("KvKeyCache.set()", async () => {
 	const kv = new MemoryKvStore();
 	const cache = new KvKeyCache(kv, ["pk"]);
 	await cache.set(new URL("https://example.com/key"), new CryptographicKey({ id: new URL("https://example.com/key") }));
-	assertEquals(await kv.get(["pk", "https://example.com/key"]), {
+	assertEquals(await kv.get([
+		"pk",
+		"2",
+		"https://example.com/key"
+	]), {
 		"@context": "https://w3id.org/security/v1",
 		id: "https://example.com/key",
 		type: "CryptographicKey"
 	});
 	await cache.set(new URL("https://example.com/key2"), new Multikey({ id: new URL("https://example.com/key2") }));
-	assertEquals(await kv.get(["pk", "https://example.com/key2"]), {
+	assertEquals(await kv.get([
+		"pk",
+		"2",
+		"https://example.com/key2"
+	]), {
 		"@context": "https://w3id.org/security/multikey/v1",
 		id: "https://example.com/key2",
 		type: "Multikey"
 	});
 	await cache.set(new URL("https://example.com/null"), null);
 	assert(cache.nullKeys.has("https://example.com/null"));
-	assertEquals(await kv.get(["pk", "https://example.com/null"]), { _fedify: "key-unavailable" });
+	assertEquals(await kv.get([
+		"pk",
+		"2",
+		"https://example.com/null"
+	]), { _fedify: "key-unavailable" });
 });
 test("KvKeyCache.get()", async () => {
 	const kv = new MemoryKvStore();
 	const cache = new KvKeyCache(kv, ["pk"]);
-	await kv.set(["pk", "https://example.com/key"], {
+	await kv.set([
+		"pk",
+		"2",
+		"https://example.com/key"
+	], {
 		"@context": "https://w3id.org/security/v1",
 		id: "https://example.com/key",
 		type: "CryptographicKey"
@@ -39,7 +54,11 @@ test("KvKeyCache.get()", async () => {
 	const cryptoKey = await cache.get(new URL("https://example.com/key"));
 	assertInstanceOf(cryptoKey, CryptographicKey);
 	assertEquals(cryptoKey?.id?.href, "https://example.com/key");
-	await kv.set(["pk", "https://example.com/key2"], {
+	await kv.set([
+		"pk",
+		"2",
+		"https://example.com/key2"
+	], {
 		"@context": "https://w3id.org/security/multikey/v1",
 		id: "https://example.com/key2",
 		type: "Multikey"
@@ -49,8 +68,23 @@ test("KvKeyCache.get()", async () => {
 	assertEquals(multikey?.id?.href, "https://example.com/key2");
 	cache.nullKeys.add("https://example.com/null");
 	assertEquals(await cache.get(new URL("https://example.com/null")), null);
-	await kv.set(["pk", "https://example.com/null2"], { _fedify: "key-unavailable" });
+	await kv.set([
+		"pk",
+		"2",
+		"https://example.com/null2"
+	], { _fedify: "key-unavailable" });
 	assertEquals(await new KvKeyCache(kv, ["pk"]).get(new URL("https://example.com/null2")), null);
 });
+test("KvKeyCache.get() ignores entries from an earlier generation", async () => {
+	const kv = new MemoryKvStore();
+	const cache = new KvKeyCache(kv, ["pk"]);
+	await kv.set(["pk", "https://example.com/key"], {
+		"@context": "https://w3id.org/security/v1",
+		id: "https://example.com/key",
+		owner: "https://example.com/impersonated",
+		type: "CryptographicKey"
+	});
+	assertEquals(await cache.get(new URL("https://example.com/key")), void 0);
+});
 //#endregion
 export {};

package/dist/federation/kv.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.mjs";
-import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
+import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/kv.test.ts
 test("MemoryKvStore", async (t) => {