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

package/dist/sig/http.test.mjs

@@ -11,8 +11,8 @@ import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { n as exportJwk } from "../key-C6jnekFI.mjs";
-import { a as listRequestSignatures, c as selectRequestSignature, d as verifyRequest, f as verifyRequestDetailed, i as formatRfc9421SignatureParameters, l as signRequest, n as doubleKnock, o as parseRfc9421Signature, r as formatRfc9421Signature, s as parseRfc9421SignatureInput, t as createRfc9421SignatureBase, u as timingSafeEqual } from "../http-DV_yW4dv.mjs";
+import { n as exportJwk } from "../key-gIhVZO3p.mjs";
+import { a as listRequestSignatures, c as selectRequestSignature, d as verifyRequest, f as verifyRequestDetailed, i as formatRfc9421SignatureParameters, l as signRequest, n as doubleKnock, o as parseRfc9421Signature, r as formatRfc9421Signature, s as parseRfc9421SignatureInput, t as createRfc9421SignatureBase, u as timingSafeEqual } from "../http-Bd6rZlJX.mjs";
 import { i as rsaPrivateKey2, l as rsaPublicKey5, o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, exportSpki } from "@fedify/vocab-runtime";

package/dist/sig/key-owner-evidence.test.d.mts

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

package/dist/sig/key-owner-evidence.test.mjs

@@ -0,0 +1,100 @@
+import { Temporal } from "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 { t as getCanonicalPortableId } from "../portable-key-id-Bg259c4Z.mjs";
+import { a as promoteKeyOwnerEvidence, i as parseKeyOwnerEvidence, n as attachKeyOwnerEvidence, r as getVerifiedKeyOwnerEvidence } from "../key-owner-evidence-Bo3yaeL5.mjs";
+import { r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
+import { CryptographicKey, Person } from "@fedify/vocab";
+import { test } from "@fedify/fixture";
+import { exportDidKey, parseIri } from "@fedify/vocab-runtime";
+//#region src/sig/key-owner-evidence.test.ts
+const did = await exportDidKey(ed25519PublicKey.publicKey);
+const rawActorId = `ap://${did}/actors/alice`;
+const actorId = parseIri(rawActorId);
+const keyId = new URL(`https://gw.example/.well-known/apgateway/${did}/actors/alice#main-key`);
+const document = {
+	"@id": rawActorId,
+	"@type": ["https://www.w3.org/ns/activitystreams#Person"],
+	"https://www.w3.org/ns/activitystreams#name": [{ "@value": "Alice" }]
+};
+const expires = Temporal.Now.instant().add({ hours: 1 });
+function createKey(owner = actorId) {
+	return new CryptographicKey({
+		id: new URL(keyId.href),
+		owner: parseIri(owner.href),
+		publicKey: rsaPublicKey2.publicKey
+	});
+}
+test("getVerifiedKeyOwnerEvidence() only returns promoted evidence", () => {
+	const key = createKey();
+	assert(attachKeyOwnerEvidence(key, document, expires));
+	assertEquals(getVerifiedKeyOwnerEvidence(key), void 0);
+	promoteKeyOwnerEvidence(key);
+	const evidence = getVerifiedKeyOwnerEvidence(key);
+	assertEquals(evidence?.ownerId, getCanonicalPortableId(actorId));
+	assertEquals(evidence?.keyId, keyId.href);
+	assertEquals(evidence?.expires, expires);
+	const other = createKey();
+	promoteKeyOwnerEvidence(other);
+	assertEquals(getVerifiedKeyOwnerEvidence(other), void 0);
+});
+test("attachKeyOwnerEvidence() refuses evidence about other actors", () => {
+	const otherActorId = parseIri(`ap://${did}/actors/bob`);
+	assertFalse(attachKeyOwnerEvidence(createKey(otherActorId), {
+		...document,
+		"@id": otherActorId.href
+	}, expires));
+	assertFalse(attachKeyOwnerEvidence(createKey(), {
+		...document,
+		"@id": `ap://${did}/actors/bob`
+	}, expires));
+	assertFalse(attachKeyOwnerEvidence(createKey(), {
+		...document,
+		"@id": `ap://${did}/x/../actors/alice`
+	}, expires));
+	assertFalse(attachKeyOwnerEvidence(createKey(), {}, expires));
+	assertFalse(attachKeyOwnerEvidence(createKey(), [document], expires));
+});
+test("getVerifiedKeyOwnerEvidence() ignores expired evidence", () => {
+	const key = createKey();
+	attachKeyOwnerEvidence(key, document, expires);
+	promoteKeyOwnerEvidence(key);
+	assert(getVerifiedKeyOwnerEvidence(key, expires.subtract({ seconds: 1 })));
+	assertEquals(getVerifiedKeyOwnerEvidence(key, expires), void 0);
+});
+test("getVerifiedKeyOwnerEvidence() ignores keys changed since", () => {
+	const key = createKey();
+	attachKeyOwnerEvidence(key, document, expires);
+	promoteKeyOwnerEvidence(key);
+	key.clone({}).ownerId.href = parseIri(`ap://${did}/actors/bob`).href;
+	assertEquals(getVerifiedKeyOwnerEvidence(key), void 0);
+	const moved = createKey();
+	attachKeyOwnerEvidence(moved, document, expires);
+	promoteKeyOwnerEvidence(moved);
+	moved.ownerId.href = `https://other.example/.well-known/apgateway/${did}/actors/alice`;
+	assertEquals(getVerifiedKeyOwnerEvidence(moved), void 0);
+	const verified = createKey();
+	attachKeyOwnerEvidence(verified, document, expires);
+	promoteKeyOwnerEvidence(verified);
+	assertEquals(getVerifiedKeyOwnerEvidence(verified.clone({})), void 0);
+});
+test("parseKeyOwnerEvidence() parses a new actor every time", async () => {
+	const key = createKey();
+	const doc = structuredClone(document);
+	attachKeyOwnerEvidence(key, doc, expires);
+	promoteKeyOwnerEvidence(key);
+	doc["@id"] = `ap://${did}/actors/bob`;
+	const evidence = getVerifiedKeyOwnerEvidence(key);
+	const actor = await parseKeyOwnerEvidence(evidence);
+	assert(actor instanceof Person);
+	assertEquals(actor.id?.href, actorId.href);
+	assertEquals(actor.name?.toString(), "Alice");
+	actor.id.href = parseIri(`ap://${did}/actors/bob`).href;
+	assertEquals((await parseKeyOwnerEvidence(evidence))?.id?.href, actorId.href);
+});
+//#endregion
+export {};

package/dist/sig/key.test.mjs

@@ -6,7 +6,7 @@ import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { a as fetchKeyDetailed, c as validateCryptoKey, i as fetchKey, n as exportJwk, o as generateCryptoKeyPair, s as importJwk } from "../key-C6jnekFI.mjs";
+import { a as fetchKeyDetailed, c as validateCryptoKey, i as fetchKey, n as exportJwk, o as generateCryptoKeyPair, s as importJwk } from "../key-gIhVZO3p.mjs";
 import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";

package/dist/sig/ld.test.mjs

@@ -8,8 +8,8 @@ import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { o as generateCryptoKeyPair } from "../key-C6jnekFI.mjs";
-import { a as compactJsonLd, f as isInvalidUrlTypeError, g as verifySignature, h as verifyJsonLd, i as attachSignature, n as UnsafeJsonLdError, o as createSignature, p as signJsonLd, s as detachSignature, u as hasSignatureLike } from "../ld-ya2C1Xip.mjs";
+import { o as generateCryptoKeyPair } from "../key-gIhVZO3p.mjs";
+import { a as compactJsonLd, f as isInvalidUrlTypeError, g as verifySignature, h as verifyJsonLd, i as attachSignature, n as UnsafeJsonLdError, o as createSignature, p as signJsonLd, s as detachSignature, u as hasSignatureLike } from "../ld-BsTkRrwF.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";

package/dist/sig/mod.cjs

@@ -1,7 +1,7 @@
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_http = require("../http-wdsia0-O.cjs");
-const require_portable_collection = require("../portable-collection-C65SwL2l.cjs");
+const require_http = require("../http-5CJBdU8n.cjs");
+const require_portable_collection = require("../portable-collection-CnlCamup.cjs");
 exports.attachSignature = require_http.attachSignature;
 exports.createProof = require_http.createProof;
 exports.createSignature = require_http.createSignature;

package/dist/sig/mod.d.cts

@@ -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-CjezPjFX.cjs";
+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-DC1cqAQ2.cjs";
 import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "../owner-BF0L9cMt.cjs";
-import { C as createSignature, D as verifyJsonLd, E as signJsonLd, O as verifySignature, S as attachSignature, T as hasSignatureLike, _ as verifyProof, a as CreateProofOptions, b as VerifyJsonLdOptions, c as VerifyPortableObjectProofFailureReason, d as VerifyProofOptions, f as createProof, g as verifyPortableObjectProof, h as verifyObject, i as verifyPortableObject, l as VerifyPortableObjectProofOptions, m as signObject, n as VerifyPortableObjectOptions, o as SignObjectOptions, p as hasProofLike, r as VerifyPortableObjectResult, s as VerifyObjectOptions, t as VerifyPortableObjectFailureReason, u as VerifyPortableObjectProofResult, v as CreateSignatureOptions, w as detachSignature, x as VerifySignatureOptions, y as SignJsonLdOptions } from "../mod-S--JxYjo.cjs";
+import { C as createSignature, D as verifyJsonLd, E as signJsonLd, O as verifySignature, S as attachSignature, T as hasSignatureLike, _ as verifyProof, a as CreateProofOptions, b as VerifyJsonLdOptions, c as VerifyPortableObjectProofFailureReason, d as VerifyProofOptions, f as createProof, g as verifyPortableObjectProof, h as verifyObject, i as verifyPortableObject, l as VerifyPortableObjectProofOptions, m as signObject, n as VerifyPortableObjectOptions, o as SignObjectOptions, p as hasProofLike, r as VerifyPortableObjectResult, s as VerifyObjectOptions, t as VerifyPortableObjectFailureReason, u as VerifyPortableObjectProofResult, v as CreateSignatureOptions, w as detachSignature, x as VerifySignatureOptions, y as SignJsonLdOptions } from "../mod-CPPqkyV_.cjs";
 export { AcceptSignatureMember, AcceptSignatureParameters, CreateProofOptions, CreateSignatureOptions, DoesActorOwnKeyOptions, FetchKeyDetailedResult, FetchKeyErrorResult, FetchKeyOptions, FetchKeyResult, FulfillAcceptSignatureResult, GetKeyOwnerOptions, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, Rfc9421SignRequestOptions, SignJsonLdOptions, SignObjectOptions, SignRequestOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyPortableObjectFailureReason, VerifyPortableObjectOptions, VerifyPortableObjectProofFailureReason, VerifyPortableObjectProofOptions, VerifyPortableObjectProofResult, VerifyPortableObjectResult, 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, verifyPortableObject, verifyPortableObjectProof, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

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-C-x_OLSp.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-Cok5-vIC.js";
 import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "../owner-BSzr5-I8.js";
-import { C as createSignature, D as verifyJsonLd, E as signJsonLd, O as verifySignature, S as attachSignature, T as hasSignatureLike, _ as verifyProof, a as CreateProofOptions, b as VerifyJsonLdOptions, c as VerifyPortableObjectProofFailureReason, d as VerifyProofOptions, f as createProof, g as verifyPortableObjectProof, h as verifyObject, i as verifyPortableObject, l as VerifyPortableObjectProofOptions, m as signObject, n as VerifyPortableObjectOptions, o as SignObjectOptions, p as hasProofLike, r as VerifyPortableObjectResult, s as VerifyObjectOptions, t as VerifyPortableObjectFailureReason, u as VerifyPortableObjectProofResult, v as CreateSignatureOptions, w as detachSignature, x as VerifySignatureOptions, y as SignJsonLdOptions } from "../mod-Bz9tFXI2.js";
+import { C as createSignature, D as verifyJsonLd, E as signJsonLd, O as verifySignature, S as attachSignature, T as hasSignatureLike, _ as verifyProof, a as CreateProofOptions, b as VerifyJsonLdOptions, c as VerifyPortableObjectProofFailureReason, d as VerifyProofOptions, f as createProof, g as verifyPortableObjectProof, h as verifyObject, i as verifyPortableObject, l as VerifyPortableObjectProofOptions, m as signObject, n as VerifyPortableObjectOptions, o as SignObjectOptions, p as hasProofLike, r as VerifyPortableObjectResult, s as VerifyObjectOptions, t as VerifyPortableObjectFailureReason, u as VerifyPortableObjectProofResult, v as CreateSignatureOptions, w as detachSignature, x as VerifySignatureOptions, y as SignJsonLdOptions } from "../mod--jv6vyrP.js";
 export { AcceptSignatureMember, AcceptSignatureParameters, CreateProofOptions, CreateSignatureOptions, DoesActorOwnKeyOptions, FetchKeyDetailedResult, FetchKeyErrorResult, FetchKeyOptions, FetchKeyResult, FulfillAcceptSignatureResult, GetKeyOwnerOptions, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, Rfc9421SignRequestOptions, SignJsonLdOptions, SignObjectOptions, SignRequestOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyPortableObjectFailureReason, VerifyPortableObjectOptions, VerifyPortableObjectProofFailureReason, VerifyPortableObjectProofOptions, VerifyPortableObjectProofResult, VerifyPortableObjectResult, 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, verifyPortableObject, 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 hasSignatureLike, B as fetchKey, D as detachSignature, E as createSignature, F as verifyJsonLd, H as generateCryptoKeyPair, I as verifySignature, N as signJsonLd, R as exportJwk, U as importJwk, V as fetchKeyDetailed, _ as verifyPortableObjectProof, a as signRequest, b as verifyProof, dt as fulfillAcceptSignature, f as createProof, ft as parseAcceptSignature, g as verifyObject, m as signObject, o as verifyRequest, p as hasProofLike, pt as validateAcceptSignature, s as verifyRequestDetailed, ut as formatAcceptSignature, w as attachSignature } from "../http-nTZuTacw.js";
-import { n as doesActorOwnKey, r as getKeyOwner, t as verifyPortableObject } from "../portable-collection-B-mU1F1-.js";
+import { A as hasSignatureLike, B as fetchKey, D as detachSignature, E as createSignature, F as verifyJsonLd, H as generateCryptoKeyPair, I as verifySignature, N as signJsonLd, R as exportJwk, U as importJwk, V as fetchKeyDetailed, _ as verifyPortableObjectProof, a as signRequest, b as verifyProof, f as createProof, g as verifyObject, gt as validateAcceptSignature, ht as parseAcceptSignature, m as signObject, mt as fulfillAcceptSignature, o as verifyRequest, p as hasProofLike, pt as formatAcceptSignature, s as verifyRequestDetailed, w as attachSignature } from "../http-BGpexPO7.js";
+import { n as doesActorOwnKey, r as getKeyOwner, t as verifyPortableObject } from "../portable-collection-Bkdh_WpL.js";
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, hasProofLike, hasSignatureLike, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyPortableObject, verifyPortableObjectProof, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

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-C6Nv5yyw.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-D3GoetXS.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-uWj3hfzv.mjs";
+import { t as verifyPortableObject } from "../portable-collection-C60_acmx.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.test.mjs

@@ -2,13 +2,14 @@ import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
-import { i as fetchKey } from "../key-C6jnekFI.mjs";
-import { h as verifyJsonLd, p as signJsonLd } from "../ld-ya2C1Xip.mjs";
-import { d as verifyProof, r as createProof } from "../proof-BdO3BbLh.mjs";
-import { d as verifyRequest, f as verifyRequestDetailed, l as signRequest } from "../http-DV_yW4dv.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 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-C6Nv5yyw.mjs";
-import { t as KvKeyCache } from "../keycache-BInaECGj.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-D3GoetXS.mjs";
+import { t as KvKeyCache } from "../keycache-PiOM9pM0.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";
@@ -965,7 +966,21 @@ test("verifyRequest() tries the gateways of ap: key IDs in order", async () => {
 		documentLoader: many,
 		contextLoader
 	})).verified);
-	deepStrictEqual(many.fetched, gateways.slice(0, 5).map((g) => compatibleId(g)));
+	deepStrictEqual(many.fetched, gateways.slice(0, 3).map((g) => compatibleId(g)));
+	for (const [index, expected] of [[2, true], [3, false]]) {
+		const documentLoader = createLoader({ [compatibleId(gateways[index])]: signed });
+		strictEqual(await verifyRequest(await signedRequest(void 0, hinted(...gateways)), {
+			documentLoader,
+			contextLoader
+		}) != null, expected, `gateway ${index + 1}`);
+		deepStrictEqual(documentLoader.fetched, gateways.slice(0, 3).map((g) => compatibleId(g)), `gateway ${index + 1}`);
+	}
+	const sparse = createLoader({ [compatibleId(gateways[2])]: signed });
+	ok(await verifyRequest(await signedRequest(void 0, hinted("not a gateway", gateways[0], gateways[0].toUpperCase(), "https://gw.example/path", gateways[1], gateways[2])), {
+		documentLoader: sparse,
+		contextLoader
+	}) != null);
+	deepStrictEqual(sparse.fetched, gateways.slice(0, 3).map((g) => compatibleId(g)));
 });
 function failingLoader(responses) {
 	const fetched = [];
@@ -1189,5 +1204,236 @@ test("verifyRequest() does not cache keys at ap: key IDs it could not process",
 	strictEqual((await verifyRequest(await signedRequest(void 0, hintedKeyId), options))?.ownerId?.href, parseIri(actorId).href);
 	strictEqual(documentLoader.fetched.length, 2);
 });
+/**
+* A loader that serves the given responses, and never responds for the URLs
+* in `hanging`.  A hanging response is given up when its signal aborts,
+* unless `ignoreSignal` is set.
+*/
+function controlledLoader(responses, hanging, { ignoreSignal = false, delays = {} } = {}) {
+	const fetched = [];
+	const signals = [];
+	const respond = failingLoader(responses);
+	const loader = async (url, options) => {
+		fetched.push(url);
+		signals.push(options?.signal);
+		const signal = ignoreSignal ? void 0 : options?.signal;
+		const delay = delays[url];
+		if (delay != null) await new Promise((resolve) => setTimeout(resolve, delay));
+		if (hanging.includes(url)) return await new Promise((_, reject) => {
+			signal?.addEventListener("abort", () => reject(signal.reason));
+		});
+		return await respond(url);
+	};
+	return Object.assign(loader, {
+		fetched,
+		signals
+	});
+}
+function isTimeoutError(error) {
+	return error instanceof DOMException && error.name === "TimeoutError";
+}
+test("resolvePortableActorKey() gives up gateways that do not respond in time", async () => {
+	const signed = await sign(await apActorJson());
+	for (const ignoreSignal of [false, true]) {
+		const documentLoader = controlledLoader({ [compatibleId(gw2)]: signed }, [compatibleId(gw1)], { ignoreSignal });
+		const resolution = await resolvePortableActorKey(hinted(gw1, gw2), {
+			documentLoader,
+			contextLoader,
+			lookupTimeout: 50
+		});
+		strictEqual(resolution.type, "unavailable", `ignoreSignal: ${ignoreSignal}`);
+		if (resolution.type === "unavailable") strictEqual(resolution.cacheable, false);
+		deepStrictEqual(documentLoader.fetched, [compatibleId(gw1)]);
+		const [signal] = documentLoader.signals;
+		ok(signal?.aborted);
+		ok(isTimeoutError(signal.reason));
+	}
+});
+test("resolvePortableActorKey() caches timeouts only as failures to fetch", async () => {
+	const invalid = await apActorJson();
+	const cases = [
+		{
+			name: "the only gateway times out",
+			responses: {},
+			hanging: [compatibleId(gw1)],
+			hints: [gw1],
+			cacheable: true
+		},
+		{
+			name: "a gateway responds with 404, and the last one times out",
+			responses: { [compatibleId(gw1)]: 404 },
+			hanging: [compatibleId(gw2)],
+			hints: [gw1, gw2],
+			cacheable: true
+		},
+		{
+			name: "a gateway serves an invalid document, and the last one times out",
+			responses: { [compatibleId(gw1)]: invalid },
+			hanging: [compatibleId(gw2)],
+			hints: [gw1, gw2],
+			cacheable: false
+		},
+		{
+			name: "the document loader cannot resolve the ap: URI in time",
+			responses: {},
+			hanging: [actorId],
+			hints: [],
+			cacheable: true
+		}
+	];
+	for (const { name, responses, hanging, hints, cacheable } of cases) {
+		const documentLoader = controlledLoader(responses, hanging);
+		const resolution = await resolvePortableActorKey(hinted(...hints), {
+			documentLoader,
+			contextLoader,
+			lookupTimeout: 50
+		});
+		strictEqual(resolution.type, "unavailable", name);
+		if (resolution.type !== "unavailable") continue;
+		strictEqual(resolution.cacheable, cacheable, name);
+		ok(!(resolution.error instanceof FetchError), name);
+		if (hanging.length === 1 && hints.length < 2) ok(isTimeoutError(resolution.error), name);
+	}
+});
+test("resolvePortableActorKey() shares one timeout among all gateways", async () => {
+	const documentLoader = controlledLoader({ [compatibleId(gw1)]: 404 }, [compatibleId(gw2)], { delays: { [compatibleId(gw1)]: 250 } });
+	const started = Date.now();
+	const resolution = await resolvePortableActorKey(hinted(gw1, gw2), {
+		documentLoader,
+		contextLoader,
+		lookupTimeout: 300
+	});
+	const elapsed = Date.now() - started;
+	ok(elapsed < 500, `took ${elapsed} ms`);
+	strictEqual(resolution.type, "unavailable");
+	deepStrictEqual(documentLoader.fetched, [compatibleId(gw1), compatibleId(gw2)]);
+	ok(documentLoader.signals[1]?.aborted);
+});
+test("resolvePortableActorKey() bounds loading the contexts of actor documents", async () => {
+	const documentLoader = controlledLoader({ [compatibleId(gw1)]: await sign(await apActorJson()) }, []);
+	const hangingContextLoader = (_url, options) => new Promise((_, reject) => {
+		options?.signal?.addEventListener("abort", () => reject(options.signal.reason));
+	});
+	const resolution = await resolvePortableActorKey(hinted(gw1, gw2), {
+		documentLoader,
+		contextLoader: hangingContextLoader,
+		lookupTimeout: 50
+	});
+	strictEqual(resolution.type, "unavailable");
+	if (resolution.type === "unavailable") strictEqual(resolution.cacheable, false);
+	deepStrictEqual(documentLoader.fetched, [compatibleId(gw1)]);
+});
+test("resolvePortableActorKey() ignores what is resolved after the timeout", async () => {
+	let verifiedLate = () => {};
+	const late = new Promise((resolve) => verifiedLate = resolve);
+	let lookupDone = () => {};
+	const done = new Promise((resolve) => lookupDone = resolve);
+	const slowKeyCache = {
+		async get() {
+			await done;
+		},
+		set() {
+			verifiedLate();
+			return Promise.resolve();
+		}
+	};
+	const documentLoader = controlledLoader({ [compatibleId(gw1)]: await sign(await apActorJson()) }, []);
+	const resolution = await resolvePortableActorKey(hinted(gw1), {
+		documentLoader,
+		contextLoader,
+		keyCache: slowKeyCache,
+		lookupTimeout: 300
+	});
+	lookupDone();
+	strictEqual(resolution.type, "unavailable");
+	if (resolution.type === "unavailable") strictEqual(resolution.cacheable, false);
+	await late;
+	const lateRejection = controlledLoader({}, [], { delays: { [compatibleId(gw1)]: 60 } });
+	strictEqual((await resolvePortableActorKey(hinted(gw1), {
+		documentLoader: lateRejection,
+		contextLoader,
+		lookupTimeout: 20
+	})).type, "unavailable");
+	await new Promise((resolve) => setTimeout(resolve, 80));
+});
+test("resolvePortableActorKey() validates the lookup timeout", async () => {
+	const documentLoader = controlledLoader({}, []);
+	for (const lookupTimeout of [
+		-1,
+		NaN,
+		Infinity,
+		2 ** 31
+	]) {
+		let error;
+		try {
+			await resolvePortableActorKey(hinted(gw1), {
+				documentLoader,
+				contextLoader,
+				lookupTimeout
+			});
+		} catch (e) {
+			error = e;
+		}
+		ok(error instanceof RangeError, String(lookupTimeout));
+	}
+	const resolution = await resolvePortableActorKey(hinted(gw1), {
+		documentLoader,
+		contextLoader,
+		lookupTimeout: 0
+	});
+	strictEqual(resolution.type, "unavailable");
+	if (resolution.type === "unavailable") strictEqual(resolution.cacheable, false);
+	deepStrictEqual(documentLoader.fetched, []);
+});
+test("fetchKeyDetailed() caches keys at ap: key IDs that time out as fetch failures", async () => {
+	const cases = [{
+		responses: { [compatibleId(gw1)]: 404 },
+		hanging: [compatibleId(gw2)],
+		cached: true
+	}, {
+		responses: {},
+		hanging: [compatibleId(gw1)],
+		cached: false
+	}];
+	for (const { responses, hanging, cached } of cases) {
+		const documentLoader = controlledLoader(responses, hanging);
+		const keyCache = new KvKeyCache(new MemoryKvStore(), ["pk"]);
+		const options = {
+			documentLoader,
+			contextLoader,
+			keyCache,
+			portableKeyResolvers: {
+				gatewayKey: () => Promise.resolve({ type: "legacy" }),
+				actorKey: (keyId) => resolvePortableActorKey(keyId, {
+					documentLoader,
+					contextLoader,
+					lookupTimeout: 50
+				})
+			}
+		};
+		const hintedKeyId = hinted(gw1, gw2);
+		for (let i = 0; i < 2; i++) {
+			const result = await fetchKeyDetailed(hintedKeyId, CryptographicKey, options);
+			strictEqual(result.key, null);
+			strictEqual(result.cached, cached && i > 0, `${cached}, ${i}`);
+			ok(result.fetchError == null || !("status" in result.fetchError), "a timeout has no HTTP status");
+		}
+		strictEqual(documentLoader.fetched.filter((url) => url === compatibleId(gw1)).length, cached ? 1 : 2);
+	}
+});
+test("verifyRequestDetailed() reports keys at ap: key IDs that time out as fetch errors", async () => {
+	const timeout = new DOMException("Timed out", "TimeoutError");
+	const documentLoader = () => Promise.reject(timeout);
+	for (const spec of specs) {
+		const result = await verifyRequestDetailed(await signedRequest(spec, hinted(gw1)), {
+			documentLoader,
+			contextLoader,
+			spec
+		});
+		ok(!result.verified, spec);
+		strictEqual(result.reason.type, "keyFetchError", spec);
+		if (result.reason.type === "keyFetchError") ok(!("status" in result.reason.result), spec);
+	}
+});
 //#endregion
 export {};

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-BdO3BbLh.mjs";
-import { d as verifyRequest } from "../http-DV_yW4dv.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 { 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-C5p26tpa.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-CghLH7Zi.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-CbPfRGZq.mjs → temporal-oRKP803M.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { c as getNormalizationContextLoader } from "./ld-ya2C1Xip.mjs";
+import { c as getNormalizationContextLoader } from "./ld-BsTkRrwF.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-Bdwd_Gg8.mjs";
+import { o as createFederation } from "../middleware-Coqgp-K0.mjs";
 //#region src/testing/kv.test.ts
 test("ManualClockKvStore keeps an entry at its exact expiration instant", async () => {
 	const kv = new ManualClockKvStore();

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-DV_yW4dv.mjs";
+import { d as verifyRequest } from "../http-Bd6rZlJX.mjs";
 import { i as rsaPrivateKey2 } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-C5p26tpa.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-CghLH7Zi.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";

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-Bxm0a0Ww.mjs";
+import { n as kvCache, t as MockKvStore } from "../kv-cache-D0qjSeWY.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-BHNtQi9e.cjs");
+const require_kv_cache = require("../kv-cache-YRi_g8GB.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-Mt4aO3DX.cjs";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-BA_F2x53.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-DaiBrWDW.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-B5z_q9TH.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-DhIl9YlV.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-iR55fqlk.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.4.0-dev.2159+bb072eda",
+  "version": "2.4.0-dev.2169+0a45df07",
   "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.2159+bb072eda",
-    "@fedify/uri-template": "2.4.0-dev.2159+bb072eda",
-    "@fedify/vocab-runtime": "2.4.0-dev.2159+bb072eda",
-    "@fedify/webfinger": "2.4.0-dev.2159+bb072eda"
+    "@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"
   },
   "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/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.4.0-dev.2159+bb072eda"
+    "@fedify/vocab-tools": "^2.4.0-dev.2169+0a45df07",
+    "@fedify/fixture": "2.0.0"
   },
   "scripts": {
     "build:self": "tsdown",