@fedify/fedify 2.4.0-dev.2169 → 2.4.0-dev.2190

package/dist/sig/owner.test.mjs

@@ -6,7 +6,7 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-D3GoetXS.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-Dem4fbwc.mjs";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/sig/owner.test.ts

package/dist/sig/portable-collection.test.mjs

@@ -2,7 +2,7 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as ed25519PrivateKey, r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { t as verifyPortableObject } from "../portable-collection-C60_acmx.mjs";
+import { t as verifyPortableObject } from "../portable-collection-BL6aZlQ0.mjs";
 import { Collection, CollectionPage, Note, OrderedCollection, Person, traverseCollection } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 import { FetchError, encodeMultibase, exportDidKey, preloadedContexts } from "@fedify/vocab-runtime";

package/dist/sig/portable-key-id.test.d.mts

@@ -0,0 +1,2 @@
+import { Temporal } from "temporal-polyfill";
+import { URLPattern } from "urlpattern-polyfill";

package/dist/sig/portable-key-id.test.mjs

@@ -0,0 +1,67 @@
+import "temporal-polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
+import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
+import "../std__assert-DvMDRPes.mjs";
+import { t as assert } from "../assert-D1Eafmd_.mjs";
+import { f as isSameObjectId, t as getAuthenticationOrigin } from "../portable-key-id-Ca30-hOa.mjs";
+import { r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
+import { test } from "@fedify/fixture";
+import { exportDidKey, parseIri } from "@fedify/vocab-runtime";
+//#region src/sig/portable-key-id.test.ts
+const did = await exportDidKey(ed25519PublicKey.publicKey);
+const otherDid = await exportDidKey((await crypto.subtle.generateKey("Ed25519", true, ["sign", "verify"])).publicKey);
+test("getAuthenticationOrigin()", () => {
+	for (const id of [
+		parseIri(`ap://${did}/actor`),
+		parseIri(`ap+ef61://${did}/actor`),
+		parseIri(`ap+ef61://${encodeURIComponent(did)}/actor#main-key`),
+		parseIri(`ap://${did}/actor?@gateway=https%3A%2F%2Fgw.example`),
+		new URL(`https://gw.example/.well-known/apgateway/${did}/actor`),
+		new URL(`https://gw2.example/.well-known/apgateway/${did}/objects/1`),
+		new URL(`${did}#${did.slice(8)}`)
+	]) assertEquals(getAuthenticationOrigin(id), did, id.href);
+	assertEquals(getAuthenticationOrigin(parseIri(`ap+ef61://${otherDid}/actor`)), otherDid);
+	assertEquals(getAuthenticationOrigin(new URL("https://example.com:443/users/alice")), "https://example.com");
+	assertEquals(getAuthenticationOrigin(new URL("http://example.com:8080/users/alice")), "http://example.com:8080");
+	for (const id of [
+		new URL(`https://gw.example/.well-known/apgateway/${did}/actor?@gateway=https%3A%2F%2Fgw.example`),
+		new URL("https://gw.example/.well-known/apgateway/did:key:invalid!/a"),
+		new URL(`https://gw.example/.well-known/apgateway/${did}`),
+		new URL(`https://gw.example/.well-known/apgateway/${did}/actor%ZZ`),
+		new URL("urn:uuid:3d6f4c1e-2f8b-4d1a-9c6e-7b8a9d0e1f2a"),
+		new URL("tag:example.com,2026:actor")
+	]) assertEquals(getAuthenticationOrigin(id), null, id.href);
+});
+test("isSameObjectId()", () => {
+	const portable = parseIri(`ap+ef61://${did}/activities/1`);
+	for (const id of [
+		parseIri(`ap://${did}/activities/1`),
+		parseIri(`ap+ef61://${encodeURIComponent(did)}/activities/1`),
+		parseIri(`ap://${did}/activities/1?@gateway=https%3A%2F%2Fgw.example`),
+		new URL(`https://gw.example/.well-known/apgateway/${did}/activities/1`),
+		new URL(`https://gw2.example/.well-known/apgateway/${did}/activities/1`)
+	]) {
+		assert(isSameObjectId(portable, id), id.href);
+		assert(isSameObjectId(id, portable), id.href);
+	}
+	for (const id of [
+		parseIri(`ap+ef61://${otherDid}/activities/1`),
+		parseIri(`ap+ef61://${did}/activities/2`),
+		parseIri(`ap+ef61://${did}/activities/1#fragment`),
+		new URL(`https://gw.example/.well-known/apgateway/${did}/activities/1%ZZ`),
+		new URL("https://gw.example/activities/1")
+	]) {
+		assertFalse(isSameObjectId(portable, id), id.href);
+		assertFalse(isSameObjectId(id, portable), id.href);
+	}
+	const malformed = new URL(`https://gw.example/.well-known/apgateway/${did}/activities/1%ZZ`);
+	assertFalse(isSameObjectId(malformed, malformed));
+	const http = new URL("https://example.com/activities/1");
+	assert(isSameObjectId(http, new URL("https://example.com/activities/1")));
+	assertFalse(isSameObjectId(http, new URL("https://example.com/activities/1#a")));
+	assertFalse(isSameObjectId(http, new URL("https://example.com/activities/1?a")));
+});
+//#endregion
+export {};

package/dist/sig/portable-key.test.mjs

@@ -2,14 +2,14 @@ import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
-import { a as fetchKeyDetailed, i as fetchKey } from "../key-gIhVZO3p.mjs";
-import { h as verifyJsonLd, p as signJsonLd } from "../ld-BsTkRrwF.mjs";
-import { d as verifyProof, r as createProof } from "../proof-CQAYqWdj.mjs";
-import { n as resolvePortableActorKey } from "../portable-key-DyF5AnZo.mjs";
-import { d as verifyRequest, f as verifyRequestDetailed, l as signRequest } from "../http-Bd6rZlJX.mjs";
+import { a as fetchKeyDetailed, i as fetchKey } from "../key-DyXf88bq.mjs";
+import { h as verifyJsonLd, p as signJsonLd } from "../ld-oQj6j_hP.mjs";
+import { d as verifyProof, r as createProof } from "../proof-C9115DX_.mjs";
+import { n as resolvePortableActorKey } from "../portable-key-Duue9Y2Y.mjs";
+import { f as verifyRequest, l as signRequest, p as verifyRequestDetailed } from "../http-Y1ObT1A8.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-D3GoetXS.mjs";
-import { t as KvKeyCache } from "../keycache-PiOM9pM0.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-Dem4fbwc.mjs";
+import { t as KvKeyCache } from "../keycache-Da8A8mZa.mjs";
 import { Create, CryptographicKey, Multikey, Note, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 import { FetchError, encodeMultibase, exportDidKey, exportSpki, parseIri, preloadedContexts } from "@fedify/vocab-runtime";

package/dist/sig/proof.test.mjs

@@ -10,10 +10,10 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { a as signObject, c as verifyPortableObjectProof, d as verifyProof, i as hasProofLike, r as createProof, s as verifyObject } from "../proof-CQAYqWdj.mjs";
-import { d as verifyRequest } from "../http-Bd6rZlJX.mjs";
+import { a as signObject, c as verifyPortableObjectProof, d as verifyProof, i as hasProofLike, r as createProof, s as verifyObject } from "../proof-C9115DX_.mjs";
+import { f as verifyRequest } from "../http-Y1ObT1A8.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-CghLH7Zi.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-u6zzOExF.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";

package/dist/{temporal-oRKP803M.mjs → temporal-DKchpKyp.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { c as getNormalizationContextLoader } from "./ld-BsTkRrwF.mjs";
+import { c as getNormalizationContextLoader } from "./ld-oQj6j_hP.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-IG3pHfvZ.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
-import { o as createFederation } from "../middleware-Coqgp-K0.mjs";
+import { o as createFederation } from "../middleware-Bdu2-OPD.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

@@ -2275,6 +2275,35 @@ interface FederationOptions<TContextData> {
    * @since 1.3.0
    */
   userAgent?: GetUserAgentOptions | string;
+  /**
+   * The timeout for each call of the built-in document loader, context
+   * loader, and authenticated document loader, e.g., when Fedify fetches
+   * a key to verify a signature.  The timeout is shared by all the steps of
+   * a call, including every redirect it follows, retries, and reading the
+   * response body.  It does not cover the time spent reading from or
+   * writing to the cache.
+   *
+   * A timed-out call throws a `FetchError` without a response, whose
+   * `cause` is a `DOMException` named `"TimeoutError"`, so that, e.g.,
+   * a key fetch that times out is reported as a `keyFetchError` and cached
+   * like other failures to fetch a key.
+   *
+   * It does not affect loaders made by
+   * {@link FederationOptions.documentLoaderFactory},
+   * {@link FederationOptions.contextLoaderFactory}, or
+   * {@link FederationOptions.authenticatedDocumentLoaderFactory}.
+   * Note that if only {@link FederationOptions.documentLoaderFactory} is
+   * set, it also makes context loaders.
+   *
+   * Set it to `null` to turn off the timeout.
+   *
+   * 10 seconds by default.
+   * @throws {RangeError} If the duration is not positive, is longer than
+   *                      about 24.8 days, or is given in calendar units
+   *                      such as months.
+   * @since 2.4.0
+   */
+  documentLoaderTimeout?: Temporal.Duration | Temporal.DurationLike | null;
   /**
    * A callback that handles errors during outbox processing.  Note that this
    * callback can be called multiple times for the same activity, because
@@ -2303,6 +2332,29 @@ interface FederationOptions<TContextData> {
    * By default, the window is an hour.
    */
   signatureTimeWindow?: Temporal.Duration | Temporal.DurationLike | false;
+  /**
+   * The maximum number of [RFC 9421] signatures of an incoming request to
+   * verify, e.g., in the inbox and in
+   * {@link RequestContext.getSignedKey}.  A request can carry several
+   * signatures, each of which may make Fedify fetch the key that it names,
+   * so only the first ones in the order of the `Signature-Input` header are
+   * verified, and the rest are ignored as if they were absent.  Every
+   * signature among the first ones counts, even if it fails before its key
+   * is fetched.  See also the `maxSignatures` option of `verifyRequest()`.
+   *
+   * It has to be a positive integer, or `Infinity` to verify every
+   * signature, which lets a single request make Fedify fetch any number of
+   * keys.  Draft-cavage HTTP Signatures carry a single signature, so this
+   * option does not affect them.
+   *
+   * Three by default.
+   *
+   * [RFC 9421]: https://www.rfc-editor.org/rfc/rfc9421
+   * @throws {RangeError} Thrown when the federation is created if the value
+   *         is not a positive integer or `Infinity`.
+   * @since 2.4.0
+   */
+  maxHttpSignatures?: number;
   /**
    * Whether to skip HTTP Signatures verification for incoming activities.
    * This is useful for testing purposes, but should not be used in production.

package/dist/utils/docloader.test.mjs

@@ -5,9 +5,9 @@ import { t as esm_default } from "../esm-BHXXx4Wx.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
-import { d as verifyRequest } from "../http-Bd6rZlJX.mjs";
+import { f as verifyRequest } from "../http-Y1ObT1A8.mjs";
 import { i as rsaPrivateKey2 } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-CghLH7Zi.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-u6zzOExF.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
@@ -534,5 +534,96 @@ test("getAuthenticatedDocumentLoader() rejects cancellation before fetching", as
 		esm_default.hardReset();
 	}
 });
+function assertTimeoutFetchError(error, url) {
+	ok(error instanceof FetchError, String(error));
+	deepStrictEqual(error.url.href, url);
+	deepStrictEqual(error.response, void 0);
+	ok(error.cause instanceof DOMException);
+	deepStrictEqual(error.cause.name, "TimeoutError");
+	return true;
+}
+test("getAuthenticatedDocumentLoader() times out", async (t) => {
+	const identity = {
+		keyId: new URL("https://example.com/key2"),
+		privateKey: rsaPrivateKey2
+	};
+	const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+	await t.step("a request without a response", async () => {
+		esm_default.mockGlobal();
+		const url = "https://example.com/hang";
+		esm_default.get(url, () => new Promise(() => {}));
+		try {
+			await rejects(getAuthenticatedDocumentLoader(identity, {
+				allowPrivateAddress: true,
+				timeout: 100
+			})(url), (e) => assertTimeoutFetchError(e, url));
+		} finally {
+			esm_default.hardReset();
+		}
+	});
+	await t.step("double-knocking shares the timeout", async () => {
+		esm_default.mockGlobal();
+		const url = "https://example.com/double-knock";
+		let requests = 0;
+		esm_default.get(url, async () => {
+			requests++;
+			await delay(80);
+			return new Response(null, { status: 401 });
+		});
+		try {
+			await rejects(getAuthenticatedDocumentLoader(identity, {
+				allowPrivateAddress: true,
+				timeout: 120
+			})(url), (e) => assertTimeoutFetchError(e, url));
+			deepStrictEqual(requests, 2);
+			await delay(100);
+			deepStrictEqual(requests, 2);
+		} finally {
+			esm_default.hardReset();
+		}
+	});
+	for (const step of ["determineSpec", "rememberSpec"]) await t.step(`a slow ${step}()`, async () => {
+		esm_default.mockGlobal();
+		const url = `https://example.com/slow-${step}`;
+		let requests = 0;
+		esm_default.get(url, () => {
+			requests++;
+			return Response.json({ parsed: true });
+		});
+		try {
+			await rejects(getAuthenticatedDocumentLoader(identity, {
+				allowPrivateAddress: true,
+				timeout: 50,
+				specDeterminer: {
+					async determineSpec() {
+						if (step === "determineSpec") await delay(150);
+						return "rfc9421";
+					},
+					async rememberSpec() {
+						if (step === "rememberSpec") await delay(150);
+					}
+				}
+			})(url), (e) => assertTimeoutFetchError(e, url));
+			await delay(200);
+			deepStrictEqual(requests, step === "determineSpec" ? 0 : 1);
+		} finally {
+			esm_default.hardReset();
+		}
+	});
+	await t.step("the caller's signal still aborts", async () => {
+		esm_default.mockGlobal();
+		const url = "https://example.com/hang";
+		esm_default.get(url, () => new Promise(() => {}));
+		try {
+			const loader = getAuthenticatedDocumentLoader(identity, { allowPrivateAddress: true });
+			const controller = new AbortController();
+			const reason = /* @__PURE__ */ new Error("Canceled by the caller");
+			setTimeout(() => controller.abort(reason), 50);
+			await rejects(loader(url, { signal: controller.signal }), (e) => e === reason);
+		} 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-D0qjSeWY.mjs";
+import { n as kvCache, t as MockKvStore } from "../kv-cache-C8YjNAi_.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-YRi_g8GB.cjs");
+const require_kv_cache = require("../kv-cache-DUXluAc0.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-BA_F2x53.cjs";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-Dp3Ij7sw.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-B5z_q9TH.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-C5Mwx5ty.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-iR55fqlk.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-C02XitwK.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.4.0-dev.2169+0a45df07",
+  "version": "2.4.0-dev.2190+be3a8be0",
   "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.2169+0a45df07",
-    "@fedify/uri-template": "2.4.0-dev.2169+0a45df07",
-    "@fedify/vocab-runtime": "2.4.0-dev.2169+0a45df07",
-    "@fedify/webfinger": "2.4.0-dev.2169+0a45df07"
+    "@fedify/uri-template": "2.4.0-dev.2190+be3a8be0",
+    "@fedify/vocab-runtime": "2.4.0-dev.2190+be3a8be0",
+    "@fedify/vocab": "2.4.0-dev.2190+be3a8be0",
+    "@fedify/webfinger": "2.4.0-dev.2190+be3a8be0"
   },
   "devDependencies": {
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
@@ -166,8 +166,8 @@
     "tsx": "^4.21.0",
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
-    "@fedify/vocab-tools": "^2.4.0-dev.2169+0a45df07",
-    "@fedify/fixture": "2.0.0"
+    "@fedify/fixture": "2.0.0",
+    "@fedify/vocab-tools": "^2.4.0-dev.2190+be3a8be0"
   },
   "scripts": {
     "build:self": "tsdown",