@fedify/fedify 2.2.18 → 2.2.19

package/dist/{builder-DAbQyxmb.mjs → builder-UmydCxtK.mjs}

@@ -2,7 +2,7 @@ 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-JUTr6LYC.mjs";
+import { n as version, t as name } from "./deno-CD-8UlUi.mjs";
 import { t as ActivityListenerSet } from "./activity-listener-ell7W1s9.mjs";
 import { Tombstone, getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
@@ -59,7 +59,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-BgGJEcdp.mjs");
+		const { FederationImpl } = await import("./middleware-DYK_res8.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 { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-CHoUjmJm.mjs";
+import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-CpXoRHs3.mjs";
 import { test } from "@fedify/fixture";
 import { Follow, Person } from "@fedify/vocab";
 //#region src/compat/transformers.test.ts

package/dist/{deno-JUTr6LYC.mjs → deno-CD-8UlUi.mjs}

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

package/dist/{docloader-BGjq1F5U.mjs → docloader-D1ghurDJ.mjs}

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

package/dist/federation/builder.test.mjs

@@ -7,7 +7,7 @@ import { r as assertExists } from "../std__assert-DNZ4Liil.mjs";
 import { t as assertThrows } from "../assert_throws-D4DNWrux.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-Dmjbg-bA.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { n as createFederationBuilder } from "../builder-DAbQyxmb.mjs";
+import { n as createFederationBuilder } from "../builder-UmydCxtK.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Note, Person } from "@fedify/vocab";
 //#region src/federation/builder.test.ts

package/dist/federation/handler.test.mjs

@@ -7,13 +7,13 @@ import "../std__assert-DNZ4Liil.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
 import { r as parseAcceptSignature } from "../accept-Dd__NiUL.mjs";
-import { a as generateCryptoKeyPair } from "../key-D0ahOVjf.mjs";
-import { s as signRequest } from "../http-lCmKCZBI.mjs";
+import { a as generateCryptoKeyPair } from "../key-DolXUaLH.mjs";
+import { s as signRequest } from "../http-BBBUbwKh.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { a as compactJsonLd, p as signJsonLd } from "../ld-CJOXIehz.mjs";
-import { r as signObject } from "../proof-DS1Zl6BX.mjs";
-import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-CHoUjmJm.mjs";
+import { a as compactJsonLd, p as signJsonLd } from "../ld-rTdIfZ63.mjs";
+import { r as signObject } from "../proof-gOGM-sJS.mjs";
+import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-CpXoRHs3.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-ell7W1s9.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Activity, Create, CryptographicKey, Multikey, Note, Person, Tombstone } from "@fedify/vocab";

package/dist/federation/idempotency.test.mjs

@@ -5,8 +5,8 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-DNZ4Liil.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { r as signObject } from "../proof-DS1Zl6BX.mjs";
-import { o as createFederation } from "../middleware-CHoUjmJm.mjs";
+import { r as signObject } from "../proof-gOGM-sJS.mjs";
+import { o as createFederation } from "../middleware-CpXoRHs3.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

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { r as assertFalse, t as assertThrows } from "../assert_throws-D4DNWrux.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-ell7W1s9.mjs";
-import { t as actorsHaveSameOrigin } from "../inbox-DMATfdEI.mjs";
+import { t as actorsHaveSameOrigin } from "../inbox-Dca_0fwc.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
 //#region src/federation/inbox.test.ts

package/dist/federation/keycache.test.mjs

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

package/dist/federation/middleware.test.mjs

@@ -10,14 +10,14 @@ import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.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-lCmKCZBI.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-BGjq1F5U.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-CJOXIehz.mjs";
-import { t as doesActorOwnKey } from "../owner-BUTMEkbn.mjs";
-import { i as verifyObject, r as signObject } from "../proof-DS1Zl6BX.mjs";
-import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-CHoUjmJm.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";

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-QcuVRA-q.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-aNUajYPY.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/send.test.mjs

@@ -8,10 +8,10 @@ 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-BkxW5QJI.mjs";
 import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
-import { l as verifyRequest } from "../http-lCmKCZBI.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-BUTMEkbn.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-fnPrh9Zm.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

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 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-Biz6zK6e.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

@@ -5,7 +5,7 @@ import { r as createRequestContext } from "../context-Dk_tacqz.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-DNZ4Liil.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-CHoUjmJm.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-lCmKCZBI.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-JUTr6LYC.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-D0ahOVjf.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-OSYYhKM8.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";
+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-DEH_eppX.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";
+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-DMATfdEI.mjs → inbox-Dca_0fwc.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-JUTr6LYC.mjs";
+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";

package/dist/{key-D0ahOVjf.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-JUTr6LYC.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-CPEV_4nZ.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-DEH_eppX.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,8 +58,10 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedi
 		});
 	}
 	async function validateUrl(url) {
-		const protocol = new URL(url).protocol;
+		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-B7X4p1y7.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-OSYYhKM8.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,8 +57,10 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedi
 		});
 	}
 	async function validateUrl(url) {
-		const protocol = new URL(url).protocol;
+		const parsedUrl = new URL(url);
+		const protocol = parsedUrl.protocol;
 		if (protocol !== "http:" && protocol !== "https:") throw new UrlError(`Unsupported protocol: ${protocol}`);
+		if (parsedUrl.username !== "" || parsedUrl.password !== "") throw new UrlError("URLs with credentials are not allowed");
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(url);
 		} catch (error) {

package/dist/{ld-CJOXIehz.mjs → ld-rTdIfZ63.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-JUTr6LYC.mjs";
-import { r as fetchKey, s as validateCryptoKey } from "./key-D0ahOVjf.mjs";
+import { n as version, t as name } from "./deno-CD-8UlUi.mjs";
+import { r as fetchKey, s as validateCryptoKey } from "./key-DolXUaLH.mjs";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{middleware-D3hx1aiI.cjs → middleware-B4-Rzdi3.cjs}

@@ -1,4 +1,4 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_middleware = require("./middleware-QcuVRA-q.cjs");
+const require_middleware = require("./middleware-BWOwEGpy.cjs");
 exports.FederationImpl = require_middleware.FederationImpl;

package/dist/{middleware-QcuVRA-q.cjs → middleware-BWOwEGpy.cjs}

@@ -2,10 +2,10 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
-const require_http = require("./http-DEH_eppX.cjs");
+const require_http = require("./http-DrUG4fPS.cjs");
 const require_types = require("./types-DRPjmHVV.cjs");
-const require_proof = require("./proof-BeY7TsiS.cjs");
-const require_kv_cache = require("./kv-cache-CPEV_4nZ.cjs");
+const require_proof = require("./proof-DhaTTn-P.cjs");
+const require_kv_cache = require("./kv-cache-Bk3V1Tiu.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");
@@ -213,7 +213,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-D3hx1aiI.cjs"));
+		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-B4-Rzdi3.cjs"));
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -936,7 +936,7 @@ async function routeActivity({ context: ctx, json, originalJson, normalizedActiv
 }
 //#endregion
 //#region src/federation/keycache.ts
-const KEY_CACHE_GENERATION = "2";
+const KEY_CACHE_GENERATION = "3";
 var KvKeyCache = class {
 	kv;
 	prefix;

package/dist/{middleware-aNUajYPY.js → middleware-BimXKBcP.js}

@@ -2,10 +2,10 @@ import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { t as __exportAll } from "./chunk-CRNNMoPX.js";
 import { r as getDefaultActivityTransformers } from "./transformers-BGMIq1cs.js";
-import { a as verifyRequestDetailed, d as importJwk, f as validateCryptoKey, i as verifyRequest, m as formatAcceptSignature, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, v as name, y as version } from "./http-OSYYhKM8.js";
+import { a as verifyRequestDetailed, d as importJwk, f as validateCryptoKey, i as verifyRequest, m as formatAcceptSignature, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, v as name, y as version } from "./http-DJK2udgX.js";
 import { a as MAX_BODY_SIZE, i as BodyTooLargeError, n as getNodeInfo, o as readBoundedText, t as nodeInfoToJson } from "./types-miAYfiGO.js";
-import { _ as hasSignatureLike, b as signJsonLd, c as getKeyOwner, f as compactJsonLd, g as hasSignature, h as getNormalizationContextLoader, i as verifyObject, l as InvalidContextReferenceError, m as detachSignature, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, r as signObject, s as doesActorOwnKey, u as assertSafeJsonLd, v as isClearlyMalformedContextReference, w as wrapContextLoaderForJsonLd, x as verifyCompactJsonLd, y as isInvalidUrlTypeError } from "./proof-Bm3xyn3D.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-B7X4p1y7.js";
+import { _ as hasSignatureLike, b as signJsonLd, c as getKeyOwner, f as compactJsonLd, g as hasSignature, h as getNormalizationContextLoader, i as verifyObject, l as InvalidContextReferenceError, m as detachSignature, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, r as signObject, s as doesActorOwnKey, u as assertSafeJsonLd, v as isClearlyMalformedContextReference, w as wrapContextLoaderForJsonLd, x as verifyCompactJsonLd, y as isInvalidUrlTypeError } from "./proof-CaQ4KG6y.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-DDm80t1K.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
@@ -935,7 +935,7 @@ async function routeActivity({ context: ctx, json, originalJson, normalizedActiv
 }
 //#endregion
 //#region src/federation/keycache.ts
-const KEY_CACHE_GENERATION = "2";
+const KEY_CACHE_GENERATION = "3";
 var KvKeyCache = class {
 	kv;
 	prefix;

package/dist/{middleware-CHoUjmJm.mjs → middleware-CpXoRHs3.mjs}

@@ -2,26 +2,26 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-JUTr6LYC.mjs";
+import { n as version, t as name } from "./deno-CD-8UlUi.mjs";
 import { t as formatAcceptSignature } from "./accept-Dd__NiUL.mjs";
-import { o as importJwk, s as validateCryptoKey, t as exportJwk } from "./key-D0ahOVjf.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-lCmKCZBI.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-BGjq1F5U.mjs";
+import { o as importJwk, s as validateCryptoKey, t as exportJwk } from "./key-DolXUaLH.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-BBBUbwKh.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-D1ghurDJ.mjs";
 import { n as kvCache } from "./kv-cache-FsT1ljhs.mjs";
-import { t as KvKeyCache } from "./keycache-Dkc_sflV.mjs";
-import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-CJOXIehz.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-BUTMEkbn.mjs";
+import { t as KvKeyCache } from "./keycache-BimEQucx.mjs";
+import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-rTdIfZ63.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CVfzyM5V.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-amccRMrV.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-DS1Zl6BX.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-gOGM-sJS.mjs";
 import { d as readBoundedText, l as BodyTooLargeError, t as getNodeInfo, u as MAX_BODY_SIZE } from "./client-9F_u23dc.mjs";
 import { t as nodeInfoToJson } from "./types-J53Kw7so.mjs";
-import { t as FederationBuilderImpl } from "./builder-DAbQyxmb.mjs";
+import { t as FederationBuilderImpl } from "./builder-UmydCxtK.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-D-HqUuA2.mjs";
-import { n as routeActivity, t as actorsHaveSameOrigin } from "./inbox-DMATfdEI.mjs";
+import { n as routeActivity, t as actorsHaveSameOrigin } from "./inbox-Dca_0fwc.mjs";
 import { t as acceptsJsonLd } from "./negotiation-SQvQgUqe.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "./temporal-Biz6zK6e.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "./temporal-CA4Y9hBJ.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-v_sGLH1d.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-fnPrh9Zm.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-D35Va72B.mjs";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";

package/dist/{middleware-BgGJEcdp.mjs → middleware-DYK_res8.mjs}

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as FederationImpl } from "./middleware-CHoUjmJm.mjs";
+import { n as FederationImpl } from "./middleware-CpXoRHs3.mjs";
 export { FederationImpl };