@fedify/fedify 2.4.2 → 2.4.4

package/dist/{builder-9ovCSqLp.mjs → builder-DdY0E0w9.mjs}

@@ -2,7 +2,7 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { i as getPortableDid, l as isPortableId, n as getCanonicalPortableId } from "./portable-key-id-Ca30-hOa.mjs";
-import { n as version, t as name } from "./deno-BZ4z-lJJ.mjs";
+import { n as version, t as name } from "./deno-CO1X_K_q.mjs";
 import { t as ActivityListenerSet } from "./activity-listener-C-BSbKI7.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Router, RouterError, assertPath } from "@fedify/uri-template";
@@ -91,7 +91,7 @@ var FederationBuilderImpl = class {
 	* specified.
 	*/
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-DFtNaBcH.mjs");
+		const { FederationImpl } = await import("./middleware-BYojyPi4.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/compat/transformers.test.mjs

@@ -5,7 +5,7 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { O as actorDehydrator, k as autoIdAssigner, n as FederationImpl } from "../middleware-C-swet0z.mjs";
+import { O as actorDehydrator, k as autoIdAssigner, n as FederationImpl } from "../middleware-C_gtR3fV.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/compat/transformers.test.ts

package/dist/{compound-proof-G2J_bU0u.mjs → compound-proof-fxkyiXYM.mjs}

@@ -3,9 +3,9 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { a as getRawCanonicalPortableId, l as isPortableId, n as getCanonicalPortableId } from "./portable-key-id-Ca30-hOa.mjs";
 import { a as verificationObservation, t as observeAttempt } from "./verification-Dpfcw8ml.mjs";
-import { c as getNormalizationContextLoader } from "./ld-Dkkyk65e.mjs";
+import { c as getNormalizationContextLoader } from "./ld-Cy86r-Ty.mjs";
 import { n as preloadedOnlyDocumentLoader } from "./public-audience--klBIOk1.mjs";
-import { l as verifyPortableObjectProofPolicy, n as classifyFep2277CoreType, o as verifyMapLocalProof } from "./proof-DuSE1ABD.mjs";
+import { l as verifyPortableObjectProofPolicy, n as classifyFep2277CoreType, o as verifyMapLocalProof } from "./proof-kJtQ49gr.mjs";
 import { parseIri, preloadedContexts } from "@fedify/vocab-runtime";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/sig/compound-proof.ts

package/dist/{deno-BZ4z-lJJ.mjs → deno-CO1X_K_q.mjs}

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

package/dist/{docloader-DUXXI-7G.mjs → docloader-DFB_TNVp.mjs}

@@ -1,8 +1,8 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { T as validateCryptoKey } from "./ld-Dkkyk65e.mjs";
-import { n as doubleKnock } from "./http-B5w_qcIg.mjs";
+import { T as validateCryptoKey } from "./ld-Cy86r-Ty.mjs";
+import { n as doubleKnock } from "./http-DkLKT8Vp.mjs";
 import { getLogger } from "@logtape/logtape";
 import { FetchError, UrlError, createActivityPubRequest, getRemoteDocument, logRequest, resolveDocumentLoaderTimeout, validatePublicUrl, withDocumentLoaderTimeout } from "@fedify/vocab-runtime";
 import { curry } from "es-toolkit";
@@ -64,6 +64,10 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedi
 		}, options);
 	}
 	async function validateUrl(url, options) {
+		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);

package/dist/federation/builder.test.mjs

@@ -7,7 +7,7 @@ import { t as assertExists } from "../assert_exists-cffSpJ7X.mjs";
 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 { r as createFederationBuilder } from "../builder-9ovCSqLp.mjs";
+import { r as createFederationBuilder } from "../builder-DdY0E0w9.mjs";
 import { DisallowedOperatorError, DisallowedVarSpecModifierError, DuplicateRouteVariableError, RouteTemplateOptionsNotMatchedError, RouterError } from "@fedify/uri-template";
 import { Activity, Note, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";

package/dist/federation/compound-fanout.test.mjs

@@ -6,11 +6,11 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { y as exportJwk } from "../ld-Dkkyk65e.mjs";
+import { y as exportJwk } from "../ld-Cy86r-Ty.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { a as signObject, d as verifyProof } from "../proof-DuSE1ABD.mjs";
+import { a as signObject, d as verifyProof } from "../proof-kJtQ49gr.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as FederationImpl } from "../middleware-C-swet0z.mjs";
+import { n as FederationImpl } from "../middleware-C_gtR3fV.mjs";
 import { Create, DataIntegrityProof, Note } from "@fedify/vocab";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/handler-compound-proof.test.mjs

@@ -5,10 +5,10 @@ import { r as createRequestContext, t as createInboxContext } from "../context-8
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { a as compactJsonLd, m as verifyCompactJsonLd, p as signJsonLd } from "../ld-Dkkyk65e.mjs";
-import { l as signRequest } from "../http-B5w_qcIg.mjs";
+import { a as compactJsonLd, m as verifyCompactJsonLd, p as signJsonLd } from "../ld-Cy86r-Ty.mjs";
+import { l as signRequest } from "../http-DkLKT8Vp.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { f as handleInbox, o as createFederation } from "../middleware-C-swet0z.mjs";
+import { f as handleInbox, o as createFederation } from "../middleware-C_gtR3fV.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
 import { t as map_local_create_note_default } from "../map-local-create-note-B0SeXJms.mjs";
 import { Create, CryptographicKey, Multikey, Person, Update } from "@fedify/vocab";
@@ -134,7 +134,7 @@ test("handleInbox() enforces compounds after alternate outer auth", async () =>
 test("handleInbox() preserves ordinary top-level proof behavior", async () => {
 	assertEquals((await handle(await secureDocument({
 		"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"],
-		id: "https://example.com/activities/ordinary",
+		id: `${map_local_create_note_default.keys.outer.controller}/activities/ordinary`,
 		type: "Create",
 		actor: map_local_create_note_default.keys.outer.controller,
 		object: {
@@ -254,7 +254,7 @@ test("handleInbox() keeps embedded signature properties in proof inputs", async
 test("handleInbox() inspects compounds without the Linked Data Signature", async () => {
 	const activity = await secureDocument({
 		"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"],
-		id: "https://example.com/activities/ordinary-ld",
+		id: `${map_local_create_note_default.keys.outer.controller}/activities/ordinary-ld`,
 		type: "Create",
 		actor: map_local_create_note_default.keys.outer.controller,
 		object: {

package/dist/federation/handler.test.mjs

@@ -10,11 +10,11 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as parseAcceptSignature } from "../accept-CPVqki78.mjs";
-import { C as generateCryptoKeyPair, a as compactJsonLd, p as signJsonLd } from "../ld-Dkkyk65e.mjs";
-import { a as signObject } from "../proof-DuSE1ABD.mjs";
-import { l as signRequest } from "../http-B5w_qcIg.mjs";
-import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { d as handleCustomCollection, f as handleInbox, g as respondWithObjectIfAcceptable, h as respondWithObject, l as handleActor, m as handleOutbox, o as createFederation, p as handleObject, u as handleCollection } from "../middleware-C-swet0z.mjs";
+import { C as generateCryptoKeyPair, a as compactJsonLd, p as signJsonLd } from "../ld-Cy86r-Ty.mjs";
+import { a as signObject } from "../proof-kJtQ49gr.mjs";
+import { l as signRequest } from "../http-DkLKT8Vp.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
+import { d as handleCustomCollection, f as handleInbox, g as respondWithObjectIfAcceptable, h as respondWithObject, l as handleActor, m as handleOutbox, o as createFederation, p as handleObject, u as handleCollection } from "../middleware-C_gtR3fV.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
 import { Activity, Create, CryptographicKey, Multikey, Note, Person, Tombstone } from "@fedify/vocab";
 import { FetchError, parseIri } from "@fedify/vocab-runtime";
@@ -3341,6 +3341,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 ActivityListenerSet();
+	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 ActivityListenerSet();
+	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 ActivityListenerSet();
+		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/hashlink-media.test.mjs

@@ -10,8 +10,8 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation, x as parseHashlinkGatewayRequest } from "../middleware-C-swet0z.mjs";
-import { r as createFederationBuilder } from "../builder-9ovCSqLp.mjs";
+import { o as createFederation, x as parseHashlinkGatewayRequest } from "../middleware-C_gtR3fV.mjs";
+import { r as createFederationBuilder } from "../builder-DdY0E0w9.mjs";
 import { n as RouterError } from "../router-u5O5KCQr.mjs";
 import { Note } from "@fedify/vocab";
 import { computeDigestMultibase, encodeMultibase, exportDidKey } from "@fedify/vocab-runtime";

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { a as signObject } from "../proof-DuSE1ABD.mjs";
+import { a as signObject } from "../proof-kJtQ49gr.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-C-swet0z.mjs";
+import { o as createFederation } from "../middleware-C_gtR3fV.mjs";
 import { Create, Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/federation/idempotency.test.ts

package/dist/federation/inbox-report.test.mjs

@@ -2,12 +2,12 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
-import { p as signJsonLd } from "../ld-Dkkyk65e.mjs";
-import { a as signObject } from "../proof-DuSE1ABD.mjs";
-import { l as signRequest } from "../http-B5w_qcIg.mjs";
+import { p as signJsonLd } from "../ld-Cy86r-Ty.mjs";
+import { a as signObject } from "../proof-kJtQ49gr.mjs";
+import { l as signRequest } from "../http-DkLKT8Vp.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-C-swet0z.mjs";
-import { r as createFederationBuilder } from "../builder-9ovCSqLp.mjs";
+import { o as createFederation } from "../middleware-C_gtR3fV.mjs";
+import { r as createFederationBuilder } from "../builder-DdY0E0w9.mjs";
 import { Create, Person } from "@fedify/vocab";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/inbox.test.mjs

@@ -2,11 +2,54 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
+import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
+import { t as actorsHaveSameOrigin } from "../inbox-Di1-EKqa.mjs";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
+import { parseIri } from "@fedify/vocab-runtime";
 import { test } from "@fedify/fixture";
 //#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("actorsHaveSameOrigin() compares portable IDs by their DIDs", () => {
+	const did = "did:key:z6MkrJVnaZkeFzdQyMZu1cgjg7k1pZZ6pvBQ7XJPt4swbTQ2";
+	const otherDid = "did:key:z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK";
+	const activityId = parseIri(`ap+ef61://${did}/activities/1`);
+	for (const actor of [`ap+ef61://${did}/actor`, `https://gw.example/.well-known/apgateway/${did}/actor`]) assertEquals(actorsHaveSameOrigin(new Create({
+		id: activityId,
+		actor: parseIri(actor)
+	})), true);
+	for (const actor of [
+		`ap+ef61://${otherDid}/actor`,
+		`https://gw.example/.well-known/apgateway/${otherDid}/actor`,
+		"https://gw.example/actor"
+	]) assertFalse(actorsHaveSameOrigin(new Create({
+		id: activityId,
+		actor: parseIri(actor)
+	})));
+});
 test("ActivityListenerSet", () => {
 	const listeners = new ActivityListenerSet();
 	const activity = new Activity({});

package/dist/federation/keycache.test.mjs

@@ -6,7 +6,7 @@ import { t as ManualClockKvStore } from "../kv-DBRWVx3Q.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { t as KvKeyCache } from "../keycache-D-MNltOk.mjs";
+import { t as KvKeyCache } from "../keycache-N2opu4-3.mjs";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/federation/keycache.test.ts
@@ -16,7 +16,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",
@@ -26,7 +26,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",
@@ -37,7 +37,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);
 });
@@ -46,7 +46,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",
@@ -58,7 +58,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",
@@ -72,7 +72,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);
@@ -162,14 +162,14 @@ test("KvKeyCache cached keys expire after keyTtl", async () => {
 	await cache.set(keyId, new CryptographicKey({ id: keyId }));
 	assert(await kv.get([
 		"pk",
-		"2",
+		"3",
 		keyId.href
 	]) != null);
 	assertInstanceOf(await cache.get(keyId), CryptographicKey);
 	kv.advance({ days: 31 });
 	assertEquals(await kv.get([
 		"pk",
-		"2",
+		"3",
 		keyId.href
 	]), void 0);
 	assertEquals(await cache.get(keyId), void 0);
@@ -189,6 +189,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);
 });
 test("KvKeyCache.compatibleKeyScope() keeps each purpose apart", async () => {
 	const cache = new KvKeyCache(new MemoryKvStore(), ["pk"]);

package/dist/federation/metrics.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
-import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-CRv6_IBg.mjs";
+import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-BguhdXt-.mjs";
 import { FetchError } from "@fedify/vocab-runtime";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { DataPointType, MeterProvider, MetricReader } from "@opentelemetry/sdk-metrics";