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

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-CtidZS_t.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-DEYs99FZ.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-DHiR8yTf.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-BM2-w-Wq.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-CykuL0ya.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.4.0-dev.1964+1d28dc03",
+  "version": "2.4.0-dev.1988+c5c9d617",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -151,10 +151,10 @@
     "structured-field-values": "^2.0.4",
     "temporal-polyfill": "^1.0.1",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab": "2.4.0-dev.1964+1d28dc03",
-    "@fedify/webfinger": "2.4.0-dev.1964+1d28dc03",
-    "@fedify/uri-template": "2.4.0-dev.1964+1d28dc03",
-    "@fedify/vocab-runtime": "2.4.0-dev.1964+1d28dc03"
+    "@fedify/uri-template": "2.4.0-dev.1988+c5c9d617",
+    "@fedify/vocab": "2.4.0-dev.1988+c5c9d617",
+    "@fedify/vocab-runtime": "2.4.0-dev.1988+c5c9d617",
+    "@fedify/webfinger": "2.4.0-dev.1988+c5c9d617"
   },
   "devDependencies": {
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
@@ -167,7 +167,7 @@
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
     "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.4.0-dev.1964+1d28dc03"
+    "@fedify/vocab-tools": "^2.4.0-dev.1988+c5c9d617"
   },
   "scripts": {
     "build:self": "tsdown",

package/dist/owner-DTEqTzSr.mjs

@@ -1,120 +0,0 @@
-import "temporal-polyfill";
-import "urlpattern-polyfill";
-globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CtG93ohj.mjs";
-import "./key-BVjgbs_9.mjs";
-import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
-import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
-import { getDocumentLoader } from "@fedify/vocab-runtime";
-//#region src/sig/owner.ts
-/**
-* Checks if the actor of the given activity owns the specified key.
-* @param activity The activity to check.
-* @param key The public key to check.
-* @param options Options for checking the key ownership.
-* @returns Whether the actor is the owner of the key.
-*/
-async function doesActorOwnKey(activity, key, options) {
-	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("activitypub.verify_key_ownership", {
-		kind: SpanKind.INTERNAL,
-		attributes: {
-			"activitypub.actor.id": activity.actorId?.href ?? "",
-			"activitypub.key.id": key.id?.href ?? ""
-		}
-	}, async (span) => {
-		try {
-			if (key.ownerId != null) {
-				const owns = key.ownerId.href === activity.actorId?.href;
-				span.setAttribute("activitypub.key_ownership.verified", owns);
-				span.setAttribute("activitypub.key_ownership.method", "owner_id");
-				return owns;
-			}
-			const actor = await activity.getActor(options);
-			if (actor == null || !isActor(actor)) {
-				span.setAttribute("activitypub.key_ownership.verified", false);
-				span.setAttribute("activitypub.key_ownership.method", "actor_fetch");
-				return false;
-			}
-			for (const publicKeyId of actor.publicKeyIds) if (key.id != null && publicKeyId.href === key.id.href) {
-				span.setAttribute("activitypub.key_ownership.verified", true);
-				span.setAttribute("activitypub.key_ownership.method", "actor_fetch");
-				return true;
-			}
-			span.setAttribute("activitypub.key_ownership.verified", false);
-			span.setAttribute("activitypub.key_ownership.method", "actor_fetch");
-			return false;
-		} catch (error) {
-			span.recordException(error);
-			span.setStatus({
-				code: SpanStatusCode.ERROR,
-				message: String(error)
-			});
-			throw error;
-		} finally {
-			span.end();
-		}
-	});
-}
-/**
-* Gets the actor that owns the specified key.  Returns `null` if the key has no
-* known owner.
-*
-* @param keyId The ID of the key to check, or the key itself.
-* @param options Options for getting the key owner.
-* @returns The actor that owns the key, or `null` if the key has no known
-*          owner.
-* @since 0.7.0
-*/
-async function getKeyOwner(keyId, options) {
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const documentLoader = options.documentLoader ?? getDocumentLoader();
-	const contextLoader = options.contextLoader ?? getDocumentLoader();
-	let object;
-	if (keyId instanceof CryptographicKey) {
-		object = keyId;
-		if (object.id == null) return null;
-		keyId = object.id;
-	} else {
-		let keyDoc;
-		try {
-			const { document } = await documentLoader(keyId.href);
-			keyDoc = document;
-		} catch (_) {
-			return null;
-		}
-		try {
-			object = await Object$1.fromJsonLd(keyDoc, {
-				documentLoader,
-				contextLoader,
-				tracerProvider
-			});
-		} catch (e) {
-			if (!(e instanceof TypeError)) throw e;
-			try {
-				object = await CryptographicKey.fromJsonLd(keyDoc, {
-					documentLoader,
-					contextLoader,
-					tracerProvider
-				});
-			} catch (e) {
-				if (e instanceof TypeError) return null;
-				throw e;
-			}
-		}
-	}
-	let owner = null;
-	if (object instanceof CryptographicKey) {
-		if (object.ownerId == null) return null;
-		owner = await object.getOwner({
-			documentLoader,
-			contextLoader,
-			tracerProvider
-		});
-	} else if (isActor(object)) owner = object;
-	else return null;
-	if (owner == null) return null;
-	for (const kid of owner.publicKeyIds) if (kid.href === keyId.href) return owner;
-	return null;
-}
-//#endregion
-export { getKeyOwner as n, doesActorOwnKey as t };