@fedify/fedify 2.4.0-dev.1964 → 2.4.0-dev.1995

package/dist/sig/mod.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { C as exportJwk, D as importJwk, E as generateCryptoKeyPair, S as KeyCache, T as fetchKeyDetailed, _ as validateAcceptSignature, a as VerifyRequestDetailedResult, b as FetchKeyOptions, c as signRequest, d as AcceptSignatureMember, f as AcceptSignatureParameters, g as parseAcceptSignature, h as fulfillAcceptSignature, i as SignRequestOptions, l as verifyRequest, m as formatAcceptSignature, n as HttpMessageSignaturesSpecDeterminer, o as VerifyRequestFailureReason, p as FulfillAcceptSignatureResult, r as Rfc9421SignRequestOptions, s as VerifyRequestOptions, t as HttpMessageSignaturesSpec, u as verifyRequestDetailed, v as FetchKeyDetailedResult, w as fetchKey, x as FetchKeyResult, y as FetchKeyErrorResult } from "../http-CdrSn2ip.js";
-import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "../owner-DGSfntI-.js";
-import { C as verifyJsonLd, S as signJsonLd, _ as VerifySignatureOptions, a as VerifyPortableObjectProofOptions, b as detachSignature, c as createProof, d as verifyObject, f as verifyPortableObjectProof, g as VerifyJsonLdOptions, h as SignJsonLdOptions, i as VerifyPortableObjectProofFailureReason, l as hasProofLike, m as CreateSignatureOptions, n as SignObjectOptions, o as VerifyPortableObjectProofResult, p as verifyProof, r as VerifyObjectOptions, s as VerifyProofOptions, t as CreateProofOptions, u as signObject, v as attachSignature, w as verifySignature, x as hasSignatureLike, y as createSignature } from "../mod-DzRXACM5.js";
+import { C as exportJwk, D as importJwk, E as generateCryptoKeyPair, S as KeyCache, T as fetchKeyDetailed, _ as validateAcceptSignature, a as VerifyRequestDetailedResult, b as FetchKeyOptions, c as signRequest, d as AcceptSignatureMember, f as AcceptSignatureParameters, g as parseAcceptSignature, h as fulfillAcceptSignature, i as SignRequestOptions, l as verifyRequest, m as formatAcceptSignature, n as HttpMessageSignaturesSpecDeterminer, o as VerifyRequestFailureReason, p as FulfillAcceptSignatureResult, r as Rfc9421SignRequestOptions, s as VerifyRequestOptions, t as HttpMessageSignaturesSpec, u as verifyRequestDetailed, v as FetchKeyDetailedResult, w as fetchKey, x as FetchKeyResult, y as FetchKeyErrorResult } from "../http-65PYi9jY.js";
+import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "../owner-BSzr5-I8.js";
+import { C as verifyJsonLd, S as signJsonLd, _ as VerifySignatureOptions, a as VerifyPortableObjectProofOptions, b as detachSignature, c as createProof, d as verifyObject, f as verifyPortableObjectProof, g as VerifyJsonLdOptions, h as SignJsonLdOptions, i as VerifyPortableObjectProofFailureReason, l as hasProofLike, m as CreateSignatureOptions, n as SignObjectOptions, o as VerifyPortableObjectProofResult, p as verifyProof, r as VerifyObjectOptions, s as VerifyProofOptions, t as CreateProofOptions, u as signObject, v as attachSignature, w as verifySignature, x as hasSignatureLike, y as createSignature } from "../mod-UDwMjuHM.js";
 export { AcceptSignatureMember, AcceptSignatureParameters, CreateProofOptions, CreateSignatureOptions, DoesActorOwnKeyOptions, FetchKeyDetailedResult, FetchKeyErrorResult, FetchKeyOptions, FetchKeyResult, FulfillAcceptSignatureResult, GetKeyOwnerOptions, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, Rfc9421SignRequestOptions, SignJsonLdOptions, SignObjectOptions, SignRequestOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyPortableObjectProofFailureReason, VerifyPortableObjectProofOptions, VerifyPortableObjectProofResult, VerifyProofOptions, VerifyRequestDetailedResult, VerifyRequestFailureReason, VerifyRequestOptions, VerifySignatureOptions, attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, hasProofLike, hasSignatureLike, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyPortableObjectProof, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/mod.js

@@ -1,5 +1,5 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { A as formatAcceptSignature, M as parseAcceptSignature, N as validateAcceptSignature, a as verifyRequestDetailed, c as fetchKeyDetailed, i as verifyRequest, j as fulfillAcceptSignature, l as generateCryptoKeyPair, o as exportJwk, r as signRequest, s as fetchKey, u as importJwk } from "../http-Dj4s1UQ0.js";
-import { C as verifyJsonLd, a as verifyPortableObjectProof, c as doesActorOwnKey, f as attachSignature, h as detachSignature, i as verifyObject, l as getKeyOwner, m as createSignature, n as hasProofLike, o as verifyProof, r as signObject, t as createProof, v as hasSignatureLike, w as verifySignature, x as signJsonLd } from "../proof-BO_esQii.js";
+import { F as validateAcceptSignature, M as formatAcceptSignature, N as fulfillAcceptSignature, P as parseAcceptSignature, a as verifyRequestDetailed, c as fetchKey, d as importJwk, i as verifyRequest, l as fetchKeyDetailed, o as exportJwk, r as signRequest, u as generateCryptoKeyPair } from "../http-9WyuldYh.js";
+import { S as signJsonLd, T as verifySignature, a as signObject, c as verifyPortableObjectProof, g as detachSignature, h as createSignature, i as hasProofLike, n as getKeyOwner, p as attachSignature, r as createProof, s as verifyObject, t as doesActorOwnKey, u as verifyProof, w as verifyJsonLd, y as hasSignatureLike } from "../owner-BIPEZGiU.js";
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, hasProofLike, hasSignatureLike, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyPortableObjectProof, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/owner.test.mjs

@@ -6,7 +6,7 @@ import { t as assertFalse } from "../assert_false-3pLLLsO4.mjs";
 import "../std__assert-CxFT0MNt.mjs";
 import { t as assert } from "../assert-CebeUf0C.mjs";
 import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-DTEqTzSr.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-CRoq8Spb.mjs";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/sig/owner.test.ts
@@ -40,7 +40,7 @@ test("doesActorOwnKey() records OpenTelemetry span", async () => {
 		id: new URL("https://example.com/activity"),
 		actor: new URL("https://example.com/person")
 	}), new CryptographicKey({
-		id: new URL("https://example.com/person#key"),
+		id: new URL("https://example.com/key"),
 		owner: new URL("https://example.com/person")
 	}), {
 		documentLoader: mockDocumentLoader,
@@ -50,9 +50,108 @@ test("doesActorOwnKey() records OpenTelemetry span", async () => {
 	assertEquals(spans.length, 1);
 	const span = spans[0];
 	assertEquals(span.attributes["activitypub.actor.id"], "https://example.com/person");
-	assertEquals(span.attributes["activitypub.key.id"], "https://example.com/person#key");
+	assertEquals(span.attributes["activitypub.key.id"], "https://example.com/key");
 	assertEquals(span.attributes["activitypub.key_ownership.verified"], true);
-	assertEquals(span.attributes["activitypub.key_ownership.method"], "owner_id");
+	assertEquals(span.attributes["activitypub.key_ownership.method"], "key_owner");
+});
+test("doesActorOwnKey() rejects a key that only claims to be owned", async () => {
+	const options = {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	};
+	assertFalse(await doesActorOwnKey(new Create({ actor: new URL("https://example.com/person") }), new CryptographicKey({
+		id: new URL("https://attacker.example/key"),
+		owner: new URL("https://example.com/person")
+	}), options));
+	const unresolvable = new URL("https://impersonated.invalid/users/victim");
+	assertFalse(await doesActorOwnKey(new Create({ actor: unresolvable }), new CryptographicKey({
+		id: new URL("https://attacker.example/key"),
+		owner: unresolvable
+	}), options));
+});
+test("doesActorOwnKey() ignores an actor embedded in the activity", async () => {
+	const { publicKeyPem } = await rsaPublicKey1.toJsonLd({ contextLoader: mockDocumentLoader });
+	const activity = await Create.fromJsonLd({
+		"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+		id: "https://example.com/activity",
+		type: "Create",
+		actor: {
+			id: "https://example.com/person",
+			type: "Person",
+			publicKey: {
+				id: "https://attacker.example/key",
+				type: "CryptographicKey",
+				owner: "https://example.com/person",
+				publicKeyPem
+			}
+		}
+	}, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	assertEquals(activity.actorId, new URL("https://example.com/person"));
+	assertFalse(await doesActorOwnKey(activity, new CryptographicKey({ id: new URL("https://attacker.example/key") }), {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	}));
+});
+test("getKeyOwner() rejects an actor document from another origin", async () => {
+	const keyId = "https://attacker.example/key";
+	const { publicKeyPem } = await rsaPublicKey1.toJsonLd({ contextLoader: mockDocumentLoader });
+	const options = {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: "https://example.com/person",
+					type: "Person",
+					publicKey: [{
+						id: keyId,
+						type: "CryptographicKey",
+						publicKeyPem
+					}]
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	};
+	assertEquals(await getKeyOwner(new URL(keyId), options), null);
+});
+test("doesActorOwnKey() matches a key that leaves its id implicit", async () => {
+	const actorId = "https://example.com/implicit-key-actor";
+	const { publicKeyPem } = await rsaPublicKey1.toJsonLd({ contextLoader: mockDocumentLoader });
+	const options = {
+		documentLoader(resource) {
+			if (resource === actorId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: actorId,
+					type: "Person",
+					publicKey: [{
+						type: "CryptographicKey",
+						owner: actorId,
+						publicKeyPem
+					}]
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	};
+	const activity = new Create({ actor: new URL(actorId) });
+	assert(await doesActorOwnKey(activity, new CryptographicKey({
+		owner: new URL(actorId),
+		publicKey: rsaPublicKey1.publicKey
+	}), options));
+	assertFalse(await doesActorOwnKey(activity, new CryptographicKey({
+		owner: new URL(actorId),
+		publicKey: rsaPublicKey2.publicKey
+	}), options));
 });
 //#endregion
 export {};

package/dist/sig/proof.test.mjs

@@ -10,7 +10,7 @@ import { t as assertRejects } from "../assert_rejects-wFbSPn1O.mjs";
 import { t as assert } from "../assert-CebeUf0C.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-B5Ne7JoL.mjs";
-import { a as verifyPortableObjectProof, i as verifyObject, n as hasProofLike, o as verifyProof, r as signObject, t as createProof } from "../proof-D5Ajk4DJ.mjs";
+import { a as verifyObject, c as verifyProof, n as hasProofLike, o as verifyPortableObjectProof, r as signObject, t as createProof } from "../proof-BDxNVZ3E.mjs";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place, Translation } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { decodeMultibase, encodeMultibase, exportDidKey, exportMultibaseKey, formatIri, importMultibaseKey, parseIri } from "@fedify/vocab-runtime";
@@ -1005,6 +1005,56 @@ test("verifyPortableObjectProof()", async (t) => {
 		})).verified);
 		assertEquals(fetches, 1);
 	});
+	await t.step("caches keys owned by their own DID", async () => {
+		const verificationMethod = new URL("did:web:example.com#key");
+		const document = {
+			...unsignedObject,
+			id: "ap://did:web:example.com/objects/1"
+		};
+		const cached = [];
+		assert((await verifyPortableObjectProof(await signPortableJsonLd(document, { verificationMethod }), {
+			contextLoader: mockDocumentLoader,
+			keyCache: {
+				get: () => Promise.resolve(void 0),
+				set: (keyId) => {
+					cached.push(keyId.href);
+					return Promise.resolve();
+				}
+			},
+			documentLoader: async (url) => ({
+				contextUrl: null,
+				documentUrl: url,
+				document: {
+					"@context": "https://w3id.org/security/multikey/v1",
+					id: verificationMethod.href,
+					type: "Multikey",
+					controller: "did:web:example.com",
+					publicKeyMultibase: await exportMultibaseKey(ed25519PublicKey.publicKey)
+				}
+			})
+		})).verified);
+		assertEquals(cached, [verificationMethod.href]);
+	});
+	await t.step("rejects a portable key that names another controller", async () => {
+		const verificationMethod = new URL("did:web:example.com#key");
+		assertEquals((await verifyPortableObjectProof(await signPortableJsonLd({
+			...unsignedObject,
+			id: "ap://did:web:example.com/objects/1"
+		}, { verificationMethod }), {
+			contextLoader: mockDocumentLoader,
+			documentLoader: async (url) => ({
+				contextUrl: null,
+				documentUrl: url,
+				document: {
+					"@context": "https://w3id.org/security/multikey/v1",
+					id: verificationMethod.href,
+					type: "Multikey",
+					controller: "did:web:attacker.example",
+					publicKeyMultibase: await exportMultibaseKey(ed25519PublicKey.publicKey)
+				}
+			})
+		})).verified, false);
+	});
 	await t.step("reports a missing proof on portable objects", async () => {
 		assertEquals(await verifyPortableObjectProof(unsignedObject, options), {
 			verified: false,
@@ -1699,5 +1749,74 @@ test("signObject() preserves FEP-22cd contexts through proof verification", asyn
 	assertInstanceOf(verified, Note);
 	assertEquals(verified.translations[0].language?.baseName, "ko");
 });
+test("verifyObject() rejects a key that claims a forged controller", async () => {
+	const keyId = new URL("https://attacker.example/multikey");
+	const impersonated = "https://example.com/person2";
+	const attackerActor = "https://attacker.example/actor";
+	const multikeyDocument = await ed25519Multikey.toJsonLd({ contextLoader: mockDocumentLoader });
+	const options = {
+		format: "compact",
+		contextLoader: mockDocumentLoader,
+		documentLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	};
+	const signed = await signObject(new Create({
+		id: new URL("https://attacker.example/activities/1"),
+		actor: new URL(impersonated),
+		object: new Note({
+			id: new URL("https://attacker.example/notes/1"),
+			attribution: new URL(impersonated),
+			content: "Hello world"
+		})
+	}), ed25519PrivateKey, keyId, options);
+	const jsonLd = await signed.toJsonLd(options);
+	const serveKeyControlledBy = (controller) => (resource) => {
+		if (resource === keyId.href) return Promise.resolve({
+			contextUrl: null,
+			documentUrl: resource,
+			document: {
+				...multikeyDocument,
+				id: keyId.href,
+				controller
+			}
+		});
+		if (resource === attackerActor) return Promise.resolve({
+			contextUrl: null,
+			documentUrl: resource,
+			document: {
+				"@context": [
+					"https://www.w3.org/ns/activitystreams",
+					"https://w3id.org/security/v1",
+					"https://w3id.org/security/multikey/v1",
+					"https://w3id.org/security/data-integrity/v1",
+					"https://www.w3.org/ns/did/v1"
+				],
+				id: resource,
+				type: "Person",
+				assertionMethod: [keyId.href]
+			}
+		});
+		return mockDocumentLoader(resource);
+	};
+	assertEquals(await verifyObject(Create, jsonLd, {
+		documentLoader: serveKeyControlledBy(impersonated),
+		contextLoader: mockDocumentLoader
+	}), null);
+	const honestLoader = serveKeyControlledBy(attackerActor);
+	let proof = null;
+	for await (const p of signed.getProofs(options)) {
+		proof = p;
+		break;
+	}
+	assertInstanceOf(proof, DataIntegrityProof);
+	assertInstanceOf(await verifyProof(jsonLd, proof, {
+		documentLoader: honestLoader,
+		contextLoader: mockDocumentLoader
+	}), Multikey);
+	assertEquals(await verifyObject(Create, jsonLd, {
+		documentLoader: honestLoader,
+		contextLoader: mockDocumentLoader
+	}), null);
+});
 //#endregion
 export {};

package/dist/{temporal-BoDw51A-.mjs → temporal-Dv6Qv-8k.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { c as getNormalizationContextLoader } from "./ld-OuCeQFny.mjs";
+import { c as getNormalizationContextLoader } from "./ld-qup__MAW.mjs";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/federation/temporal.ts
 function isPlainObject(value) {

package/dist/testing/kv.test.mjs

@@ -6,7 +6,7 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as ManualClockKvStore } from "../kv-DBRWVx3Q.mjs";
 import { n as baseOptions, o as stringSchema, t as MockQueue } from "../tasks-dbCShlCb.mjs";
 import { t as assertEquals } from "../assert_equals-CBlRfA-_.mjs";
-import { o as createFederation } from "../middleware-TeLjzoxn.mjs";
+import { o as createFederation } from "../middleware-CzvJvPHK.mjs";
 //#region src/testing/kv.test.ts
 test("ManualClockKvStore keeps an entry at its exact expiration instant", async () => {
 	const kv = new ManualClockKvStore();

package/dist/testing/mod.d.mts

@@ -2021,7 +2021,8 @@ interface FederationOptions<TContextData> {
    */
   authenticatedDocumentLoaderFactory?: AuthenticatedDocumentLoaderFactory;
   /**
-   * Whether to allow fetching private network addresses in the document loader.
+   * Whether to allow private network addresses in the document loader and
+   * outbound activity delivery, including redirects.
    *
    * If turned on, {@link FederationOptions.documentLoader},
    * {@link FederationOptions.contextLoader}, and

package/dist/{types-RXm5YxpC.cjs → types-Be2zbyeG.cjs}

@@ -1,6 +1,80 @@
 const { URLPattern } = require("urlpattern-polyfill");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
+//#region src/utils/body.ts
+/** Decoded JSON body limit: 16 MiB.  @internal */
+const MAX_BODY_SIZE = 16 * 1024 * 1024;
+/** A body exceeded the byte limit.  @internal */
+var BodyTooLargeError = class extends _fedify_vocab_runtime.FetchError {
+	/** Creates an error for a body exceeding the given limit. */
+	constructor(url, maxBytes) {
+		super(url, `Body exceeds the limit of ${maxBytes} bytes`);
+		this.name = "BodyTooLargeError";
+	}
+};
+/** Validates a finite, positive byte limit.  @internal */
+function validateBodySizeLimit(maxBytes) {
+	if (!Number.isSafeInteger(maxBytes) || maxBytes <= 0) throw new RangeError("The body size limit must be a positive safe integer.");
+}
+/**
+* Reads UTF-8 text while limiting bytes received from the body stream.
+* Fetch responses are already decompressed, so the stream count is authoritative.
+* @param message The response or request to read.
+* @param maxBytes The maximum number of decoded bytes to read.
+* @param url The URL to include in errors and logs.
+* @returns The decoded body text.
+* @throws {BodyTooLargeError} If the body exceeds the limit.
+* @internal
+*/
+async function readBoundedText(message, maxBytes, url) {
+	validateBodySizeLimit(maxBytes);
+	const reader = message.body?.getReader();
+	const tooLarge = () => {
+		(0, _logtape_logtape.getLogger)([
+			"fedify",
+			"runtime",
+			"body"
+		]).warn("Body from {url} exceeds the limit of {maxBytes} bytes.", {
+			url: url.toString(),
+			maxBytes
+		});
+		throw new BodyTooLargeError(url, maxBytes);
+	};
+	try {
+		const length = message.headers.get("Content-Length");
+		const encoding = message.headers.get("Content-Encoding");
+		if ((encoding == null || encoding.toLowerCase() === "identity") && length != null && /^\d+$/.test(length) && Number(length) > maxBytes) tooLarge();
+		if (reader == null) return "";
+		let size = 0;
+		const textReader = new ReadableStream({ async pull(controller) {
+			const { done, value } = await reader.read();
+			if (done) {
+				controller.close();
+				return;
+			}
+			size += value.byteLength;
+			if (size > maxBytes) tooLarge();
+			controller.enqueue(value);
+		} }, { highWaterMark: 0 }).pipeThrough(new TextDecoderStream()).getReader();
+		try {
+			const chunks = [];
+			while (true) {
+				const { done, value } = await textReader.read();
+				if (done) break;
+				chunks.push(value);
+			}
+			return chunks.join("");
+		} finally {
+			textReader.releaseLock();
+		}
+	} catch (error) {
+		if (reader != null) reader.cancel(error).catch(() => {});
+		throw error;
+	} finally {
+		reader?.releaseLock();
+	}
+}
+//#endregion
 //#region src/nodeinfo/client.ts
 const logger = (0, _logtape_logtape.getLogger)([
 	"fedify",
@@ -81,7 +155,7 @@ async function getNodeInfo(url, options = {}) {
 				});
 				return;
 			}
-			const wellKnownRd = await wellKnownResponse.json();
+			const wellKnownRd = JSON.parse(await readBoundedText(wellKnownResponse, MAX_BODY_SIZE, wellKnownUrl));
 			const link = wellKnownRd?.links?.find((link) => link != null && "rel" in link && (link.rel === "http://nodeinfo.diaspora.software/ns/schema/2.0" || link.rel === "http://nodeinfo.diaspora.software/ns/schema/2.1") && "href" in link && link.href != null);
 			if (link == null || link.href == null) {
 				logger.error("Failed to find a NodeInfo document link from {url}: {resourceDescriptor}", {
@@ -105,7 +179,7 @@ async function getNodeInfo(url, options = {}) {
 			});
 			return;
 		}
-		const data = await response.json();
+		const data = JSON.parse(await readBoundedText(response, MAX_BODY_SIZE, nodeInfoUrl));
 		if (options.parse === "none") return data;
 		return parseNodeInfo(data, { tryBestEffort: options.parse === "best-effort" }) ?? void 0;
 	} catch (error) {
@@ -351,6 +425,18 @@ function nodeInfoToJson(nodeInfo) {
 	};
 }
 //#endregion
+Object.defineProperty(exports, "BodyTooLargeError", {
+	enumerable: true,
+	get: function() {
+		return BodyTooLargeError;
+	}
+});
+Object.defineProperty(exports, "MAX_BODY_SIZE", {
+	enumerable: true,
+	get: function() {
+		return MAX_BODY_SIZE;
+	}
+});
 Object.defineProperty(exports, "getNodeInfo", {
 	enumerable: true,
 	get: function() {
@@ -369,3 +455,9 @@ Object.defineProperty(exports, "parseNodeInfo", {
 		return parseNodeInfo;
 	}
 });
+Object.defineProperty(exports, "readBoundedText", {
+	enumerable: true,
+	get: function() {
+		return readBoundedText;
+	}
+});

package/dist/{types-Dtyf8lVj.js → types-C_cNlNVK.js}

@@ -1,7 +1,81 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { getLogger } from "@logtape/logtape";
-import { UrlError, getUserAgent, validatePublicUrl } from "@fedify/vocab-runtime";
+import { FetchError, UrlError, getUserAgent, validatePublicUrl } from "@fedify/vocab-runtime";
+//#region src/utils/body.ts
+/** Decoded JSON body limit: 16 MiB.  @internal */
+const MAX_BODY_SIZE = 16 * 1024 * 1024;
+/** A body exceeded the byte limit.  @internal */
+var BodyTooLargeError = class extends FetchError {
+	/** Creates an error for a body exceeding the given limit. */
+	constructor(url, maxBytes) {
+		super(url, `Body exceeds the limit of ${maxBytes} bytes`);
+		this.name = "BodyTooLargeError";
+	}
+};
+/** Validates a finite, positive byte limit.  @internal */
+function validateBodySizeLimit(maxBytes) {
+	if (!Number.isSafeInteger(maxBytes) || maxBytes <= 0) throw new RangeError("The body size limit must be a positive safe integer.");
+}
+/**
+* Reads UTF-8 text while limiting bytes received from the body stream.
+* Fetch responses are already decompressed, so the stream count is authoritative.
+* @param message The response or request to read.
+* @param maxBytes The maximum number of decoded bytes to read.
+* @param url The URL to include in errors and logs.
+* @returns The decoded body text.
+* @throws {BodyTooLargeError} If the body exceeds the limit.
+* @internal
+*/
+async function readBoundedText(message, maxBytes, url) {
+	validateBodySizeLimit(maxBytes);
+	const reader = message.body?.getReader();
+	const tooLarge = () => {
+		getLogger([
+			"fedify",
+			"runtime",
+			"body"
+		]).warn("Body from {url} exceeds the limit of {maxBytes} bytes.", {
+			url: url.toString(),
+			maxBytes
+		});
+		throw new BodyTooLargeError(url, maxBytes);
+	};
+	try {
+		const length = message.headers.get("Content-Length");
+		const encoding = message.headers.get("Content-Encoding");
+		if ((encoding == null || encoding.toLowerCase() === "identity") && length != null && /^\d+$/.test(length) && Number(length) > maxBytes) tooLarge();
+		if (reader == null) return "";
+		let size = 0;
+		const textReader = new ReadableStream({ async pull(controller) {
+			const { done, value } = await reader.read();
+			if (done) {
+				controller.close();
+				return;
+			}
+			size += value.byteLength;
+			if (size > maxBytes) tooLarge();
+			controller.enqueue(value);
+		} }, { highWaterMark: 0 }).pipeThrough(new TextDecoderStream()).getReader();
+		try {
+			const chunks = [];
+			while (true) {
+				const { done, value } = await textReader.read();
+				if (done) break;
+				chunks.push(value);
+			}
+			return chunks.join("");
+		} finally {
+			textReader.releaseLock();
+		}
+	} catch (error) {
+		if (reader != null) reader.cancel(error).catch(() => {});
+		throw error;
+	} finally {
+		reader?.releaseLock();
+	}
+}
+//#endregion
 //#region src/nodeinfo/client.ts
 const logger = getLogger([
 	"fedify",
@@ -82,7 +156,7 @@ async function getNodeInfo(url, options = {}) {
 				});
 				return;
 			}
-			const wellKnownRd = await wellKnownResponse.json();
+			const wellKnownRd = JSON.parse(await readBoundedText(wellKnownResponse, MAX_BODY_SIZE, wellKnownUrl));
 			const link = wellKnownRd?.links?.find((link) => link != null && "rel" in link && (link.rel === "http://nodeinfo.diaspora.software/ns/schema/2.0" || link.rel === "http://nodeinfo.diaspora.software/ns/schema/2.1") && "href" in link && link.href != null);
 			if (link == null || link.href == null) {
 				logger.error("Failed to find a NodeInfo document link from {url}: {resourceDescriptor}", {
@@ -106,7 +180,7 @@ async function getNodeInfo(url, options = {}) {
 			});
 			return;
 		}
-		const data = await response.json();
+		const data = JSON.parse(await readBoundedText(response, MAX_BODY_SIZE, nodeInfoUrl));
 		if (options.parse === "none") return data;
 		return parseNodeInfo(data, { tryBestEffort: options.parse === "best-effort" }) ?? void 0;
 	} catch (error) {
@@ -352,4 +426,4 @@ function nodeInfoToJson(nodeInfo) {
 	};
 }
 //#endregion
-export { getNodeInfo as n, parseNodeInfo as r, nodeInfoToJson as t };
+export { MAX_BODY_SIZE as a, BodyTooLargeError as i, getNodeInfo as n, readBoundedText as o, parseNodeInfo as r, nodeInfoToJson as t };

package/dist/utils/docloader.test.mjs

@@ -5,11 +5,11 @@ import { t as esm_default } from "../esm-BHXXx4Wx.mjs";
 import { t as assertEquals } from "../assert_equals-CBlRfA-_.mjs";
 import "../std__assert-CxFT0MNt.mjs";
 import { t as assertRejects } from "../assert_rejects-wFbSPn1O.mjs";
-import { l as verifyRequest } from "../http-D7LX-BL9.mjs";
+import { l as verifyRequest } from "../http-D9urSO2D.mjs";
 import { i as rsaPrivateKey2 } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-dk_k3S8d.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-BbGSL0Xq.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
-import { UrlError } from "@fedify/vocab-runtime";
+import { FetchError, UrlError } from "@fedify/vocab-runtime";
 //#region src/utils/docloader.test.ts
 test("getAuthenticatedDocumentLoader()", async (t) => {
 	esm_default.spyGlobal();
@@ -136,5 +136,29 @@ test("getAuthenticatedDocumentLoader() cancellation", {
 	});
 	esm_default.hardReset();
 });
+test("getAuthenticatedDocumentLoader() bounds JSON after redirects", async () => {
+	esm_default.mockGlobal();
+	let oversized = true;
+	try {
+		const url = "https://example.com/bounded";
+		esm_default.get(url, {
+			status: 302,
+			headers: { Location: `${url}/document` }
+		});
+		esm_default.get(`${url}/document`, () => new Response("{\"name\":\"hello\"}", { headers: {
+			"Content-Type": "application/activity+json",
+			...oversized ? { "Content-Length": String(16777217) } : {}
+		} }));
+		const loader = getAuthenticatedDocumentLoader({
+			privateKey: rsaPrivateKey2,
+			keyId: new URL("https://example.com/key2")
+		}, { allowPrivateAddress: true });
+		await assertRejects(() => loader(url), FetchError);
+		oversized = false;
+		assertEquals((await loader(url)).document, { name: "hello" });
+	} finally {
+		esm_default.hardReset();
+	}
+});
 //#endregion
 export {};

package/dist/utils/kv-cache.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as kvCache, t as MockKvStore } from "../kv-cache-xRcC_xxP.mjs";
+import { n as kvCache, t as MockKvStore } from "../kv-cache-lKyFn_Dn.mjs";
 import { deepStrictEqual, throws } from "node:assert";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { preloadedContexts } from "@fedify/vocab-runtime";

package/dist/utils/mod.cjs

@@ -1,5 +1,5 @@
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_kv_cache = require("../kv-cache-DtsjH_bY.cjs");
+const require_kv_cache = require("../kv-cache-DXT9vmIg.cjs");
 exports.getAuthenticatedDocumentLoader = require_kv_cache.getAuthenticatedDocumentLoader;
 exports.kvCache = require_kv_cache.kvCache;

package/dist/utils/mod.d.cts

@@ -1,3 +1,3 @@
 /// <reference lib="esnext.temporal" />
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-CLHkCwLm.cjs";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-CyiSjRkk.cjs";
 export { getAuthenticatedDocumentLoader, kvCache };

package/dist/utils/mod.d.ts

@@ -1,3 +1,3 @@
 /// <reference lib="esnext.temporal" />
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-DypxPS9H.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-C0BYc0OU.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/dist/utils/mod.js

@@ -1,4 +1,4 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-tGNbvDCF.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-DtmXhPXG.js";
 export { getAuthenticatedDocumentLoader, kvCache };