@fedify/fedify 2.4.2 → 2.4.4

package/dist/{federation-DpT8bDM6.cjs → federation-Bf4FEork.cjs}

@@ -1,10 +1,10 @@
 const { URLPattern } = require("urlpattern-polyfill");
 const require_rolldown_runtime = require("./rolldown-runtime-Dmm3t92W.cjs");
 const require_transformers = require("./transformers-BalCrSsr.cjs");
-const require_http = require("./http-x1satM4y.cjs");
+const require_http = require("./http-g5f1D2tm.cjs");
 const require_types = require("./types-poIao40f.cjs");
-const require_portable_collection = require("./portable-collection-DL-1Wy1s.cjs");
-const require_kv_cache = require("./kv-cache-D4throaQ.cjs");
+const require_portable_collection = require("./portable-collection-Bl2UkqcO.cjs");
+const require_kv_cache = require("./kv-cache-HsXADkl9.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_uri_template = require("@fedify/uri-template");
 let _fedify_vocab = require("@fedify/vocab");
@@ -2779,12 +2779,41 @@ async function isInAudience(object, actor, options = {}) {
 //#endregion
 //#region src/federation/inbox.ts
 const Temporal$10 = require_http.Temporal;
+/**
+* Checks whether an activity's ID and all of its actor IDs have the same
+* [FEP-fe34] origin.  Activities without an ID have no origin to authenticate.
+*
+* Origins are compared by `getAuthenticationOrigin()`, so a portable activity
+* and its portable actors, including compatible identifiers on any gateway,
+* are compared by their DIDs.  An ID that has no supported origin, such as an
+* opaque URN, never matches.
+*
+* The caller is responsible for rejecting a missing primary actor ID before
+* relying on this check.
+*
+* [FEP-fe34]: https://w3id.org/fep/fe34
+* @internal
+*/
+function actorsHaveSameOrigin(activity) {
+	if (activity.id == null) return true;
+	const origin = require_http.getAuthenticationOrigin(activity.id);
+	return origin != null && activity.actorIds.every((actor) => require_http.getAuthenticationOrigin(actor) === origin);
+}
 async function routeActivity({ context: ctx, json, originalJson, normalizedActivity, ldSignatureVerified, activity, recipient, inboxListeners, inboxContextFactory, listenerInboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, meterProvider, tracerProvider, idempotencyStrategy }) {
 	const logger = (0, _logtape_logtape.getLogger)([
 		"fedify",
 		"federation",
 		"inbox"
 	]);
+	if (activity.actorId == null) {
+		logger.error("Missing actor.", { activity: json });
+		span.setStatus({
+			code: _opentelemetry_api.SpanStatusCode.ERROR,
+			message: "Missing actor."
+		});
+		require_http.recordInboxActivity(meterProvider, "rejected", (0, _fedify_vocab.getTypeId)(activity).href);
+		return "missingActor";
+	}
 	let cacheKey = null;
 	if (activity.id != null) {
 		const inboxContext = inboxContextFactory(recipient, json, activity.id?.href, (0, _fedify_vocab.getTypeId)(activity).href);
@@ -2820,15 +2849,6 @@ async function routeActivity({ context: ctx, json, originalJson, normalizedActiv
 			return "alreadyProcessed";
 		}
 	}
-	if (activity.actorId == null) {
-		logger.error("Missing actor.", { activity: json });
-		span.setStatus({
-			code: _opentelemetry_api.SpanStatusCode.ERROR,
-			message: "Missing actor."
-		});
-		require_http.recordInboxActivity(meterProvider, "rejected", (0, _fedify_vocab.getTypeId)(activity).href);
-		return "missingActor";
-	}
 	span.setAttribute("activitypub.actor.id", activity.actorId.href);
 	if (queue != null) {
 		const carrier = {};
@@ -2938,7 +2958,7 @@ async function routeActivity({ context: ctx, json, originalJson, normalizedActiv
 //#endregion
 //#region src/federation/keycache.ts
 const Temporal$9 = require_http.Temporal;
-const KEY_CACHE_GENERATION = "2";
+const KEY_CACHE_GENERATION = "3";
 const COMPATIBLE_KEY_SEGMENT = "__compatible";
 const MAX_OWNER_BYTES = 32 * 1024;
 function isCompatibleKeyEntry(value) {
@@ -4746,13 +4766,13 @@ function recordCollectionMetrics(meterProvider, base, result, options = {}) {
 * @param parameters The parameters for handling the collection.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleCollection(request, { name: name$2, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, portable, tracerProvider, meterProvider, onUnauthorized, onNotFound }) {
-	const spanName = name$2.trim().replace(/\s+/g, "_");
+async function handleCollection(request, { name: name$1, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, portable, tracerProvider, meterProvider, onUnauthorized, onNotFound }) {
+	const spanName = name$1.trim().replace(/\s+/g, "_");
 	tracerProvider = tracerProvider ?? _opentelemetry_api.trace.getTracerProvider();
 	const tracer = tracerProvider.getTracer(require_http.name, require_http.version);
 	const cursor = new URL(request.url).searchParams.get("cursor");
 	const metricBase = {
-		kind: getCollectionMetricKind(name$2),
+		kind: getCollectionMetricKind(name$1),
 		page: cursor != null,
 		dispatcher: "built_in"
 	};
@@ -4798,7 +4818,7 @@ async function handleCollection(request, { name: name$2, identifier, uriGetter,
 							span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
 							return await onNotFound(request);
 						}
-						const items = filterCollectionItems(page.items, name$2, filterPredicate);
+						const items = filterCollectionItems(page.items, name$1, filterPredicate);
 						itemCount = items.length;
 						span.setAttribute("fedify.collection.items", itemCount);
 						return items;
@@ -4840,7 +4860,7 @@ async function handleCollection(request, { name: name$2, identifier, uriGetter,
 		} else {
 			const uri = new URL(portable == null ? baseUri : pageBase);
 			uri.searchParams.set("cursor", cursor);
-			const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$2}`, {
+			const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$1}`, {
 				kind: _opentelemetry_api.SpanKind.SERVER,
 				attributes: {
 					"activitypub.collection.id": uri.href,
@@ -4856,7 +4876,7 @@ async function handleCollection(request, { name: name$2, identifier, uriGetter,
 						span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
 						return await onNotFound(request);
 					}
-					const items = filterCollectionItems(page.items, name$2, filterPredicate);
+					const items = filterCollectionItems(page.items, name$1, filterPredicate);
 					itemCount = items.length;
 					span.setAttribute("fedify.collection.items", itemCount);
 					return {
@@ -6005,11 +6025,49 @@ async function handleInboxInternal(request, parameters, span) {
 			return await getFailedSignatureResponse(inboxChallengePolicy, kv, kvPrefixes);
 		}
 	}
+	if (!skipSignatureVerification && activity.id != null && !actorsHaveSameOrigin(activity)) {
+		observation.authentication = {
+			status: "rejected",
+			reason: { type: "verificationFailed" }
+		};
+		logger.error("The activity ({activityId}) and its actors do not have the same origin.", {
+			activity: json,
+			recipient,
+			activityId: activity.id.href,
+			actorIds: activity.actorIds.map((actor) => actor.href)
+		});
+		span.setStatus({
+			code: _opentelemetry_api.SpanStatusCode.ERROR,
+			message: `The activity (${activity.id.href}) and its actors do not have the same origin.`
+		});
+		return new Response("The activity and its actors do not have the same origin.", {
+			status: 401,
+			headers: { "Content-Type": "text/plain; charset=utf-8" }
+		});
+	}
 	observation.authentication = skipSignatureVerification ? { status: "skipped" } : {
 		status: "verified",
 		attempts: observation.verification.attempts.filter((attempt) => attempt.status === "verified")
 	};
 	observation.stage = "dispatch";
+	if (activity.actorId == null) {
+		observation.result = {
+			disposition: "rejected",
+			reason: "missingActor"
+		};
+		logger.error("Missing actor.", {
+			activity: json,
+			recipient
+		});
+		span.setStatus({
+			code: _opentelemetry_api.SpanStatusCode.ERROR,
+			message: "Missing actor."
+		});
+		return new Response("Missing actor.", {
+			status: 400,
+			headers: { "Content-Type": "text/plain; charset=utf-8" }
+		});
+	}
 	const routeResult = await routeActivity({
 		context: ctx,
 		json,
@@ -6230,8 +6288,8 @@ var CustomCollectionHandler = class {
 	* @param CollectionPage The CollectionPage constructor.
 	* @param filterPredicate Optional filter predicate for items.
 	*/
-	constructor(name$1, values, context, callbacks, tracerProvider = _opentelemetry_api.trace.getTracerProvider(), meterProvider, Collection, CollectionPage, filterPredicate, portable) {
-		this.name = name$1;
+	constructor(name$2, values, context, callbacks, tracerProvider = _opentelemetry_api.trace.getTracerProvider(), meterProvider, Collection, CollectionPage, filterPredicate, portable) {
+		this.name = name$2;
 		this.values = values;
 		this.context = context;
 		this.callbacks = callbacks;
@@ -9357,6 +9415,35 @@ var FederationImpl = class extends FederationBuilderImpl {
 					span.setAttribute("activitypub.activity.id", activity.id.href);
 					listenerSpan.setAttribute("activitypub.activity.id", activity.id.href);
 				}
+				if (activity.actorId == null) {
+					logger.error("Missing actor in queued incoming activity.", {
+						activityId: activity.id?.href,
+						activity: message.activity,
+						recipient: message.identifier
+					});
+					listenerSpan.setStatus({
+						code: _opentelemetry_api.SpanStatusCode.ERROR,
+						message: "Missing actor."
+					});
+					require_http.recordInboxActivity(this.meterProvider, "rejected", activityType);
+					listenerSpan.end();
+					return;
+				}
+				if (!this.skipSignatureVerification && activity.id != null && !actorsHaveSameOrigin(activity)) {
+					logger.error("The queued activity ({activityId}) and its actors do not have the same origin.", {
+						activityId: activity.id.href,
+						actorIds: activity.actorIds.map((actor) => actor.href),
+						activity: message.activity,
+						recipient: message.identifier
+					});
+					listenerSpan.setStatus({
+						code: _opentelemetry_api.SpanStatusCode.ERROR,
+						message: `The activity (${activity.id.href}) and its actors do not have the same origin.`
+					});
+					require_http.recordInboxActivity(this.meterProvider, "rejected", activityType);
+					listenerSpan.end();
+					return;
+				}
 				cacheKey = activity.id == null ? null : [
 					...this.kvPrefixes.activityIdempotence,
 					context.origin,
@@ -11433,6 +11520,20 @@ var ContextImpl = class ContextImpl {
 			recipient,
 			activity: json
 		});
+		if (activity.actorId == null) {
+			logger.debug("Activity is missing an actor; unable to verify.", {
+				recipient,
+				activity: json
+			});
+			return false;
+		}
+		if (activity.id != null && !actorsHaveSameOrigin(activity)) {
+			logger.debug("Activity has actors from different origins; unable to verify.", {
+				recipient,
+				activity: json
+			});
+			return false;
+		}
 		const routeResult = await routeActivity({
 			context: this,
 			json,

package/dist/{http-Qq7jR2rC.js → http-D_AGUmSq.js}

@@ -15,7 +15,7 @@ import serialize from "json-canon";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.2";
+var version = "2.4.4";
 //#endregion
 //#region src/sig/portable-key-id.ts
 const COMPATIBLE_KEY_ID_PATH_PATTERN = /^\/\.well-known\/apgateway\/did(?::|%3A)/i;
@@ -1570,16 +1570,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 = {}) {
@@ -1645,6 +1652,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-B5w_qcIg.mjs → http-DkLKT8Vp.mjs}

@@ -3,12 +3,12 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { m as parseKeyIdString } from "./portable-key-id-Ca30-hOa.mjs";
 import { a as verificationObservation, i as triedKey, n as observeCheck, t as observeAttempt } from "./verification-Dpfcw8ml.mjs";
-import { n as version, t as name } from "./deno-BZ4z-lJJ.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-CRv6_IBg.mjs";
+import { n as version, t as name } from "./deno-CO1X_K_q.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-BguhdXt-.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CPVqki78.mjs";
 import { a as promoteKeyOwnerEvidence } from "./key-owner-evidence-APB6NpSk.mjs";
-import { S as fetchKeyDetailed, T as validateCryptoKey, v as bypassKeyCacheReads } from "./ld-Dkkyk65e.mjs";
-import { n as resolvePortableActorKey, r as verifyPortableGatewayKeyDocument } from "./portable-key-Cdw3vfl-.mjs";
+import { S as fetchKeyDetailed, T as validateCryptoKey, v as bypassKeyCacheReads } from "./ld-Cy86r-Ty.mjs";
+import { n as resolvePortableActorKey, r as verifyPortableGatewayKeyDocument } from "./portable-key-ClXZ25LT.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{http-x1satM4y.cjs → http-g5f1D2tm.cjs}

@@ -17,7 +17,7 @@ json_canon = require_rolldown_runtime.__toESM(json_canon, 1);
 let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conventions");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.2";
+var version = "2.4.4";
 //#endregion
 //#region src/sig/portable-key-id.ts
 const COMPATIBLE_KEY_ID_PATH_PATTERN = /^\/\.well-known\/apgateway\/did(?::|%3A)/i;
@@ -5138,16 +5138,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 = {}) {
@@ -5213,6 +5220,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-Di1-EKqa.mjs

@@ -0,0 +1,188 @@
+import { Temporal } from "temporal-polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { t as getAuthenticationOrigin } from "./portable-key-id-Ca30-hOa.mjs";
+import { n as version, t as name } from "./deno-CO1X_K_q.mjs";
+import { g as recordInboxActivity, n as getDurationMs, r as getFederationMetrics } from "./metrics-BguhdXt-.mjs";
+import { getLogger } from "@logtape/logtape";
+import { getTypeId } from "@fedify/vocab";
+import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
+//#region src/federation/inbox.ts
+/**
+* Checks whether an activity's ID and all of its actor IDs have the same
+* [FEP-fe34] origin.  Activities without an ID have no origin to authenticate.
+*
+* Origins are compared by `getAuthenticationOrigin()`, so a portable activity
+* and its portable actors, including compatible identifiers on any gateway,
+* are compared by their DIDs.  An ID that has no supported origin, such as an
+* opaque URN, never matches.
+*
+* The caller is responsible for rejecting a missing primary actor ID before
+* relying on this check.
+*
+* [FEP-fe34]: https://w3id.org/fep/fe34
+* @internal
+*/
+function actorsHaveSameOrigin(activity) {
+	if (activity.id == null) return true;
+	const origin = getAuthenticationOrigin(activity.id);
+	return origin != null && activity.actorIds.every((actor) => getAuthenticationOrigin(actor) === origin);
+}
+async function routeActivity({ context: ctx, json, originalJson, normalizedActivity, ldSignatureVerified, activity, recipient, inboxListeners, inboxContextFactory, listenerInboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, meterProvider, 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."
+		});
+		recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
+		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.`
+			});
+			recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
+			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;
+		}
+		getFederationMetrics(meterProvider).recordQueueTaskEnqueued({
+			role: "inbox",
+			queue,
+			activityType: getTypeId(activity).href
+		}, 0);
+		recordInboxActivity(meterProvider, "queued", getTypeId(activity).href);
+		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}`
+			});
+			recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
+			span.end();
+			return "unsupportedActivity";
+		}
+		const { class: cls, listener } = dispatched;
+		span.updateName(`activitypub.dispatch_inbox_listener ${cls.name}`);
+		try {
+			const activityType = getTypeId(activity).href;
+			const started = performance.now();
+			try {
+				const contextFactory = listenerInboxContextFactory ?? inboxContextFactory;
+				await listener(contextFactory(recipient, contextFactory === inboxContextFactory ? json : originalJson ?? json, activity.id?.href, activityType), activity);
+			} finally {
+				getFederationMetrics(meterProvider).recordInboxProcessingDuration(activityType, getDurationMs(started));
+			}
+		} 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)
+			});
+			recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
+			span.end();
+			return "error";
+		}
+		recordInboxActivity(meterProvider, "processed", getTypeId(activity).href);
+		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/{keycache-D-MNltOk.mjs → keycache-N2opu4-3.mjs}

@@ -5,7 +5,7 @@ import { t as MAX_PORTABLE_KEY_TTL } from "./key-owner-evidence-APB6NpSk.mjs";
 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";
 const COMPATIBLE_KEY_SEGMENT = "__compatible";
 const MAX_OWNER_BYTES = 32 * 1024;
 function isCompatibleKeyEntry(value) {

package/dist/{kv-cache-BgQMAKIg.mjs → kv-cache-BxfOpUP9.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { p as recordDocumentCache } from "./metrics-CRv6_IBg.mjs";
+import { p as recordDocumentCache } from "./metrics-BguhdXt-.mjs";
 import { getLogger } from "@logtape/logtape";
 import { preloadedContexts } from "@fedify/vocab-runtime";
 //#region src/utils/kv-cache.ts

package/dist/{kv-cache-B0SZfzFb.js → kv-cache-C0AsMZ4U.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { G as validateCryptoKey, ot as recordDocumentCache, t as doubleKnock } from "./http-Qq7jR2rC.js";
+import { G as validateCryptoKey, ot as recordDocumentCache, t as doubleKnock } from "./http-D_AGUmSq.js";
 import { getLogger } from "@logtape/logtape";
 import { FetchError, UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, resolveDocumentLoaderTimeout, validatePublicUrl, withDocumentLoaderTimeout } from "@fedify/vocab-runtime";
 import { curry } from "es-toolkit";
@@ -62,6 +62,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/{kv-cache-D4throaQ.cjs → kv-cache-HsXADkl9.cjs}

@@ -1,5 +1,5 @@
 const { URLPattern } = require("urlpattern-polyfill");
-const require_http = require("./http-x1satM4y.cjs");
+const require_http = require("./http-g5f1D2tm.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
 let es_toolkit = require("es-toolkit");
@@ -61,6 +61,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 _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);

package/dist/{ld-Dkkyk65e.mjs → ld-Cy86r-Ty.mjs}

@@ -3,8 +3,8 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { c as isPortableActorDocument, d as isPortableUri, l as isPortableId, m as parseKeyIdString, s as isCompatibleKeyId } from "./portable-key-id-Ca30-hOa.mjs";
 import { a as verificationObservation, i as triedKey, n as observeCheck, t as observeAttempt } from "./verification-Dpfcw8ml.mjs";
-import { n as version, t as name } from "./deno-BZ4z-lJJ.mjs";
-import { _ as recordKeyLookup, n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch, t as classifyFetchError } from "./metrics-CRv6_IBg.mjs";
+import { n as version, t as name } from "./deno-CO1X_K_q.mjs";
+import { _ as recordKeyLookup, n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch, t as classifyFetchError } from "./metrics-BguhdXt-.mjs";
 import { n as attachKeyOwnerEvidence, t as MAX_PORTABLE_KEY_TTL } from "./key-owner-evidence-APB6NpSk.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, Multikey, Object as Object$1, getTypeId, isActor } from "@fedify/vocab";
@@ -154,16 +154,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 = {}) {
@@ -229,6 +236,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/{metrics-CRv6_IBg.mjs → metrics-BguhdXt-.mjs}

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-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 { metrics } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";
 //#region src/federation/metrics.ts