@fedify/fedify 2.0.33-dev.2393 → 2.0.33-dev.2414

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-CXfNALL3.mjs → builder-oPN-KAgG.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-gcSIfd7z.mjs";
-import { t as InboxListenerSet } from "./inbox-CfYQavNK.mjs";
+import { n as version, t as name } from "./deno-v7kfTDw9.mjs";
+import { t as InboxListenerSet } from "./inbox-Bj-VABWa.mjs";
 import { getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
@@ -43,7 +43,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-CTeSxNlY.mjs");
+		const { FederationImpl } = await import("./middleware-GCF6LA-a.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-mI4Ix2EU.mjs";
-import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-_zoXQhgI.mjs";
+import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-a9um4sWr.mjs";
 import { test } from "@fedify/fixture";
 import { Follow, Person } from "@fedify/vocab";
 //#region src/compat/transformers.test.ts

package/dist/{deno-gcSIfd7z.mjs → deno-v7kfTDw9.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.0.33-dev.2393+8f913f03";
+var version = "2.0.33-dev.2414+98deefa2";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-BrE3qvhE.mjs → docloader-C40rdqSR.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { o as validateCryptoKey } from "./key-CA6cey0A.mjs";
-import { n as doubleKnock } from "./http-3dkQNA1w.mjs";
+import { o as validateCryptoKey } from "./key-qe6uT5ER.mjs";
+import { n as doubleKnock } from "./http-BRdkmpRl.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,8 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, userAge
 		});
 	}
 	async function validateUrl(url) {
+		const protocol = new URL(url).protocol;
+		if (protocol !== "http:" && protocol !== "https:") throw new UrlError(`Unsupported protocol: ${protocol}`);
 		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-mI4Ix2EU.mjs";
-import { n as createFederationBuilder } from "../builder-CXfNALL3.mjs";
+import { n as createFederationBuilder } from "../builder-oPN-KAgG.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-DI6YzYpd.mjs";
 import { test } from "@fedify/fixture";
 import { decodeHex } from "byte-encodings/hex";

package/dist/federation/handler.test.mjs

@@ -3,17 +3,17 @@ 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 { i as generateCryptoKeyPair } from "../key-CA6cey0A.mjs";
-import { s as signRequest } from "../http-3dkQNA1w.mjs";
-import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-CCxRJhWa.mjs";
-import { a as compactJsonLd, f as signJsonLd } from "../ld-CXDOgt96.mjs";
-import { n as signObject } from "../proof-Bql3eTTO.mjs";
+import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
+import { i as generateCryptoKeyPair } from "../key-qe6uT5ER.mjs";
+import { s as signRequest } from "../http-BRdkmpRl.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CCxRJhWa.mjs";
+import { a as compactJsonLd, f as signJsonLd } from "../ld-gf5riP2W.mjs";
+import { n as signObject } from "../proof-DYP1abqL.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-_zoXQhgI.mjs";
-import { t as InboxListenerSet } from "../inbox-CfYQavNK.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-a9um4sWr.mjs";
+import { t as InboxListenerSet } from "../inbox-Bj-VABWa.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, CryptographicKey, Multikey, Note, Person } from "@fedify/vocab";
 //#region src/federation/handler.test.ts
@@ -2452,6 +2452,255 @@ 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"]
+			},
+			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"]
+		},
+		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"]
+			},
+			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"]
+				},
+				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-CCxRJhWa.mjs";
-import { n as signObject } from "../proof-Bql3eTTO.mjs";
+import { n as signObject } from "../proof-DYP1abqL.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { a as createFederation } from "../middleware-_zoXQhgI.mjs";
+import { a as createFederation } from "../middleware-a9um4sWr.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-CfYQavNK.mjs";
+import { r as assertFalse, t as assertThrows } from "../assert_throws-D4DNWrux.mjs";
+import { n as actorsHaveSameOrigin, t as InboxListenerSet } from "../inbox-Bj-VABWa.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/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-mI4Ix2EU.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/kv.test.ts

package/dist/federation/middleware.test.mjs

@@ -4,19 +4,19 @@ globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-DVILvP5e.mjs";
 import { n as RouterError } from "../router-CrMLXoOr.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { n as assertStrictEquals } from "../std__assert-BUOJXi-Z.mjs";
-import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
+import { n as assertStrictEquals } from "../std__assert-DflMZha5.mjs";
+import { r as assertFalse, t as assertThrows } from "../assert_throws-D4DNWrux.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
-import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-3dkQNA1w.mjs";
+import { t as assertNotEquals } from "../assert_not_equals-BkxW5QJI.mjs";
+import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-BRdkmpRl.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CCxRJhWa.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-BrE3qvhE.mjs";
-import { a as compactJsonLd, f as signJsonLd, m as verifyJsonLd, s as detachSignature } from "../ld-CXDOgt96.mjs";
-import { t as doesActorOwnKey } from "../owner-BjEWxmUB.mjs";
-import { n as signObject, r as verifyObject } from "../proof-Bql3eTTO.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-C40rdqSR.mjs";
+import { a as compactJsonLd, f as signJsonLd, m as verifyJsonLd, s as detachSignature } from "../ld-gf5riP2W.mjs";
+import { t as doesActorOwnKey } from "../owner-DRXYR3jY.mjs";
+import { n as signObject, r as verifyObject } from "../proof-DYP1abqL.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { a as createFederation, i as KvSpecDeterminer, n as FederationImpl, r as InboxContextImpl, t as ContextImpl } from "../middleware-_zoXQhgI.mjs";
+import { a as createFederation, i as KvSpecDeterminer, n as FederationImpl, r as InboxContextImpl, t as ContextImpl } from "../middleware-a9um4sWr.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import * as vocab from "@fedify/vocab";
 import { Create, Offer, Person, getTypeId, lookupObject } from "@fedify/vocab";
@@ -3700,6 +3700,124 @@ test("ContextImpl.routeActivity() marks queued signed activities as non-LDS", as
 	assertEquals(inboxMessage.ldSignatureVerified, false);
 	assertEquals(inboxMessage.normalizedActivity, void 0);
 });
+for (const queued of [false, true]) test(`ContextImpl.routeActivity() rejects a proof-signed cross-origin ID (queued: ${queued})`, async () => {
+	const messages = [];
+	const queue = {
+		enqueue(message) {
+			messages.push(message);
+			return Promise.resolve();
+		},
+		async listen() {}
+	};
+	const federation = createFederation({
+		kv: new MemoryKvStore(),
+		documentLoaderFactory: () => mockDocumentLoader,
+		contextLoaderFactory: () => mockDocumentLoader,
+		queue: queued ? {
+			inbox: queue,
+			outbox: queue
+		} : void 0,
+		manuallyStartQueue: true
+	});
+	let listenerCalls = 0;
+	federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+		listenerCalls++;
+	});
+	const signed = await signObject(new Create({
+		id: new URL("https://victim.example/activities/1"),
+		actor: ed25519Multikey.controllerId
+	}), ed25519PrivateKey, ed25519Multikey.id, {
+		contextLoader: mockDocumentLoader,
+		documentLoader: mockDocumentLoader
+	});
+	assertFalse(await federation.createContext(new URL("https://local.example/")).routeActivity(null, signed));
+	assertEquals(listenerCalls, 0);
+	assertEquals(messages, []);
+});
+test("ContextImpl.routeActivity() rejects a missing actor before routing", async () => {
+	const federation = createFederation({
+		kv: new MemoryKvStore(),
+		documentLoaderFactory: () => mockDocumentLoader,
+		contextLoaderFactory: () => mockDocumentLoader
+	});
+	let listenerCalls = 0;
+	federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+		listenerCalls++;
+	});
+	assertFalse(await federation.createContext(new URL("https://local.example/")).routeActivity(null, new Create({ id: new URL("https://remote.example/activities/1") })));
+	assertEquals(listenerCalls, 0);
+});
+test("FederationImpl.processQueuedTask() rejects untrusted activity origins before KV access", async () => {
+	class TrackingKvStore extends MemoryKvStore {
+		reads = 0;
+		writes = 0;
+		get(key) {
+			this.reads++;
+			return super.get(key);
+		}
+		set(key, value, options) {
+			this.writes++;
+			return super.set(key, value, options);
+		}
+	}
+	for (const activity of [{
+		"@context": "https://www.w3.org/ns/activitystreams",
+		id: "https://victim.example/activities/1",
+		type: "Create",
+		actor: "https://attacker.example/actor"
+	}, {
+		"@context": "https://www.w3.org/ns/activitystreams",
+		id: "https://victim.example/activities/2",
+		type: "Create"
+	}]) {
+		const kv = new TrackingKvStore();
+		const federation = new FederationImpl({ kv });
+		let listenerCalls = 0;
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+			listenerCalls++;
+		});
+		await federation.processQueuedTask(void 0, {
+			type: "inbox",
+			id: crypto.randomUUID(),
+			baseUrl: "https://local.example",
+			activity,
+			started: (/* @__PURE__ */ new Date()).toISOString(),
+			attempt: 0,
+			identifier: null,
+			traceContext: {}
+		});
+		assertEquals(listenerCalls, 0);
+		assertEquals(kv.reads, 0);
+		assertEquals(kv.writes, 0);
+	}
+	const kv = new TrackingKvStore();
+	const federation = new FederationImpl({
+		kv,
+		skipSignatureVerification: true
+	});
+	let listenerCalls = 0;
+	federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+		listenerCalls++;
+	});
+	await federation.processQueuedTask(void 0, {
+		type: "inbox",
+		id: crypto.randomUUID(),
+		baseUrl: "https://local.example",
+		activity: {
+			"@context": "https://www.w3.org/ns/activitystreams",
+			id: "https://victim.example/activities/opt-out",
+			type: "Create",
+			actor: "https://attacker.example/actor"
+		},
+		started: (/* @__PURE__ */ new Date()).toISOString(),
+		attempt: 0,
+		identifier: null,
+		traceContext: {}
+	});
+	assertEquals(listenerCalls, 1);
+	assertEquals(kv.reads, 1);
+	assertEquals(kv.writes, 1);
+});
 test("ContextImpl.getCollectionUri()", () => {
 	const federation = new FederationImpl({ kv: new MemoryKvStore() });
 	const base = "https://example.com";

package/dist/federation/mod.cjs

@@ -2,7 +2,7 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("../chunk-DDcVe30Y.cjs");
-const require_middleware = require("../middleware-Bzq026Pv.cjs");
+const require_middleware = require("../middleware-C_ybJNaa.cjs");
 let es_toolkit = require("es-toolkit");
 //#region src/federation/kv.ts
 /**