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

package/dist/federation/portable-gateway-keys.test.mjs

@@ -1,4 +1,4 @@
-import "temporal-polyfill";
+import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-BHXXx4Wx.mjs";
@@ -7,12 +7,14 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.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 { p as signJsonLd } from "../ld-ya2C1Xip.mjs";
-import { l as signRequest } from "../http-DV_yW4dv.mjs";
-import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { f as handleInbox, n as FederationImpl, o as createFederation } from "../middleware-Bdwd_Gg8.mjs";
+import { r as getVerifiedKeyOwnerEvidence } from "../key-owner-evidence-Bo3yaeL5.mjs";
+import { p as signJsonLd } from "../ld-BsTkRrwF.mjs";
+import { d as verifyRequest, f as verifyRequestDetailed, l as signRequest } from "../http-Bd6rZlJX.mjs";
+import { a as rsaPrivateKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
+import { f as handleInbox, n as FederationImpl, o as createFederation } from "../middleware-Coqgp-K0.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-D3GoetXS.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
-import { t as KvKeyCache } from "../keycache-BInaECGj.mjs";
+import { t as KvKeyCache } from "../keycache-PiOM9pM0.mjs";
 import { Create, CryptographicKey, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, encodeMultibase, exportDidKey, parseIri } from "@fedify/vocab-runtime";
@@ -508,5 +510,177 @@ test("handleInbox() checks the DIDs of compatible activity IDs", async () => {
 		dispatched: 0
 	});
 });
+function countingLoader(responses) {
+	const inner = createLoader(responses);
+	let count = 0;
+	return {
+		documentLoader(url, options) {
+			if (url.replace(/#.*$/, "") === compatibleActorId(gateway)) count++;
+			return inner(url, options);
+		},
+		fetched: () => count
+	};
+}
+async function signedRequest(keyId = gatewayKeyId, privateKey = rsaPrivateKey2, spec) {
+	return await signRequest(new Request("https://local.example/notes/1", { headers: { Accept: "application/activity+json" } }), privateKey, keyId, spec == null ? {} : { spec });
+}
+test("handleInbox() fetches the actor of a gateway key once", async () => {
+	for (const [keyId, actor] of [[gatewayKeyId, await actorDocument([gateway])], [apKeyId, await apActorDocument()]]) {
+		const { documentLoader, fetched } = countingLoader({ [compatibleActorId(gateway)]: actor });
+		const kv = new MemoryKvStore();
+		for (let i = 0; i < 2; i++) {
+			assertEquals(await deliver(await createJson(`once-${i}`), [gateway], {
+				kv,
+				documentLoader,
+				keyId
+			}), {
+				status: 401,
+				dispatched: 0
+			});
+			assertEquals(fetched(), 1);
+		}
+	}
+});
+test("RequestContext.getSignedKeyOwner() does not fetch the actor of a gateway key again", async () => {
+	for (const [keyId, actor, gateways] of [[
+		gatewayKeyId,
+		await actorDocument([gateway, otherGateway]),
+		[`${gateway}/`, `${otherGateway}/`]
+	], [
+		apKeyId,
+		await apActorDocument(),
+		[`${gateway}/`]
+	]]) {
+		const { documentLoader, fetched } = countingLoader({ [compatibleActorId(gateway)]: actor });
+		const ctx = new FederationImpl({
+			kv: new MemoryKvStore(),
+			contextLoaderFactory: () => mockDocumentLoader,
+			documentLoaderFactory: () => documentLoader
+		}).createContext(await signedRequest(keyId), void 0);
+		assertEquals((await ctx.getSignedKey())?.id?.href, keyId.href);
+		assertEquals(fetched(), 1);
+		const owner = await ctx.getSignedKeyOwner();
+		assertEquals(owner?.id?.href, actorId.href);
+		assertEquals(owner?.gateways.map((g) => g.href), [...gateways]);
+		assertEquals(fetched(), 1);
+	}
+});
+test("getKeyOwner() reuses the actor of a cached gateway key", async () => {
+	for (const spec of [void 0, "rfc9421"]) {
+		const { documentLoader, fetched } = countingLoader({ [compatibleActorId(gateway)]: await actorDocument([gateway]) });
+		const options = {
+			documentLoader,
+			contextLoader: mockDocumentLoader,
+			keyCache: new KvKeyCache(new MemoryKvStore(), ["pk"])
+		};
+		const fresh = await verifyRequest(await signedRequest(gatewayKeyId, rsaPrivateKey2, spec), options);
+		const cached = await verifyRequest(await signedRequest(gatewayKeyId, rsaPrivateKey2, spec), options);
+		assertEquals(fetched(), 1);
+		for (const key of [fresh, cached]) assertEquals((await getKeyOwner(key, options))?.id?.href, actorId.href);
+		assertEquals(fetched(), 1);
+	}
+});
+test("doesActorOwnKey() checks the actor of a verified gateway key without fetching", async () => {
+	const { documentLoader, fetched } = countingLoader({ [compatibleActorId(gateway)]: await actorDocument([gateway]) });
+	const options = {
+		documentLoader,
+		contextLoader: mockDocumentLoader
+	};
+	const key = await verifyRequest(await signedRequest(), options);
+	assertEquals(fetched(), 1);
+	assertEquals(await doesActorOwnKey(portableCreate(), key, options), true);
+	assertEquals(await doesActorOwnKey(new Create({
+		id: parseIri(`ap+ef61://${otherDid}/activities/1`),
+		actor: parseIri(`ap+ef61://${otherDid}/actors/alice`)
+	}), key, options), false);
+	assertEquals(fetched(), 1);
+});
+test("doesActorOwnKey() and getKeyOwner() fully check other gateway keys", async () => {
+	const { documentLoader, fetched } = countingLoader({ [compatibleActorId(gateway)]: await actorDocument([gateway]) });
+	const options = {
+		documentLoader,
+		contextLoader: mockDocumentLoader
+	};
+	const verified = await verifyRequest(await signedRequest(), options);
+	assertEquals(fetched(), 1);
+	const others = [new CryptographicKey({
+		id: gatewayKeyId,
+		owner: actorId,
+		publicKey: rsaPublicKey2.publicKey
+	}), verified.clone({})];
+	let expected = 1;
+	for (const key of others) {
+		assertEquals(await doesActorOwnKey(portableCreate(), key, options), true);
+		assertEquals(fetched(), ++expected);
+		assertEquals((await getKeyOwner(key, options))?.id?.href, actorId.href);
+		assertEquals(fetched(), ++expected);
+	}
+	const mutated = await verifyRequest(await signedRequest(), options);
+	mutated.ownerId.href = parseIri(`ap+ef61://${otherDid}/actors/alice`).href;
+	assertEquals(getVerifiedKeyOwnerEvidence(mutated), void 0);
+});
+test("verifyRequest() does not vouch for the owners of keys that fail to verify signatures", async () => {
+	const documentLoader = createLoader({ [compatibleActorId(gateway)]: await actorDocument([gateway]) });
+	const cachedKeys = [];
+	const keyCache = new class extends KvKeyCache {
+		compatibleKeyScope(scope) {
+			const scoped = super.compatibleKeyScope(scope);
+			return {
+				...scoped,
+				set(keyId, key, options) {
+					if (key instanceof CryptographicKey) cachedKeys.push(key);
+					return scoped.set(keyId, key, options);
+				}
+			};
+		}
+	}(new MemoryKvStore(), ["pk"]);
+	assertEquals((await verifyRequestDetailed(await signedRequest(gatewayKeyId, rsaPrivateKey3), {
+		documentLoader,
+		contextLoader: mockDocumentLoader,
+		keyCache
+	})).verified, false);
+	assertEquals(cachedKeys.length, 1);
+	assertEquals(getVerifiedKeyOwnerEvidence(cachedKeys[0]), void 0);
+});
+test("doesActorOwnKey() fully checks cached gateway keys cached without their actors", async () => {
+	const { documentLoader, fetched } = countingLoader({ [compatibleActorId(gateway)]: await actorDocument([gateway]) });
+	const kv = new MemoryKvStore();
+	const options = {
+		documentLoader,
+		contextLoader: mockDocumentLoader,
+		keyCache: new KvKeyCache(kv, ["pk"])
+	};
+	await verifyRequest(await signedRequest(), options);
+	assertEquals(fetched(), 1);
+	const entryKey = [
+		"pk",
+		"__compatible",
+		"httpSignature",
+		gatewayKeyId.href
+	];
+	const { owner: _, ...entry } = await kv.get(entryKey) ?? {};
+	await kv.set(entryKey, entry);
+	const key = await verifyRequest(await signedRequest(), options);
+	assertEquals(fetched(), 1);
+	assertEquals(getVerifiedKeyOwnerEvidence(key), void 0);
+	assertEquals(await doesActorOwnKey(portableCreate(), key, options), true);
+	assertEquals(fetched(), 2);
+});
+test("Owners of verified gateway keys expire with their cache entries", async () => {
+	const documentLoader = createLoader({ [compatibleActorId(gateway)]: await actorDocument([gateway]) });
+	const now = Temporal.Now.instant();
+	const keyCache = new KvKeyCache(new MemoryKvStore(), ["pk"], {
+		keyTtl: Temporal.Duration.from({ minutes: 5 }),
+		now: () => now
+	});
+	const key = await verifyRequest(await signedRequest(), {
+		documentLoader,
+		contextLoader: mockDocumentLoader,
+		keyCache
+	});
+	const deadline = now.add({ minutes: 5 });
+	assertEquals(getVerifiedKeyOwnerEvidence(key, deadline.subtract({ seconds: 1 }))?.expires, deadline);
+	assertEquals(getVerifiedKeyOwnerEvidence(key, deadline), void 0);
+});
 //#endregion
 export {};

package/dist/federation/portable-inbox.test.mjs

@@ -8,11 +8,11 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { p as signJsonLd } from "../ld-ya2C1Xip.mjs";
-import { a as signObject } from "../proof-BdO3BbLh.mjs";
-import { f as verifyRequestDetailed, l as signRequest } from "../http-DV_yW4dv.mjs";
+import { p as signJsonLd } from "../ld-BsTkRrwF.mjs";
+import { a as signObject } from "../proof-CQAYqWdj.mjs";
+import { f as verifyRequestDetailed, l as signRequest } from "../http-Bd6rZlJX.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 { _ as coversDelivery, o as createFederation, v as forwardPortableInboxActivity, y as resolvePortableInboxForwardingOptions } from "../middleware-Bdwd_Gg8.mjs";
+import { _ as coversDelivery, o as createFederation, v as forwardPortableInboxActivity, y as resolvePortableInboxForwardingOptions } from "../middleware-Coqgp-K0.mjs";
 import { Create, CryptographicKey, Follow, Note, Person, Tombstone } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { exportDidKey, formatIri, parseIri } from "@fedify/vocab-runtime";

package/dist/federation/portable-parse-uri.test.mjs

@@ -7,7 +7,7 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-Bdwd_Gg8.mjs";
+import { o as createFederation } from "../middleware-Coqgp-K0.mjs";
 import { Note, Object as Object$1, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";

package/dist/federation/portable.test.mjs

@@ -8,10 +8,10 @@ import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { a as signObject, c as verifyPortableObjectProof } from "../proof-BdO3BbLh.mjs";
-import { l as signRequest } from "../http-DV_yW4dv.mjs";
+import { a as signObject, c as verifyPortableObjectProof } from "../proof-CQAYqWdj.mjs";
+import { l as signRequest } from "../http-Bd6rZlJX.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 { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-Bdwd_Gg8.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-Coqgp-K0.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Collection, Create, Note, Object as Object$1, Person, Tombstone, lookupObject } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/send.test.mjs

@@ -10,10 +10,10 @@ import { t as assertNotEquals } from "../assert_not_equals-CpPK2t89.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { d as verifyRequest } from "../http-DV_yW4dv.mjs";
+import { d as verifyRequest } from "../http-Bd6rZlJX.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { t as doesActorOwnKey } from "../owner-C6Nv5yyw.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-BwANxryy.mjs";
+import { t as doesActorOwnKey } from "../owner-D3GoetXS.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-DjkQrxt5.mjs";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";

package/dist/federation/tasks/enqueue.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../../kv-DCHkaJ9-.mjs";
 import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, t as MockQueue } from "../../tasks-IG3pHfvZ.mjs";
 import "../../testing-C1itIjqW.mjs";
-import { o as createFederation } from "../../middleware-Bdwd_Gg8.mjs";
+import { o as createFederation } from "../../middleware-Coqgp-K0.mjs";
 import { n as ParallelMessageQueue } from "../../mq-Dm1Wmtm-.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { delay } from "es-toolkit";

package/dist/federation/tasks/tasks.test.mjs

@@ -4,8 +4,8 @@ globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../../kv-DCHkaJ9-.mjs";
 import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, t as MockQueue } from "../../tasks-IG3pHfvZ.mjs";
 import "../../testing-C1itIjqW.mjs";
-import { o as createFederation } from "../../middleware-Bdwd_Gg8.mjs";
-import { r as createFederationBuilder } from "../../builder-D89oOfHC.mjs";
+import { o as createFederation } from "../../middleware-Coqgp-K0.mjs";
+import { r as createFederationBuilder } from "../../builder-B2d_Pt0j.mjs";
 import { t as TaskCodec } from "../../codec-C6rTrpIp.mjs";
 import { t as InProcessMessageQueue } from "../../mq-Dm1Wmtm-.mjs";
 import { W3CTraceContextPropagator } from "@opentelemetry/core";

package/dist/federation/temporal.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-CbPfRGZq.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-oRKP803M.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

@@ -6,7 +6,7 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-CpPK2t89.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-Bdwd_Gg8.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-Coqgp-K0.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { parseIri } from "@fedify/vocab-runtime";

package/dist/{federation-dBOqmJcA.cjs → federation-DrNgkLfJ.cjs}

@@ -1,10 +1,10 @@
 const { URLPattern } = require("urlpattern-polyfill");
 const require_rolldown_runtime = require("./rolldown-runtime-Dmm3t92W.cjs");
 const require_transformers = require("./transformers-BalCrSsr.cjs");
-const require_http = require("./http-wdsia0-O.cjs");
+const require_http = require("./http-5CJBdU8n.cjs");
 const require_types = require("./types-poIao40f.cjs");
-const require_portable_collection = require("./portable-collection-C65SwL2l.cjs");
-const require_kv_cache = require("./kv-cache-BHNtQi9e.cjs");
+const require_portable_collection = require("./portable-collection-CnlCamup.cjs");
+const require_kv_cache = require("./kv-cache-YRi_g8GB.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_uri_template = require("@fedify/uri-template");
 let _fedify_vocab = require("@fedify/vocab");
@@ -2497,10 +2497,13 @@ async function routeActivity({ context: ctx, json, originalJson, normalizedActiv
 const Temporal$9 = require_http.Temporal;
 const KEY_CACHE_GENERATION = "2";
 const COMPATIBLE_KEY_SEGMENT = "__compatible";
-const MAX_COMPATIBLE_KEY_TTL = Temporal$9.Duration.from({ hours: 1 });
+const MAX_OWNER_BYTES = 32 * 1024;
 function isCompatibleKeyEntry(value) {
 	return value != null && typeof value === "object" && "key" in value && "expires" in value && typeof value.expires === "number";
 }
+function isJsonObject(value) {
+	return value != null && typeof value === "object" && !Array.isArray(value);
+}
 var KvKeyCache = class {
 	kv;
 	prefix;
@@ -2582,30 +2585,48 @@ var KvKeyCache = class {
 			keyId.href
 		];
 		const isExpired = (entry) => entry.expires <= now().epochMilliseconds;
-		const keyTtl = Math.min(this.keyTtl.total("millisecond"), MAX_COMPATIBLE_KEY_TTL.total("millisecond"));
+		const keyTtl = Math.min(this.keyTtl.total("millisecond"), require_http.MAX_PORTABLE_KEY_TTL.total("millisecond"));
 		const unavailableKeyTtl = this.unavailableKeyTtl.total("millisecond");
-		return {
-			get: async (keyId) => {
-				const entry = await this.kv.get(entryKey(keyId));
-				if (entry === void 0) return void 0;
-				if (!isCompatibleKeyEntry(entry) || isExpired(entry)) {
-					await this.kv.delete(entryKey(keyId));
-					return;
-				}
-				if (entry.key === null) return null;
-				let key;
+		const getEntry = async (keyId) => {
+			const entry = await this.kv.get(entryKey(keyId));
+			if (entry === void 0) return void 0;
+			if (!isCompatibleKeyEntry(entry) || isExpired(entry)) {
+				await this.kv.delete(entryKey(keyId));
+				return;
+			}
+			if (entry.key === null) return null;
+			let expires;
+			try {
+				expires = Temporal$9.Instant.fromEpochMilliseconds(entry.expires);
+			} catch (error) {
+				if (!(error instanceof RangeError)) throw error;
+				await this.kv.delete(entryKey(keyId));
+				return;
+			}
+			let key;
+			try {
+				key = await _fedify_vocab.CryptographicKey.fromJsonLd(entry.key, this.options);
+			} catch {
 				try {
-					key = await _fedify_vocab.CryptographicKey.fromJsonLd(entry.key, this.options);
+					key = await _fedify_vocab.Multikey.fromJsonLd(entry.key, this.options);
 				} catch {
-					try {
-						key = await _fedify_vocab.Multikey.fromJsonLd(entry.key, this.options);
-					} catch {
-						await this.kv.delete(entryKey(keyId));
-						return;
-					}
+					await this.kv.delete(entryKey(keyId));
+					return;
 				}
-				return isExpired(entry) ? void 0 : key;
+			}
+			if (isExpired(entry)) return void 0;
+			return {
+				key,
+				...isJsonObject(entry.owner) ? { owner: entry.owner } : {},
+				expires
+			};
+		};
+		return {
+			get: async (keyId) => {
+				const entry = await getEntry(keyId);
+				return entry == null ? entry : entry.key;
 			},
+			getEntry,
 			set: async (keyId, key, options) => {
 				const serialized = key == null ? null : await key.toJsonLd(this.options);
 				const current = now();
@@ -2616,10 +2637,13 @@ var KvKeyCache = class {
 					await this.kv.delete(entryKey(keyId));
 					return;
 				}
+				const owner = key == null || options?.owner == null || new TextEncoder().encode(JSON.stringify(options.owner)).length > MAX_OWNER_BYTES ? void 0 : options.owner;
 				await this.kv.set(entryKey(keyId), {
 					key: serialized,
-					expires
+					expires,
+					...owner == null ? {} : { owner }
 				}, { ttl: Temporal$9.Duration.from({ milliseconds: ttl }) });
+				return key == null ? void 0 : Temporal$9.Instant.fromEpochMilliseconds(expires);
 			},
 			delete: async (keyId) => {
 				await this.kv.delete(entryKey(keyId));