@fedify/fedify 2.1.28 → 2.1.30

package/dist/{assert_rejects-B-qJtC9Z.mjs → assert_rejects-WyYSTDDX.mjs}

@@ -2,25 +2,7 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { l as AssertionError } from "./assert_equals-Ew3jOFa3.mjs";
-import { n as assertIsError } from "./assert_throws-4NwKEy2q.mjs";
-//#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_false.js
-/**
-* Make an assertion, error will be thrown if `expr` have truthy value.
-*
-* @example Usage
-* ```ts no-eval
-* import { assertFalse } from "@std/assert/assert-false";
-*
-* assertFalse(false); // Doesn't throw
-* assertFalse(true); // Throws
-* ```
-*
-* @param expr The expression to test.
-* @param msg The optional message to display if the assertion fails.
-*/ function assertFalse(expr, msg = "") {
-	if (expr) throw new AssertionError(msg);
-}
-//#endregion
+import { n as assertIsError } from "./assert_throws-D4DNWrux.mjs";
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_rejects.js
 async function assertRejects(fn, errorClassOrMsg, msgIncludesOrMsg, msg) {
 	let ErrorClass = void 0;
@@ -54,4 +36,4 @@ async function assertRejects(fn, errorClassOrMsg, msgIncludesOrMsg, msg) {
 	return err;
 }
 //#endregion
-export { assertFalse as n, assertRejects as t };
+export { assertRejects as t };

package/dist/{assert_throws-4NwKEy2q.mjs → assert_throws-D4DNWrux.mjs}

@@ -2,6 +2,24 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { l as AssertionError, o as stripAnsiCode } from "./assert_equals-Ew3jOFa3.mjs";
+//#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_false.js
+/**
+* Make an assertion, error will be thrown if `expr` have truthy value.
+*
+* @example Usage
+* ```ts no-eval
+* import { assertFalse } from "@std/assert/assert-false";
+*
+* assertFalse(false); // Doesn't throw
+* assertFalse(true); // Throws
+* ```
+*
+* @param expr The expression to test.
+* @param msg The optional message to display if the assertion fails.
+*/ function assertFalse(expr, msg = "") {
+	if (expr) throw new AssertionError(msg);
+}
+//#endregion
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_is_error.js
 /**
 * Make an assertion that `error` is an `Error`.
@@ -70,4 +88,4 @@ function assertThrows(fn, errorClassOrMsg, msgIncludesOrMsg, msg) {
 	return err;
 }
 //#endregion
-export { assertIsError as n, assertThrows as t };
+export { assertIsError as n, assertFalse as r, assertThrows as t };

package/dist/{builder-CW1BrLbm.mjs → builder-CTpfuuVp.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-CJgU2mcr.mjs";
-import { t as InboxListenerSet } from "./inbox-CVYVJI0M.mjs";
+import { n as version, t as name } from "./deno-BATJ1hq6.mjs";
+import { t as InboxListenerSet } from "./inbox-9MlBGgs9.mjs";
 import { getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
@@ -44,7 +44,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-CqQoREZ9.mjs");
+		const { FederationImpl } = await import("./middleware-Bi5D6DBT.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/compat/transformers.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as MemoryKvStore } from "../kv-HvthQAHr.mjs";
-import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-SSrXiJIV.mjs";
+import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-CE0b69gj.mjs";
 import { test } from "@fedify/fixture";
 import { Follow, Person } from "@fedify/vocab";
 //#region src/compat/transformers.test.ts

package/dist/{deno-CJgU2mcr.mjs → deno-BATJ1hq6.mjs}

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

package/dist/{docloader-o3fCIlIa.mjs → docloader-OLWc7P2D.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { s as validateCryptoKey } from "./key-DRLvwDTh.mjs";
-import { n as doubleKnock } from "./http-Dcj1ulAh.mjs";
+import { s as validateCryptoKey } from "./key-ClQh9Qqh.mjs";
+import { n as doubleKnock } from "./http-Bjd6I92u.mjs";
 import { curry } from "es-toolkit";
 import { FetchError, UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
 import { getLogger } from "@logtape/logtape";
@@ -58,6 +58,10 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, userAge
 		});
 	}
 	async function validateUrl(url) {
+		const parsedUrl = new URL(url);
+		const protocol = parsedUrl.protocol;
+		if (protocol !== "http:" && protocol !== "https:") throw new UrlError(`Unsupported protocol: ${protocol}`);
+		if (parsedUrl.username !== "" || parsedUrl.password !== "") throw new UrlError("URLs with credentials are not allowed");
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(url);
 		} catch (error) {

package/dist/federation/builder.test.mjs

@@ -2,10 +2,10 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { i as assertExists, n as assertStrictEquals } from "../std__assert-BUOJXi-Z.mjs";
-import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
+import { i as assertExists, n as assertStrictEquals } from "../std__assert-DflMZha5.mjs";
+import { t as assertThrows } from "../assert_throws-D4DNWrux.mjs";
 import { t as MemoryKvStore } from "../kv-HvthQAHr.mjs";
-import { n as createFederationBuilder } from "../builder-CW1BrLbm.mjs";
+import { n as createFederationBuilder } from "../builder-CTpfuuVp.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

@@ -2,7 +2,7 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BUOJXi-Z.mjs";
+import "../std__assert-DflMZha5.mjs";
 import { n as digest, t as buildCollectionSynchronizationHeader } from "../collection-BD6-SZ6O.mjs";
 import { test } from "@fedify/fixture";
 import { decodeHex } from "byte-encodings/hex";

package/dist/federation/handler.test.mjs

@@ -3,18 +3,18 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as createRequestContext, t as createInboxContext } from "../context-Juj6bdHC.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BUOJXi-Z.mjs";
-import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
+import "../std__assert-DflMZha5.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
+import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
 import { r as parseAcceptSignature } from "../accept-BavzedPB.mjs";
-import { a as generateCryptoKeyPair } from "../key-DRLvwDTh.mjs";
-import { s as signRequest } from "../http-Dcj1ulAh.mjs";
-import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-CtZLJq76.mjs";
+import { a as generateCryptoKeyPair } from "../key-ClQh9Qqh.mjs";
+import { s as signRequest } from "../http-Bjd6I92u.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CtZLJq76.mjs";
 import { t as MemoryKvStore } from "../kv-HvthQAHr.mjs";
-import { a as compactJsonLd, f as signJsonLd } from "../ld-C5BZ98YK.mjs";
-import { n as signObject } from "../proof-BTknCsN7.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-SSrXiJIV.mjs";
-import { t as InboxListenerSet } from "../inbox-CVYVJI0M.mjs";
+import { a as compactJsonLd, f as signJsonLd } from "../ld-Crg0Xmwr.mjs";
+import { n as signObject } from "../proof-DMIAezxz.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-CE0b69gj.mjs";
+import { t as InboxListenerSet } from "../inbox-9MlBGgs9.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, CryptographicKey, Multikey, Note, Person } from "@fedify/vocab";
 import { FetchError } from "@fedify/vocab-runtime";
@@ -2470,6 +2470,259 @@ test("handleInbox() - authentication bypass vulnerability", async () => {
 	assertEquals(await response.text(), "The signer and the actor do not match.");
 	assertEquals(processedActivity, void 0, `SECURITY VULNERABILITY: Malicious activity with mismatched signature was processed! Activity ID: ${processedActivity?.id?.href}, Claimed actor: ${processedActivity?.actorId?.href}`);
 });
+test("handleInbox() rejects cross-origin activity IDs", async () => {
+	const federation = createFederation({ kv: new MemoryKvStore() });
+	const kv = new MemoryKvStore();
+	const inboxListeners = new InboxListenerSet();
+	let idempotencyCalls = 0;
+	let listenerCalls = 0;
+	inboxListeners.add(Create, () => {
+		listenerCalls++;
+	});
+	const activity = new Create({
+		id: new URL("https://victim.example/activities/1"),
+		actor: rsaPublicKey3.ownerId,
+		object: new Note({ content: "Forged" })
+	});
+	const activityJson = await activity.toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader
+	});
+	const proofSigned = await signObject(activity, ed25519PrivateKey, ed25519Multikey.id, {
+		contextLoader: mockDocumentLoader,
+		documentLoader: mockDocumentLoader
+	});
+	const requests = [
+		await signRequest(new Request("https://local.example/inbox", {
+			method: "POST",
+			body: JSON.stringify(activityJson)
+		}), rsaPrivateKey3, rsaPublicKey3.id),
+		new Request("https://local.example/inbox", {
+			method: "POST",
+			body: JSON.stringify(await signJsonLd(activityJson, rsaPrivateKey3, rsaPublicKey3.id, { contextLoader: mockDocumentLoader }))
+		}),
+		new Request("https://local.example/inbox", {
+			method: "POST",
+			body: JSON.stringify(await proofSigned.toJsonLd({
+				format: "compact",
+				contextLoader: mockDocumentLoader
+			}))
+		}),
+		await signRequest(new Request("https://local.example/inbox", {
+			method: "POST",
+			body: JSON.stringify(await new Create({
+				id: new URL("https://example.com/activities/multiple-actors"),
+				actors: [rsaPublicKey3.ownerId, new URL("https://attacker.example/actor")]
+			}).toJsonLd())
+		}), rsaPrivateKey3, rsaPublicKey3.id)
+	];
+	for (const request of requests) {
+		const context = createRequestContext({
+			federation,
+			request,
+			url: new URL(request.url),
+			data: void 0,
+			documentLoader: mockDocumentLoader,
+			contextLoader: mockDocumentLoader
+		});
+		const response = await handleInbox(request, {
+			recipient: null,
+			context,
+			inboxContextFactory(_activity) {
+				return createInboxContext({
+					...context,
+					clone: void 0
+				});
+			},
+			kv,
+			kvPrefixes: {
+				activityIdempotence: ["_fedify", "activityIdempotence"],
+				publicKey: ["_fedify", "publicKey"],
+				acceptSignatureNonce: ["_fedify", "acceptSignatureNonce"]
+			},
+			actorDispatcher: () => null,
+			inboxListeners,
+			idempotencyStrategy() {
+				idempotencyCalls++;
+				return "forged";
+			},
+			onNotFound: () => new Response("Not found", { status: 404 }),
+			signatureTimeWindow: { minutes: 5 },
+			skipSignatureVerification: false
+		});
+		assertEquals([response.status, await response.text()], [401, "The activity and its actors do not have the same origin."]);
+	}
+	assertEquals(idempotencyCalls, 0);
+	assertEquals(listenerCalls, 0);
+});
+test("handleInbox() preserves the signature-verification opt-out", async () => {
+	const federation = createFederation({ kv: new MemoryKvStore() });
+	const activity = new Create({
+		id: new URL("https://victim.example/activities/1"),
+		actor: new URL("https://attacker.example/actor")
+	});
+	const request = new Request("https://local.example/inbox", {
+		method: "POST",
+		body: JSON.stringify(await activity.toJsonLd())
+	});
+	const context = createRequestContext({
+		federation,
+		request,
+		url: new URL(request.url),
+		data: void 0,
+		documentLoader: mockDocumentLoader
+	});
+	let listenerCalls = 0;
+	const inboxListeners = new InboxListenerSet();
+	inboxListeners.add(Create, () => {
+		listenerCalls++;
+	});
+	assertEquals((await handleInbox(request, {
+		recipient: null,
+		context,
+		inboxContextFactory(_activity) {
+			return createInboxContext({
+				...context,
+				clone: void 0
+			});
+		},
+		kv: new MemoryKvStore(),
+		kvPrefixes: {
+			activityIdempotence: ["_fedify", "activityIdempotence"],
+			publicKey: ["_fedify", "publicKey"],
+			acceptSignatureNonce: ["_fedify", "acceptSignatureNonce"]
+		},
+		actorDispatcher: () => null,
+		inboxListeners,
+		onNotFound: () => new Response("Not found", { status: 404 }),
+		signatureTimeWindow: { minutes: 5 },
+		skipSignatureVerification: true
+	})).status, 202);
+	assertEquals(listenerCalls, 1);
+});
+test("handleInbox() rejects missing actors before idempotency", async () => {
+	const federation = createFederation({ kv: new MemoryKvStore() });
+	const unsignedJson = {
+		"@context": "https://www.w3.org/ns/activitystreams",
+		id: "https://remote.example/activities/actorless",
+		type: "Create"
+	};
+	const requests = [new Request("https://local.example/inbox", {
+		method: "POST",
+		body: JSON.stringify(unsignedJson)
+	}), new Request("https://local.example/inbox", {
+		method: "POST",
+		body: JSON.stringify(await signJsonLd(unsignedJson, rsaPrivateKey3, rsaPublicKey3.id, { contextLoader: mockDocumentLoader }))
+	})];
+	let idempotencyCalls = 0;
+	for (const request of requests) {
+		const context = createRequestContext({
+			federation,
+			request,
+			url: new URL(request.url),
+			data: void 0,
+			documentLoader: mockDocumentLoader,
+			contextLoader: mockDocumentLoader
+		});
+		const response = await handleInbox(request, {
+			recipient: null,
+			context,
+			inboxContextFactory(_activity) {
+				return createInboxContext({
+					...context,
+					clone: void 0
+				});
+			},
+			kv: new MemoryKvStore(),
+			kvPrefixes: {
+				activityIdempotence: ["_fedify", "activityIdempotence"],
+				publicKey: ["_fedify", "publicKey"],
+				acceptSignatureNonce: ["_fedify", "acceptSignatureNonce"]
+			},
+			actorDispatcher: () => null,
+			idempotencyStrategy() {
+				idempotencyCalls++;
+				return "actorless";
+			},
+			onNotFound: () => new Response("Not found", { status: 404 }),
+			signatureTimeWindow: { minutes: 5 },
+			skipSignatureVerification: false
+		});
+		assertEquals([response.status, await response.text()], [400, "Missing actor."]);
+	}
+	assertEquals(idempotencyCalls, 0);
+});
+test("handleInbox() leaves a rejected activity ID available", async () => {
+	const activityId = new URL("https://example.com/activities/genuine");
+	const attackerId = new URL("https://attacker.example/actor");
+	const attackerKeyId = new URL(`${attackerId.href}#main-key`);
+	const attackerKeys = await generateCryptoKeyPair("RSASSA-PKCS1-v1_5");
+	const attackerDocument = await new Person({
+		id: attackerId,
+		publicKey: new CryptographicKey({
+			id: attackerKeyId,
+			owner: attackerId,
+			publicKey: attackerKeys.publicKey
+		})
+	}).toJsonLd({ contextLoader: mockDocumentLoader });
+	const documentLoader = (resource) => resource === attackerId.href || resource === attackerKeyId.href ? Promise.resolve({
+		contextUrl: null,
+		documentUrl: resource,
+		document: attackerDocument
+	}) : mockDocumentLoader(resource);
+	for (const strategy of ["per-inbox", "global"]) {
+		const kv = new MemoryKvStore();
+		const federation = createFederation({ kv });
+		const inboxListeners = new InboxListenerSet();
+		const received = [];
+		inboxListeners.add(Create, (_ctx, activity) => {
+			received.push(activity.actorId.href);
+		});
+		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
+					});
+				},
+				kv,
+				kvPrefixes: {
+					activityIdempotence: ["_fedify", "activityIdempotence"],
+					publicKey: ["_fedify", "publicKey"],
+					acceptSignatureNonce: ["_fedify", "acceptSignatureNonce"]
+				},
+				actorDispatcher: () => null,
+				inboxListeners,
+				idempotencyStrategy: strategy,
+				onNotFound: () => new Response("Not found", { status: 404 }),
+				signatureTimeWindow: { minutes: 5 },
+				skipSignatureVerification: false
+			});
+		};
+		const createRequest = async (actor, privateKey, keyId) => await signRequest(new Request("https://local.example/inbox", {
+			method: "POST",
+			body: JSON.stringify(await new Create({
+				id: activityId,
+				actor
+			}).toJsonLd())
+		}), privateKey, keyId);
+		const forged = await handle(await createRequest(attackerId, attackerKeys.privateKey, attackerKeyId));
+		const genuine = await handle(await createRequest(rsaPublicKey3.ownerId, rsaPrivateKey3, rsaPublicKey3.id));
+		assertEquals([forged.status, genuine.status], [401, 202]);
+		assertEquals(received, [rsaPublicKey3.ownerId.href]);
+	}
+});
 test("respondWithObjectIfAcceptable", async () => {
 	let request = new Request("https://example.com/", { headers: { Accept: "application/activity+json" } });
 	let response = await respondWithObjectIfAcceptable(new Note({

package/dist/federation/idempotency.test.mjs

@@ -2,11 +2,11 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BUOJXi-Z.mjs";
+import "../std__assert-DflMZha5.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-CtZLJq76.mjs";
 import { t as MemoryKvStore } from "../kv-HvthQAHr.mjs";
-import { n as signObject } from "../proof-BTknCsN7.mjs";
-import { a as createFederation } from "../middleware-SSrXiJIV.mjs";
+import { n as signObject } from "../proof-DMIAezxz.mjs";
+import { a as createFederation } from "../middleware-CE0b69gj.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

@@ -2,11 +2,34 @@ import "@js-temporal/polyfill";
 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-CVYVJI0M.mjs";
+import { r as assertFalse, t as assertThrows } from "../assert_throws-D4DNWrux.mjs";
+import { n as actorsHaveSameOrigin, t as InboxListenerSet } from "../inbox-9MlBGgs9.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
 //#region src/federation/inbox.test.ts
+test("actorsHaveSameOrigin()", () => {
+	assertEquals(actorsHaveSameOrigin(new Create({ actor: new URL("https://remote.example/actor") })), true);
+	assertEquals(actorsHaveSameOrigin(new Create({
+		id: new URL("https://remote.example/activity"),
+		actors: [new URL("https://remote.example/actor/1"), new URL("https://remote.example:443/actor/2")]
+	})), true);
+	for (const actor of [
+		"http://remote.example/actor",
+		"https://sub.remote.example/actor",
+		"https://remote.example:8443/actor"
+	]) assertFalse(actorsHaveSameOrigin(new Create({
+		id: new URL("https://remote.example/activity"),
+		actor: new URL(actor)
+	})));
+	assertFalse(actorsHaveSameOrigin(new Create({
+		id: new URL("urn:example:activity"),
+		actor: new URL("urn:example:actor")
+	})));
+	assertFalse(actorsHaveSameOrigin(new Create({
+		id: new URL("https://remote.example/activity"),
+		actors: [new URL("https://remote.example/actor/1"), new URL("https://other.example/actor/2")]
+	})));
+});
 test("InboxListenerSet", () => {
 	const listeners = new InboxListenerSet();
 	const activity = new Activity({});

package/dist/federation/keycache.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
-import { t as KvKeyCache } from "../keycache-RFlZObU3.mjs";
+import { t as KvKeyCache } from "../keycache-DahCaG_m.mjs";
 import { t as MemoryKvStore } from "../kv-HvthQAHr.mjs";
 import { test } from "@fedify/fixture";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
@@ -14,7 +14,7 @@ test("KvKeyCache.set()", async () => {
 	await cache.set(new URL("https://example.com/key"), new CryptographicKey({ id: new URL("https://example.com/key") }));
 	assertEquals(await kv.get([
 		"pk",
-		"2",
+		"3",
 		"https://example.com/key"
 	]), {
 		"@context": "https://w3id.org/security/v1",
@@ -24,7 +24,7 @@ test("KvKeyCache.set()", async () => {
 	await cache.set(new URL("https://example.com/key2"), new Multikey({ id: new URL("https://example.com/key2") }));
 	assertEquals(await kv.get([
 		"pk",
-		"2",
+		"3",
 		"https://example.com/key2"
 	]), {
 		"@context": "https://w3id.org/security/multikey/v1",
@@ -35,7 +35,7 @@ test("KvKeyCache.set()", async () => {
 	assert(cache.nullKeys.has("https://example.com/null"));
 	assertEquals(await kv.get([
 		"pk",
-		"2",
+		"3",
 		"https://example.com/null"
 	]), null);
 });
@@ -44,7 +44,7 @@ test("KvKeyCache.get()", async () => {
 	const cache = new KvKeyCache(kv, ["pk"]);
 	await kv.set([
 		"pk",
-		"2",
+		"3",
 		"https://example.com/key"
 	], {
 		"@context": "https://w3id.org/security/v1",
@@ -56,7 +56,7 @@ test("KvKeyCache.get()", async () => {
 	assertEquals(cryptoKey?.id?.href, "https://example.com/key");
 	await kv.set([
 		"pk",
-		"2",
+		"3",
 		"https://example.com/key2"
 	], {
 		"@context": "https://w3id.org/security/multikey/v1",
@@ -70,7 +70,7 @@ test("KvKeyCache.get()", async () => {
 	assertEquals(await cache.get(new URL("https://example.com/null")), null);
 	await kv.set([
 		"pk",
-		"2",
+		"3",
 		"https://example.com/null2"
 	], null);
 	assertEquals(await new KvKeyCache(kv, ["pk"]).get(new URL("https://example.com/null2")), null);
@@ -154,6 +154,17 @@ test("KvKeyCache.get() ignores entries from an earlier generation", async () =>
 		type: "CryptographicKey"
 	});
 	assertEquals(await cache.get(new URL("https://example.com/key")), void 0);
+	await kv.set([
+		"pk",
+		"2",
+		"https://example.com/key2"
+	], {
+		"@context": "https://w3id.org/security/v1",
+		id: "https://example.com/key2",
+		owner: "https://example.com/impersonated",
+		type: "CryptographicKey"
+	});
+	assertEquals(await cache.get(new URL("https://example.com/key2")), void 0);
 });
 //#endregion
 export {};

package/dist/federation/kv.test.mjs

@@ -2,7 +2,7 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BUOJXi-Z.mjs";
+import "../std__assert-DflMZha5.mjs";
 import { t as MemoryKvStore } from "../kv-HvthQAHr.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/kv.test.ts