@fedify/fedify 2.2.18-dev.2386 → 2.2.19

package/dist/federation/middleware.test.mjs

@@ -4,20 +4,20 @@ 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 "../std__assert-BVFj8-_V.mjs";
-import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
+import "../std__assert-DNZ4Liil.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 { t as assertNotEquals } from "../assert_not_equals-BkxW5QJI.mjs";
+import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-Dmjbg-bA.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-DovhI1VM.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-BBBUbwKh.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-BAK-tUlf.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-B4Hk3LSj.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-D1ghurDJ.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-1J9cdTp0.mjs";
-import { t as doesActorOwnKey } from "../owner-CgurOfJ9.mjs";
-import { i as verifyObject, r as signObject } from "../proof-Dn4nm7pr.mjs";
-import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-ruFPV2xR.mjs";
+import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-rTdIfZ63.mjs";
+import { t as doesActorOwnKey } from "../owner-CVfzyM5V.mjs";
+import { i as verifyObject, r as signObject } from "../proof-gOGM-sJS.mjs";
+import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-CpXoRHs3.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import * as vocab from "@fedify/vocab";
 import { Create, Offer, Person, getTypeId, lookupObject } from "@fedify/vocab";
@@ -4547,6 +4547,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-BWXhlsuq.cjs");
+const require_middleware = require("../middleware-BWOwEGpy.cjs");
 let es_toolkit = require("es-toolkit");
 //#region src/federation/kv.ts
 /**

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-BrFMyQSp.js";
+import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-BimXKBcP.js";
 import { isEqual } from "es-toolkit";
 //#region src/federation/kv.ts
 /**

package/dist/federation/mq.test.mjs

@@ -2,8 +2,8 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { n as assertGreaterOrEqual } from "../std__assert-BVFj8-_V.mjs";
-import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
+import { n as assertGreaterOrEqual } from "../std__assert-DNZ4Liil.mjs";
+import { r as assertFalse } from "../assert_throws-D4DNWrux.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
 import { test } from "@fedify/fixture";
 import { delay } from "es-toolkit";

package/dist/federation/negotiation.test.mjs

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import "../std__assert-BVFj8-_V.mjs";
-import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
+import "../std__assert-DNZ4Liil.mjs";
+import { r as assertFalse } from "../assert_throws-D4DNWrux.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
-import { t as acceptsJsonLd } from "../negotiation-BHtZN6Y1.mjs";
+import { t as acceptsJsonLd } from "../negotiation-SQvQgUqe.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/negotiation.test.ts
 test("acceptsJsonLd()", () => {

package/dist/federation/retry.test.mjs

@@ -2,8 +2,8 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { l as AssertionError, t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
-import { t as createExponentialBackoffPolicy } from "../retry-bMXBL97A.mjs";
+import { t as assertNotEquals } from "../assert_not_equals-BkxW5QJI.mjs";
+import { t as createExponentialBackoffPolicy } from "../retry-v_sGLH1d.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/retry.test.ts
 test("createExponentialBackoffPolicy()", () => {

package/dist/federation/router.test.mjs

@@ -3,10 +3,9 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError, t as Router } from "../router-CrMLXoOr.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BVFj8-_V.mjs";
-import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
+import "../std__assert-DNZ4Liil.mjs";
+import { r as assertFalse, t as assertThrows } from "../assert_throws-D4DNWrux.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
-import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/router.test.ts
 function setUp(options = {}) {

package/dist/federation/send.test.mjs

@@ -3,14 +3,15 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-DVILvP5e.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BVFj8-_V.mjs";
-import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
+import "../std__assert-DNZ4Liil.mjs";
+import { r as assertFalse } from "../assert_throws-D4DNWrux.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
-import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
-import { l as verifyRequest } from "../http-DovhI1VM.mjs";
+import { t as assertNotEquals } from "../assert_not_equals-BkxW5QJI.mjs";
+import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
+import { l as verifyRequest } from "../http-BBBUbwKh.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { t as doesActorOwnKey } from "../owner-CgurOfJ9.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-iVwnK504.mjs";
+import { t as doesActorOwnKey } from "../owner-CVfzyM5V.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-D35Va72B.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";

package/dist/federation/temporal.test.mjs

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import "../std__assert-BVFj8-_V.mjs";
-import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
+import "../std__assert-DNZ4Liil.mjs";
+import { r as assertFalse } from "../assert_throws-D4DNWrux.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-BZrzDMq2.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-CA4Y9hBJ.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/temporal.test.ts
 test("hasMalformedKnownTemporalLiteral() detects expanded proof timestamps", async () => {

package/dist/federation/webfinger.test.mjs

@@ -3,9 +3,9 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { r as createRequestContext } from "../context-Dk_tacqz.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BVFj8-_V.mjs";
+import "../std__assert-DNZ4Liil.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-ruFPV2xR.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-CpXoRHs3.mjs";
 import { test } from "@fedify/fixture";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 //#region src/federation/webfinger.test.ts

package/dist/{http-DovhI1VM.mjs → http-BBBUbwKh.mjs}

@@ -1,9 +1,9 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CkabM5bf.mjs";
+import { n as version, t as name } from "./deno-CD-8UlUi.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-Dd__NiUL.mjs";
-import { i as fetchKeyDetailed, s as validateCryptoKey } from "./key-BtVvc9pe.mjs";
+import { i as fetchKeyDetailed, s as validateCryptoKey } from "./key-DolXUaLH.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/{http-DP-vbG4o.js → http-DJK2udgX.js}

@@ -10,7 +10,7 @@ import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } fro
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.2.18-dev.2386+41abb5f5";
+var version = "2.2.19";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -291,16 +291,23 @@ async function importJwk(jwk, type) {
 /**
 * Fetches the document that the given actor URI dereferences to, and returns
 * the actor only if the host that served the document is authoritative for
-* the id the document claims.
+* the id the document claims, and that id is the actor that was asked for.
 *
 * Only the origin that serves an actor id can speak for it.  Without that
 * rule any host could serve a document describing somebody else's actor—and
 * listing its own keys as that actor's.
 *
+* The returned actor always has exactly the requested `actorId` as its `id`.
+* A document loader follows redirects and alternate document links, so the
+* document an actor id leads to may describe a different actor altogether,
+* on the same origin or on another; accepting it would attribute that other
+* actor's keys to the requested one.  See GHSA-8863-8468-7hq7.
+*
 * @param actorId The URI of the actor to fetch.
 * @param options Options for fetching the document.
 * @returns The actor, or `null` if the document cannot be fetched, is not an
-*          actor, or belongs to another origin.
+*          actor, belongs to another origin, or describes an actor other
+*          than the requested one.
 * @internal
 */
 async function fetchActorDocument(actorId, options = {}) {
@@ -355,6 +362,13 @@ async function fetchActorDocumentInternal(actorId, options, propagateContextFetc
 		});
 		return null;
 	}
+	if (object.id.href !== actorId.href) {
+		logger.debug("The document fetched for the actor {actorId} is the actor {documentActorId} instead; refusing to treat it as the requested actor's document.", {
+			actorId: actorId.href,
+			documentActorId: object.id.href
+		});
+		return null;
+	}
 	return object;
 }
 /**

package/dist/{http-C_Qq0cNx.cjs → http-DrUG4fPS.cjs}

@@ -11,7 +11,7 @@ let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conve
 let byte_encodings_base64 = require("byte-encodings/base64");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.2.18-dev.2386+41abb5f5";
+var version = "2.2.19";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -292,16 +292,23 @@ async function importJwk(jwk, type) {
 /**
 * Fetches the document that the given actor URI dereferences to, and returns
 * the actor only if the host that served the document is authoritative for
-* the id the document claims.
+* the id the document claims, and that id is the actor that was asked for.
 *
 * Only the origin that serves an actor id can speak for it.  Without that
 * rule any host could serve a document describing somebody else's actor—and
 * listing its own keys as that actor's.
 *
+* The returned actor always has exactly the requested `actorId` as its `id`.
+* A document loader follows redirects and alternate document links, so the
+* document an actor id leads to may describe a different actor altogether,
+* on the same origin or on another; accepting it would attribute that other
+* actor's keys to the requested one.  See GHSA-8863-8468-7hq7.
+*
 * @param actorId The URI of the actor to fetch.
 * @param options Options for fetching the document.
 * @returns The actor, or `null` if the document cannot be fetched, is not an
-*          actor, or belongs to another origin.
+*          actor, belongs to another origin, or describes an actor other
+*          than the requested one.
 * @internal
 */
 async function fetchActorDocument(actorId, options = {}) {
@@ -356,6 +363,13 @@ async function fetchActorDocumentInternal(actorId, options, propagateContextFetc
 		});
 		return null;
 	}
+	if (object.id.href !== actorId.href) {
+		logger.debug("The document fetched for the actor {actorId} is the actor {documentActorId} instead; refusing to treat it as the requested actor's document.", {
+			actorId: actorId.href,
+			documentActorId: object.id.href
+		});
+		return null;
+	}
 	return object;
 }
 /**

package/dist/inbox-Dca_0fwc.mjs

@@ -0,0 +1,162 @@
+import { Temporal } from "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { n as version, t as name } from "./deno-CD-8UlUi.mjs";
+import { getTypeId } from "@fedify/vocab";
+import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
+import { getLogger } from "@logtape/logtape";
+//#region src/federation/inbox.ts
+/**
+* Checks whether an activity's ID and all of its actor IDs have the same
+* non-opaque origin.  Activities without an ID have no origin to authenticate.
+*
+* The caller is responsible for rejecting a missing primary actor ID before
+* relying on this check.
+* @internal
+*/
+function actorsHaveSameOrigin(activity) {
+	if (activity.id == null) return true;
+	const origin = activity.id.origin;
+	return origin !== "null" && activity.actorIds.every((actor) => actor.origin === origin);
+}
+async function routeActivity({ context: ctx, json, originalJson, normalizedActivity, ldSignatureVerified, activity, recipient, inboxListeners, inboxContextFactory, listenerInboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, tracerProvider, idempotencyStrategy }) {
+	const logger = getLogger([
+		"fedify",
+		"federation",
+		"inbox"
+	]);
+	if (activity.actorId == null) {
+		logger.error("Missing actor.", { activity: json });
+		span.setStatus({
+			code: SpanStatusCode.ERROR,
+			message: "Missing actor."
+		});
+		return "missingActor";
+	}
+	let cacheKey = null;
+	if (activity.id != null) {
+		const inboxContext = inboxContextFactory(recipient, json, activity.id?.href, getTypeId(activity).href);
+		const strategy = idempotencyStrategy ?? "per-inbox";
+		let keyString;
+		if (typeof strategy === "function") keyString = await strategy(inboxContext, activity);
+		else switch (strategy) {
+			case "global":
+				keyString = activity.id.href;
+				break;
+			case "per-origin":
+				keyString = `${ctx.origin}\n${activity.id.href}`;
+				break;
+			case "per-inbox":
+				keyString = `${ctx.origin}\n${activity.id.href}\n${recipient == null ? "sharedInbox" : `inbox\n${recipient}`}`;
+				break;
+			default: keyString = `${ctx.origin}\n${activity.id.href}`;
+		}
+		if (keyString != null) cacheKey = [...kvPrefixes.activityIdempotence, keyString];
+	}
+	if (cacheKey != null) {
+		if (await kv.get(cacheKey) === true) {
+			logger.debug("Activity {activityId} has already been processed.", {
+				activityId: activity.id?.href,
+				activity: json,
+				recipient
+			});
+			span.setStatus({
+				code: SpanStatusCode.UNSET,
+				message: `Activity ${activity.id?.href} has already been processed.`
+			});
+			return "alreadyProcessed";
+		}
+	}
+	span.setAttribute("activitypub.actor.id", activity.actorId.href);
+	if (queue != null) {
+		const carrier = {};
+		propagation.inject(context.active(), carrier);
+		try {
+			await queue.enqueue({
+				type: "inbox",
+				id: crypto.randomUUID(),
+				baseUrl: ctx.origin,
+				activity: originalJson ?? json,
+				...normalizedActivity == null ? {} : { normalizedActivity },
+				...ldSignatureVerified == null ? {} : { ldSignatureVerified },
+				identifier: recipient,
+				attempt: 0,
+				started: (/* @__PURE__ */ new Date()).toISOString(),
+				traceContext: carrier
+			});
+		} catch (error) {
+			logger.error("Failed to enqueue the incoming activity {activityId}:\n{error}", {
+				error,
+				activityId: activity.id?.href,
+				activity: json,
+				recipient
+			});
+			span.setStatus({
+				code: SpanStatusCode.ERROR,
+				message: `Failed to enqueue the incoming activity ${activity.id?.href}.`
+			});
+			throw error;
+		}
+		logger.info("Activity {activityId} is enqueued.", {
+			activityId: activity.id?.href,
+			activity: json,
+			recipient
+		});
+		return "enqueued";
+	}
+	tracerProvider = tracerProvider ?? trace.getTracerProvider();
+	return await tracerProvider.getTracer(name, version).startActiveSpan("activitypub.dispatch_inbox_listener", { kind: SpanKind.INTERNAL }, async (span) => {
+		const dispatched = inboxListeners?.dispatchWithClass(activity);
+		if (dispatched == null) {
+			logger.error("Unsupported activity type:\n{activity}", {
+				activity: json,
+				recipient
+			});
+			span.setStatus({
+				code: SpanStatusCode.UNSET,
+				message: `Unsupported activity type: ${getTypeId(activity).href}`
+			});
+			span.end();
+			return "unsupportedActivity";
+		}
+		const { class: cls, listener } = dispatched;
+		span.updateName(`activitypub.dispatch_inbox_listener ${cls.name}`);
+		try {
+			const contextFactory = listenerInboxContextFactory ?? inboxContextFactory;
+			await listener(contextFactory(recipient, contextFactory === inboxContextFactory ? json : originalJson ?? json, activity?.id?.href, getTypeId(activity).href), activity);
+		} catch (error) {
+			try {
+				await inboxErrorHandler?.(ctx, error);
+			} catch (error) {
+				logger.error("An unexpected error occurred in inbox error handler:\n{error}", {
+					error,
+					activityId: activity.id?.href,
+					activity: json,
+					recipient
+				});
+			}
+			logger.error("Failed to process the incoming activity {activityId}:\n{error}", {
+				error,
+				activityId: activity.id?.href,
+				activity: json,
+				recipient
+			});
+			span.setStatus({
+				code: SpanStatusCode.ERROR,
+				message: String(error)
+			});
+			span.end();
+			return "error";
+		}
+		if (cacheKey != null) await kv.set(cacheKey, true, { ttl: Temporal.Duration.from({ days: 1 }) });
+		logger.info("Activity {activityId} has been processed.", {
+			activityId: activity.id?.href,
+			activity: json,
+			recipient
+		});
+		span.end();
+		return "success";
+	});
+}
+//#endregion
+export { routeActivity as n, actorsHaveSameOrigin as t };

package/dist/{key-BtVvc9pe.mjs → key-DolXUaLH.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CkabM5bf.mjs";
+import { n as version, t as name } from "./deno-CD-8UlUi.mjs";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError, UrlError, getDocumentLoader } from "@fedify/vocab-runtime";
@@ -146,16 +146,23 @@ async function importJwk(jwk, type) {
 /**
 * Fetches the document that the given actor URI dereferences to, and returns
 * the actor only if the host that served the document is authoritative for
-* the id the document claims.
+* the id the document claims, and that id is the actor that was asked for.
 *
 * Only the origin that serves an actor id can speak for it.  Without that
 * rule any host could serve a document describing somebody else's actor—and
 * listing its own keys as that actor's.
 *
+* The returned actor always has exactly the requested `actorId` as its `id`.
+* A document loader follows redirects and alternate document links, so the
+* document an actor id leads to may describe a different actor altogether,
+* on the same origin or on another; accepting it would attribute that other
+* actor's keys to the requested one.  See GHSA-8863-8468-7hq7.
+*
 * @param actorId The URI of the actor to fetch.
 * @param options Options for fetching the document.
 * @returns The actor, or `null` if the document cannot be fetched, is not an
-*          actor, or belongs to another origin.
+*          actor, belongs to another origin, or describes an actor other
+*          than the requested one.
 * @internal
 */
 async function fetchActorDocument(actorId, options = {}) {
@@ -210,6 +217,13 @@ async function fetchActorDocumentInternal(actorId, options, propagateContextFetc
 		});
 		return null;
 	}
+	if (object.id.href !== actorId.href) {
+		logger.debug("The document fetched for the actor {actorId} is the actor {documentActorId} instead; refusing to treat it as the requested actor's document.", {
+			actorId: actorId.href,
+			documentActorId: object.id.href
+		});
+		return null;
+	}
 	return object;
 }
 /**

package/dist/{keycache-Dkc_sflV.mjs → keycache-BimEQucx.mjs}

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
 //#region src/federation/keycache.ts
-const KEY_CACHE_GENERATION = "2";
+const KEY_CACHE_GENERATION = "3";
 var KvKeyCache = class {
 	kv;
 	prefix;

package/dist/{kv-cache-Ds_adaor.cjs → kv-cache-Bk3V1Tiu.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-C_Qq0cNx.cjs");
+const require_http = require("./http-DrUG4fPS.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
@@ -58,6 +58,10 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedi
 		});
 	}
 	async function validateUrl(url) {
+		const parsedUrl = new URL(url);
+		const protocol = parsedUrl.protocol;
+		if (protocol !== "http:" && protocol !== "https:") throw new _fedify_vocab_runtime.UrlError(`Unsupported protocol: ${protocol}`);
+		if (parsedUrl.username !== "" || parsedUrl.password !== "") throw new _fedify_vocab_runtime.UrlError("URLs with credentials are not allowed");
 		if (!allowPrivateAddress) try {
 			await (0, _fedify_vocab_runtime.validatePublicUrl)(url);
 		} catch (error) {

package/dist/{kv-cache-D8yJIXRo.js → kv-cache-DDm80t1K.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { f as validateCryptoKey, t as doubleKnock } from "./http-DP-vbG4o.js";
+import { f as validateCryptoKey, t as doubleKnock } from "./http-DJK2udgX.js";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { FetchError, UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";
@@ -57,6 +57,10 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedi
 		});
 	}
 	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) {