@fedify/fedify 2.4.0-dev.2157 → 2.4.0-dev.2164

package/dist/{http-Dgtt45-K.js → http-Baovr6xq.js}

@@ -14,7 +14,7 @@ import serialize from "json-canon";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.2157+b76e5888";
+var version = "2.4.0-dev.2164+db2b8571";
 //#endregion
 //#region src/sig/portable-key-id.ts
 const COMPATIBLE_KEY_ID_PATH_PATTERN = /^\/\.well-known\/apgateway\/did(?::|%3A)/i;
@@ -1181,6 +1181,108 @@ function getDurationMs(start) {
 	return Math.max(0, performance.now() - start);
 }
 //#endregion
+//#region src/sig/key-owner-evidence.ts
+/**
+* How long a key of an [FEP-ef61] portable actor is trusted after its actor's
+* signed document vouched for it, however long the proof of the document is
+* valid.  The actor can drop the key or the gateway from its document at any
+* time, so the key is looked up again at least this often.
+*
+* [FEP-ef61]: https://w3id.org/fep/ef61
+* @internal
+*/
+const MAX_PORTABLE_KEY_TTL = Temporal.Duration.from({ hours: 1 });
+const candidates = /* @__PURE__ */ new WeakMap();
+const verified = /* @__PURE__ */ new WeakMap();
+/**
+* Attaches to a key that was just resolved the evidence of the portable actor
+* that owns it.  The evidence is not used until the key verifies
+* a signature; see {@link promoteKeyOwnerEvidence}.
+*
+* Nothing is attached unless the document, the key's owner, and the actor
+* the key ID belongs to agree on the actor's canonical portable ID.
+* @param key The key, whose owner the document vouched for.
+* @param document The expanded root node of the actor's verified document.
+* @param expires When the evidence must not be used anymore.
+* @returns Whether the evidence was attached.
+* @internal
+*/
+function attachKeyOwnerEvidence(key, document, expires) {
+	if (!(key instanceof CryptographicKey) || key.id == null || key.ownerId == null || key.publicKey == null || document == null || typeof document !== "object" || Array.isArray(document)) return false;
+	const rawId = document["@id"];
+	if (typeof rawId !== "string") return false;
+	const keyBase = new URL(key.id.href);
+	keyBase.hash = "";
+	const ownerId = getCanonicalPortableId(key.ownerId);
+	if (ownerId == null || getRawCanonicalPortableId(rawId) !== ownerId || getCanonicalPortableId(keyBase) !== ownerId) return false;
+	candidates.set(key, {
+		keyId: key.id.href,
+		keyOwner: key.ownerId.href,
+		publicKey: key.publicKey,
+		ownerId,
+		document: structuredClone(document),
+		expires
+	});
+	return true;
+}
+/**
+* Makes the evidence attached to a key usable, as the key has just verified
+* an HTTP Signature.  Nothing happens if the key has no evidence.
+* @param key The key that verified a signature.
+* @internal
+*/
+function promoteKeyOwnerEvidence(key) {
+	const evidence = candidates.get(key);
+	if (evidence == null) return;
+	candidates.delete(key);
+	verified.set(key, evidence);
+}
+/**
+* Gets the evidence of the portable actor that owns a key HTTP Signature
+* verification returned.
+* @param key The key.
+* @param now The current time.
+* @returns The evidence, or `undefined` if the key was not returned by HTTP
+*          Signature verification, if it has no evidence, if the evidence
+*          expired, or if the key has been changed since.
+* @internal
+*/
+function getVerifiedKeyOwnerEvidence(key, now = Temporal.Now.instant()) {
+	const evidence = verified.get(key);
+	if (evidence == null) return void 0;
+	if (Temporal.Instant.compare(now, evidence.expires) >= 0) {
+		verified.delete(key);
+		return;
+	}
+	if (key.id?.href !== evidence.keyId || key.ownerId?.href !== evidence.keyOwner || key.publicKey !== evidence.publicKey) return;
+	return evidence;
+}
+/**
+* Parses the actor from the evidence, i.e., from the expansion of its
+* document whose proof was verified.  Every call returns a new object.
+* @param evidence The evidence.
+* @param options Options for parsing the document.
+* @returns The actor, or `null` if the document is not the actor that
+*          the evidence is about, or the evidence expired meanwhile.
+* @internal
+*/
+async function parseKeyOwnerEvidence(evidence, options = {}) {
+	const refuse = (url) => Promise.reject(/* @__PURE__ */ new Error(`Refusing to fetch ${url}.`));
+	let actor;
+	try {
+		actor = await Object$1.fromJsonLd(structuredClone(evidence.document), {
+			documentLoader: refuse,
+			contextLoader: options.contextLoader,
+			tracerProvider: options.tracerProvider
+		});
+	} catch (error) {
+		if (!(error instanceof TypeError)) throw error;
+		return null;
+	}
+	if (!isPortableActorDocument(actor) || getCanonicalPortableId(actor.id) !== evidence.ownerId || Temporal.Instant.compare(Temporal.Now.instant(), evidence.expires) >= 0) return null;
+	return actor;
+}
+//#endregion
 //#region src/sig/key.ts
 /**
 * Checks if the given key is valid and supported.  No-op if the key is valid,
@@ -1403,6 +1505,7 @@ function bypassKeyCacheReads(keyCache) {
 		const scoped = cache.compatibleKeyScope(scope);
 		return {
 			get: () => Promise.resolve(void 0),
+			getEntry: () => Promise.resolve(void 0),
 			set: async (keyId, key, options) => await scoped.set(keyId, key, options),
 			delete: async (keyId) => await scoped.delete(keyId)
 		};
@@ -1570,6 +1673,49 @@ function checkCachedKeyHit(cachedKey, keyId, cls, logger) {
 	}
 	return null;
 }
+/**
+* Looks up a key at a compatible identifier, or at an `ap:` or `ap+ef61:`
+* URI, in the cache namespace of a purpose, like {@link getCachedFetchKey}.
+* A key that the verified document of its portable actor was cached with
+* gets the actor's evidence attached from the same entry; see
+* {@link attachKeyOwnerEvidence}.
+*/
+async function getCachedCompatibleKey(cacheKey, keyId, cls, scopedCache, logger) {
+	if (scopedCache?.getEntry == null) return await getCachedFetchKey(cacheKey, keyId, cls, scopedCache, logger);
+	const entry = await scopedCache.getEntry(cacheKey);
+	if (entry === void 0) return null;
+	if (entry === null) {
+		logger.debug("Entry {keyId} found in cache, but it is unavailable.", { keyId });
+		return {
+			key: null,
+			cached: true
+		};
+	}
+	const hit = checkCachedKeyHit(entry.key, keyId, cls, logger);
+	if (hit?.key instanceof CryptographicKey && entry.owner != null) attachKeyOwnerEvidence(hit.key, entry.owner, entry.expires);
+	return hit;
+}
+/**
+* Attaches the evidence of the portable actor whose document has just
+* vouched for a key to the key.  The evidence expires with the cache entry
+* of the key, so that it is never trusted longer than the key is cached.
+* Without a cache, it expires with the proof of the document, but no later
+* than {@link MAX_PORTABLE_KEY_TTL}, as a cache entry would.
+* @param resolution The resolution of the key.
+* @param scopedCache The cache namespace the key was stored in, if any.
+* @param cached When the cache entry expires, if the cache stored one.
+*/
+function attachResolvedKeyOwnerEvidence(resolution, scopedCache, cached) {
+	let expires;
+	if (scopedCache != null) {
+		if (cached == null) return;
+		expires = cached;
+	} else {
+		expires = Temporal.Now.instant().add(MAX_PORTABLE_KEY_TTL);
+		if (resolution.expires != null && Temporal.Instant.compare(resolution.expires, expires) < 0) expires = resolution.expires;
+	}
+	attachKeyOwnerEvidence(resolution.key, resolution.document, expires);
+}
 async function clearFetchErrorMetadata(keyId, keyCache) {
 	await keyCache?.setFetchError?.(keyId, null);
 }
@@ -1694,7 +1840,10 @@ async function resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, {
 				cached: false
 			};
 		}
-		await scopedCache?.set(cacheKey, resolution.key, { expires: resolution.expires });
+		attachResolvedKeyOwnerEvidence(resolution, scopedCache, await scopedCache?.set(cacheKey, resolution.key, {
+			expires: resolution.expires,
+			owner: resolution.document
+		}));
 		return {
 			key: resolution.key,
 			cached: false
@@ -1915,7 +2064,7 @@ async function fetchCompatibleKey(cacheKey, cls, options, onCachedUnavailable, o
 	const keyId = cacheKey.href;
 	const sharedCache = options.keyCache;
 	const scopedCache = sharedCache?.compatibleKeyScope?.(getCompatibleKeyScope(cls, options));
-	const cached = await getCachedFetchKey(cacheKey, keyId, cls, scopedCache, logger);
+	const cached = await getCachedCompatibleKey(cacheKey, keyId, cls, scopedCache, logger);
 	if (cached != null) return {
 		result: cached,
 		outcome: { result: "hit" }
@@ -1979,7 +2128,7 @@ async function fetchPortableActorKey(cacheKey, cls, options, onCachedUnavailable
 	}
 	const sharedCache = options.keyCache;
 	const scopedCache = sharedCache?.compatibleKeyScope?.("httpSignature");
-	const cached = await getCachedFetchKey(cacheKey, keyId, cls, scopedCache, logger);
+	const cached = await getCachedCompatibleKey(cacheKey, keyId, cls, scopedCache, logger);
 	if (cached != null) return {
 		result: cached,
 		outcome: { result: "hit" }
@@ -1994,7 +2143,10 @@ async function fetchPortableActorKey(cacheKey, cls, options, onCachedUnavailable
 	logger.debug("Resolving key {keyId} to verify signature...", { keyId });
 	const resolution = await resolvers.actorKey(cacheKey);
 	if (resolution.type === "verified") {
-		await scopedCache?.set(cacheKey, resolution.key, { expires: resolution.expires });
+		attachResolvedKeyOwnerEvidence(resolution, scopedCache, await scopedCache?.set(cacheKey, resolution.key, {
+			expires: resolution.expires,
+			owner: resolution.document
+		}));
 		return {
 			result: {
 				key: resolution.key,
@@ -4334,6 +4486,7 @@ async function verifyPortableKeyDocument(document, actor, keyId, isGatewayKey, o
 		type: "verified",
 		actor,
 		key,
+		document: root,
 		...expires == null ? {} : { expires }
 	};
 }
@@ -5010,7 +5163,8 @@ async function verifyRequestDetailed(request, options = {}) {
 			if (spec === "rfc9421") result = await verifyRequestRfc9421(request, span, metricsContext, options);
 			else result = await verifyRequestDraft(request, span, metricsContext, options);
 			recordVerificationResult(span, result);
-			if (!result.verified) span.setStatus({ code: SpanStatusCode.ERROR });
+			if (result.verified) promoteKeyOwnerEvidence(result.key);
+			else span.setStatus({ code: SpanStatusCode.ERROR });
 			return result;
 		} catch (error) {
 			threw = true;
@@ -5721,4 +5875,4 @@ function timingSafeEqual(a, b) {
 	return result === 0;
 }
 //#endregion
-export { recordCollectionPageItems as $, hasSignatureLike as A, fetchKey as B, assertSafeJsonLd as C, isSamePublicKey as Ct, detachSignature as D, createSignature as E, verifyJsonLd as F, verifyKeyOwnership as G, generateCryptoKeyPair as H, verifySignature as I, getRemoteHost as J, getDurationMs as K, wrapContextLoaderForJsonLd as L, isInvalidUrlTypeError as M, signJsonLd as N, getNormalizationContextLoader as O, verifyCompactJsonLd as P, recordCollectionDispatchDuration as Q, exportJwk as R, InvalidContextReferenceError as S, isPortableUri as St, compactJsonLd as T, version as Tt, importJwk as U, fetchKeyDetailed as V, validateCryptoKey as W, isAbortError$1 as X, instrumentDocumentLoader as Y, recordCircuitBreakerStateChange as Z, verifyPortableObjectProof as _, getRawCanonicalPortableId as _t, signRequest as a, recordOutboxActivity as at, verifyProof as b, isPortableId as bt, fetchPortableGatewayKey as c, registerQueueDepthGauge as ct, classifyFep2277CoreType as d, fulfillAcceptSignature as dt, recordCollectionRequest as et, createProof as f, parseAcceptSignature as ft, verifyObject as g, getPortableDid as gt, verifyMapLocalProof as h, getGatewayKeyBase as ht, selectRequestSignature as i, recordInboxActivity as it, isClearlyMalformedContextReference as j, hasSignature as k, resolvePortableActorKey as l, preloadedOnlyDocumentLoader as lt, signObject as m, getCanonicalPortableId as mt, listRequestSignatures as n, recordDocumentCache as nt, verifyRequest as o, recordOutboxEnqueue as ot, hasProofLike as p, validateAcceptSignature as pt, getFederationMetrics as q, parseRfc9421SignatureInput as r, recordFanoutRecipients as rt, verifyRequestDetailed as s, recordWebFingerHandle as st, doubleKnock as t, recordCollectionTotalItems as tt, InvalidPortableObjectIdError as u, formatAcceptSignature as ut, verifyPortableObjectProofPolicy as v, hasPortableActor as vt, attachSignature as w, name as wt, normalizeOutgoingActivityJsonLd as x, isPortableKeyId as xt, verifyPortableObjectProofWithRoot as y, isCompatibleKeyId as yt, fetchActorDocument as z };
+export { isAbortError$1 as $, hasSignatureLike as A, fetchKey as B, assertSafeJsonLd as C, isPortableId as Ct, detachSignature as D, name as Dt, createSignature as E, isSamePublicKey as Et, verifyJsonLd as F, verifyKeyOwnership as G, generateCryptoKeyPair as H, verifySignature as I, parseKeyOwnerEvidence as J, MAX_PORTABLE_KEY_TTL as K, wrapContextLoaderForJsonLd as L, isInvalidUrlTypeError as M, signJsonLd as N, getNormalizationContextLoader as O, version as Ot, verifyCompactJsonLd as P, instrumentDocumentLoader as Q, exportJwk as R, InvalidContextReferenceError as S, isCompatibleKeyId as St, compactJsonLd as T, isPortableUri as Tt, importJwk as U, fetchKeyDetailed as V, validateCryptoKey as W, getFederationMetrics as X, getDurationMs as Y, getRemoteHost as Z, verifyPortableObjectProof as _, getCanonicalPortableId as _t, signRequest as a, recordDocumentCache as at, verifyProof as b, getRawCanonicalPortableId as bt, fetchPortableGatewayKey as c, recordOutboxActivity as ct, classifyFep2277CoreType as d, registerQueueDepthGauge as dt, recordCircuitBreakerStateChange as et, createProof as f, preloadedOnlyDocumentLoader as ft, verifyObject as g, validateAcceptSignature as gt, verifyMapLocalProof as h, parseAcceptSignature as ht, selectRequestSignature as i, recordCollectionTotalItems as it, isClearlyMalformedContextReference as j, hasSignature as k, resolvePortableActorKey as l, recordOutboxEnqueue as lt, signObject as m, fulfillAcceptSignature as mt, listRequestSignatures as n, recordCollectionPageItems as nt, verifyRequest as o, recordFanoutRecipients as ot, hasProofLike as p, formatAcceptSignature as pt, getVerifiedKeyOwnerEvidence as q, parseRfc9421SignatureInput as r, recordCollectionRequest as rt, verifyRequestDetailed as s, recordInboxActivity as st, doubleKnock as t, recordCollectionDispatchDuration as tt, InvalidPortableObjectIdError as u, recordWebFingerHandle as ut, verifyPortableObjectProofPolicy as v, getGatewayKeyBase as vt, attachSignature as w, isPortableKeyId as wt, normalizeOutgoingActivityJsonLd as x, hasPortableActor as xt, verifyPortableObjectProofWithRoot as y, getPortableDid as yt, fetchActorDocument as z };

package/dist/{http-CjezPjFX.d.cts → http-Cok5-vIC.d.ts}

@@ -1,7 +1,7 @@
 /// <reference lib="esnext.temporal" />
 import { Actor, CryptographicKey, Multikey } from "@fedify/vocab";
-import { DocumentLoader } from "@fedify/vocab-runtime";
 import { MeterProvider, TracerProvider } from "@opentelemetry/api";
+import { DocumentLoader } from "@fedify/vocab-runtime";
 
 //#region src/sig/portable-key.d.ts
 /**
@@ -24,6 +24,11 @@ type PortableGatewayKeyResolution = {
     publicKey: CryptoKey;
   };
   /**
+  * The expanded root node of the actor's document whose proof was
+  * verified, from which {@link actor} was parsed.
+  */
+  readonly document: Record<string, unknown>;
+  /**
   * When the proof of the actor's document expires, if it does.  The
   * document does not vouch for the key after that.
   */

package/dist/{http-C-x_OLSp.d.ts → http-DC1cqAQ2.d.cts}

@@ -1,7 +1,7 @@
 /// <reference lib="esnext.temporal" />
 import { Actor, CryptographicKey, Multikey } from "@fedify/vocab";
-import { MeterProvider, TracerProvider } from "@opentelemetry/api";
 import { DocumentLoader } from "@fedify/vocab-runtime";
+import { MeterProvider, TracerProvider } from "@opentelemetry/api";
 
 //#region src/sig/portable-key.d.ts
 /**
@@ -24,6 +24,11 @@ type PortableGatewayKeyResolution = {
     publicKey: CryptoKey;
   };
   /**
+  * The expanded root node of the actor's document whose proof was
+  * verified, from which {@link actor} was parsed.
+  */
+  readonly document: Record<string, unknown>;
+  /**
   * When the proof of the actor's document expires, if it does.  The
   * document does not vouch for the key after that.
   */

package/dist/{http-CGcLv8rh.mjs → http-DRH0n8TD.mjs}

@@ -1,12 +1,13 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-D1gcWWqB.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-B41pRPfd.mjs";
+import { n as version, t as name } from "./deno-CizGaYeG.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-CFBEehTc.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CPVqki78.mjs";
 import { f as parseKeyIdString } from "./portable-key-id-Bg259c4Z.mjs";
-import { a as fetchKeyDetailed, c as validateCryptoKey, t as bypassKeyCacheReads } from "./key-CPM4r6tP.mjs";
-import { n as resolvePortableActorKey, r as verifyPortableGatewayKeyDocument } from "./portable-key-D8uWZF7b.mjs";
+import { a as promoteKeyOwnerEvidence } from "./key-owner-evidence-Bo3yaeL5.mjs";
+import { a as fetchKeyDetailed, c as validateCryptoKey, t as bypassKeyCacheReads } from "./key-D5awqp7u.mjs";
+import { n as resolvePortableActorKey, r as verifyPortableGatewayKeyDocument } from "./portable-key-Bv1RdQ0n.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
@@ -474,7 +475,8 @@ async function verifyRequestDetailed(request, options = {}) {
 			if (spec === "rfc9421") result = await verifyRequestRfc9421(request, span, metricsContext, options);
 			else result = await verifyRequestDraft(request, span, metricsContext, options);
 			recordVerificationResult(span, result);
-			if (!result.verified) span.setStatus({ code: SpanStatusCode.ERROR });
+			if (result.verified) promoteKeyOwnerEvidence(result.key);
+			else span.setStatus({ code: SpanStatusCode.ERROR });
 			return result;
 		} catch (error) {
 			threw = true;

package/dist/{http-BObQoB0j.cjs → http-R4g1McwE.cjs}

@@ -16,7 +16,7 @@ json_canon = require_rolldown_runtime.__toESM(json_canon, 1);
 let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conventions");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.2157+b76e5888";
+var version = "2.4.0-dev.2164+db2b8571";
 //#endregion
 //#region src/sig/portable-key-id.ts
 const COMPATIBLE_KEY_ID_PATH_PATTERN = /^\/\.well-known\/apgateway\/did(?::|%3A)/i;
@@ -3760,7 +3760,7 @@ const Now = /*@__PURE__*/ Object.defineProperties({}, {
 		}
 	})
 });
-const Temporal$3 = /*@__PURE__*/ Object.defineProperties({}, {
+const Temporal$5 = /*@__PURE__*/ Object.defineProperties({}, {
 	...createStringTagDescriptors("Temporal"),
 	...createPropDescriptors({
 		PlainYearMonth,
@@ -3776,7 +3776,7 @@ const Temporal$3 = /*@__PURE__*/ Object.defineProperties({}, {
 });
 //#endregion
 //#region ../../node_modules/.pnpm/temporal-polyfill@1.0.1/node_modules/temporal-polyfill/index.js
-const Temporal$2 = NativeTemporal || Temporal$3;
+const Temporal$4 = NativeTemporal || Temporal$5;
 NativeTemporal && Date.prototype.toTemporalInstant;
 //#endregion
 //#region src/sig/accept.ts
@@ -4747,7 +4747,111 @@ function getDurationMs(start) {
 	return Math.max(0, performance.now() - start);
 }
 //#endregion
+//#region src/sig/key-owner-evidence.ts
+const Temporal$3 = Temporal$4;
+/**
+* How long a key of an [FEP-ef61] portable actor is trusted after its actor's
+* signed document vouched for it, however long the proof of the document is
+* valid.  The actor can drop the key or the gateway from its document at any
+* time, so the key is looked up again at least this often.
+*
+* [FEP-ef61]: https://w3id.org/fep/ef61
+* @internal
+*/
+const MAX_PORTABLE_KEY_TTL = Temporal$3.Duration.from({ hours: 1 });
+const candidates = /* @__PURE__ */ new WeakMap();
+const verified = /* @__PURE__ */ new WeakMap();
+/**
+* Attaches to a key that was just resolved the evidence of the portable actor
+* that owns it.  The evidence is not used until the key verifies
+* a signature; see {@link promoteKeyOwnerEvidence}.
+*
+* Nothing is attached unless the document, the key's owner, and the actor
+* the key ID belongs to agree on the actor's canonical portable ID.
+* @param key The key, whose owner the document vouched for.
+* @param document The expanded root node of the actor's verified document.
+* @param expires When the evidence must not be used anymore.
+* @returns Whether the evidence was attached.
+* @internal
+*/
+function attachKeyOwnerEvidence(key, document, expires) {
+	if (!(key instanceof _fedify_vocab.CryptographicKey) || key.id == null || key.ownerId == null || key.publicKey == null || document == null || typeof document !== "object" || Array.isArray(document)) return false;
+	const rawId = document["@id"];
+	if (typeof rawId !== "string") return false;
+	const keyBase = new URL(key.id.href);
+	keyBase.hash = "";
+	const ownerId = getCanonicalPortableId(key.ownerId);
+	if (ownerId == null || getRawCanonicalPortableId(rawId) !== ownerId || getCanonicalPortableId(keyBase) !== ownerId) return false;
+	candidates.set(key, {
+		keyId: key.id.href,
+		keyOwner: key.ownerId.href,
+		publicKey: key.publicKey,
+		ownerId,
+		document: structuredClone(document),
+		expires
+	});
+	return true;
+}
+/**
+* Makes the evidence attached to a key usable, as the key has just verified
+* an HTTP Signature.  Nothing happens if the key has no evidence.
+* @param key The key that verified a signature.
+* @internal
+*/
+function promoteKeyOwnerEvidence(key) {
+	const evidence = candidates.get(key);
+	if (evidence == null) return;
+	candidates.delete(key);
+	verified.set(key, evidence);
+}
+/**
+* Gets the evidence of the portable actor that owns a key HTTP Signature
+* verification returned.
+* @param key The key.
+* @param now The current time.
+* @returns The evidence, or `undefined` if the key was not returned by HTTP
+*          Signature verification, if it has no evidence, if the evidence
+*          expired, or if the key has been changed since.
+* @internal
+*/
+function getVerifiedKeyOwnerEvidence(key, now = Temporal$3.Now.instant()) {
+	const evidence = verified.get(key);
+	if (evidence == null) return void 0;
+	if (Temporal$3.Instant.compare(now, evidence.expires) >= 0) {
+		verified.delete(key);
+		return;
+	}
+	if (key.id?.href !== evidence.keyId || key.ownerId?.href !== evidence.keyOwner || key.publicKey !== evidence.publicKey) return;
+	return evidence;
+}
+/**
+* Parses the actor from the evidence, i.e., from the expansion of its
+* document whose proof was verified.  Every call returns a new object.
+* @param evidence The evidence.
+* @param options Options for parsing the document.
+* @returns The actor, or `null` if the document is not the actor that
+*          the evidence is about, or the evidence expired meanwhile.
+* @internal
+*/
+async function parseKeyOwnerEvidence(evidence, options = {}) {
+	const refuse = (url) => Promise.reject(/* @__PURE__ */ new Error(`Refusing to fetch ${url}.`));
+	let actor;
+	try {
+		actor = await _fedify_vocab.Object.fromJsonLd(structuredClone(evidence.document), {
+			documentLoader: refuse,
+			contextLoader: options.contextLoader,
+			tracerProvider: options.tracerProvider
+		});
+	} catch (error) {
+		if (!(error instanceof TypeError)) throw error;
+		return null;
+	}
+	if (!isPortableActorDocument(actor) || getCanonicalPortableId(actor.id) !== evidence.ownerId || Temporal$3.Instant.compare(Temporal$3.Now.instant(), evidence.expires) >= 0) return null;
+	return actor;
+}
+//#endregion
 //#region src/sig/key.ts
+const Temporal$2 = Temporal$4;
 /**
 * Checks if the given key is valid and supported.  No-op if the key is valid,
 * otherwise throws an error.
@@ -4969,6 +5073,7 @@ function bypassKeyCacheReads(keyCache) {
 		const scoped = cache.compatibleKeyScope(scope);
 		return {
 			get: () => Promise.resolve(void 0),
+			getEntry: () => Promise.resolve(void 0),
 			set: async (keyId, key, options) => await scoped.set(keyId, key, options),
 			delete: async (keyId) => await scoped.delete(keyId)
 		};
@@ -5136,6 +5241,49 @@ function checkCachedKeyHit(cachedKey, keyId, cls, logger) {
 	}
 	return null;
 }
+/**
+* Looks up a key at a compatible identifier, or at an `ap:` or `ap+ef61:`
+* URI, in the cache namespace of a purpose, like {@link getCachedFetchKey}.
+* A key that the verified document of its portable actor was cached with
+* gets the actor's evidence attached from the same entry; see
+* {@link attachKeyOwnerEvidence}.
+*/
+async function getCachedCompatibleKey(cacheKey, keyId, cls, scopedCache, logger) {
+	if (scopedCache?.getEntry == null) return await getCachedFetchKey(cacheKey, keyId, cls, scopedCache, logger);
+	const entry = await scopedCache.getEntry(cacheKey);
+	if (entry === void 0) return null;
+	if (entry === null) {
+		logger.debug("Entry {keyId} found in cache, but it is unavailable.", { keyId });
+		return {
+			key: null,
+			cached: true
+		};
+	}
+	const hit = checkCachedKeyHit(entry.key, keyId, cls, logger);
+	if (hit?.key instanceof _fedify_vocab.CryptographicKey && entry.owner != null) attachKeyOwnerEvidence(hit.key, entry.owner, entry.expires);
+	return hit;
+}
+/**
+* Attaches the evidence of the portable actor whose document has just
+* vouched for a key to the key.  The evidence expires with the cache entry
+* of the key, so that it is never trusted longer than the key is cached.
+* Without a cache, it expires with the proof of the document, but no later
+* than {@link MAX_PORTABLE_KEY_TTL}, as a cache entry would.
+* @param resolution The resolution of the key.
+* @param scopedCache The cache namespace the key was stored in, if any.
+* @param cached When the cache entry expires, if the cache stored one.
+*/
+function attachResolvedKeyOwnerEvidence(resolution, scopedCache, cached) {
+	let expires;
+	if (scopedCache != null) {
+		if (cached == null) return;
+		expires = cached;
+	} else {
+		expires = Temporal$2.Now.instant().add(MAX_PORTABLE_KEY_TTL);
+		if (resolution.expires != null && Temporal$2.Instant.compare(resolution.expires, expires) < 0) expires = resolution.expires;
+	}
+	attachKeyOwnerEvidence(resolution.key, resolution.document, expires);
+}
 async function clearFetchErrorMetadata(keyId, keyCache) {
 	await keyCache?.setFetchError?.(keyId, null);
 }
@@ -5260,7 +5408,10 @@ async function resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, {
 				cached: false
 			};
 		}
-		await scopedCache?.set(cacheKey, resolution.key, { expires: resolution.expires });
+		attachResolvedKeyOwnerEvidence(resolution, scopedCache, await scopedCache?.set(cacheKey, resolution.key, {
+			expires: resolution.expires,
+			owner: resolution.document
+		}));
 		return {
 			key: resolution.key,
 			cached: false
@@ -5481,7 +5632,7 @@ async function fetchCompatibleKey(cacheKey, cls, options, onCachedUnavailable, o
 	const keyId = cacheKey.href;
 	const sharedCache = options.keyCache;
 	const scopedCache = sharedCache?.compatibleKeyScope?.(getCompatibleKeyScope(cls, options));
-	const cached = await getCachedFetchKey(cacheKey, keyId, cls, scopedCache, logger);
+	const cached = await getCachedCompatibleKey(cacheKey, keyId, cls, scopedCache, logger);
 	if (cached != null) return {
 		result: cached,
 		outcome: { result: "hit" }
@@ -5545,7 +5696,7 @@ async function fetchPortableActorKey(cacheKey, cls, options, onCachedUnavailable
 	}
 	const sharedCache = options.keyCache;
 	const scopedCache = sharedCache?.compatibleKeyScope?.("httpSignature");
-	const cached = await getCachedFetchKey(cacheKey, keyId, cls, scopedCache, logger);
+	const cached = await getCachedCompatibleKey(cacheKey, keyId, cls, scopedCache, logger);
 	if (cached != null) return {
 		result: cached,
 		outcome: { result: "hit" }
@@ -5560,7 +5711,10 @@ async function fetchPortableActorKey(cacheKey, cls, options, onCachedUnavailable
 	logger.debug("Resolving key {keyId} to verify signature...", { keyId });
 	const resolution = await resolvers.actorKey(cacheKey);
 	if (resolution.type === "verified") {
-		await scopedCache?.set(cacheKey, resolution.key, { expires: resolution.expires });
+		attachResolvedKeyOwnerEvidence(resolution, scopedCache, await scopedCache?.set(cacheKey, resolution.key, {
+			expires: resolution.expires,
+			owner: resolution.document
+		}));
 		return {
 			result: {
 				key: resolution.key,
@@ -6615,7 +6769,7 @@ async function normalizeOutgoingActivityJsonLd(jsonLd, contextLoader, options =
 }
 //#endregion
 //#region src/sig/proof.ts
-const Temporal$1 = Temporal$2;
+const Temporal$1 = Temporal$4;
 /**
 * Known Object Integrity Proof `cryptosuite` values, used to keep
 * `object_integrity_proofs.cryptosuite` on a bounded set of spec-defined
@@ -7901,6 +8055,7 @@ async function verifyPortableKeyDocument(document, actor, keyId, isGatewayKey, o
 		type: "verified",
 		actor,
 		key,
+		document: root,
 		...expires == null ? {} : { expires }
 	};
 }
@@ -8119,7 +8274,7 @@ function isReference(node) {
 }
 //#endregion
 //#region src/sig/http.ts
-const Temporal = Temporal$2;
+const Temporal = Temporal$4;
 const DEFAULT_MAX_REDIRECTION = 20;
 const DOUBLE_KNOCK_TRANSPORT_RETRY_DELAY_MS = 100;
 /**
@@ -8578,7 +8733,8 @@ async function verifyRequestDetailed(request, options = {}) {
 			if (spec === "rfc9421") result = await verifyRequestRfc9421(request, span, metricsContext, options);
 			else result = await verifyRequestDraft(request, span, metricsContext, options);
 			recordVerificationResult(span, result);
-			if (!result.verified) span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
+			if (result.verified) promoteKeyOwnerEvidence(result.key);
+			else span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
 			return result;
 		} catch (error) {
 			threw = true;
@@ -9301,10 +9457,16 @@ Object.defineProperty(exports, "InvalidPortableObjectIdError", {
 		return InvalidPortableObjectIdError;
 	}
 });
+Object.defineProperty(exports, "MAX_PORTABLE_KEY_TTL", {
+	enumerable: true,
+	get: function() {
+		return MAX_PORTABLE_KEY_TTL;
+	}
+});
 Object.defineProperty(exports, "Temporal", {
 	enumerable: true,
 	get: function() {
-		return Temporal$2;
+		return Temporal$4;
 	}
 });
 Object.defineProperty(exports, "assertSafeJsonLd", {
@@ -9451,6 +9613,12 @@ Object.defineProperty(exports, "getRemoteHost", {
 		return getRemoteHost;
 	}
 });
+Object.defineProperty(exports, "getVerifiedKeyOwnerEvidence", {
+	enumerable: true,
+	get: function() {
+		return getVerifiedKeyOwnerEvidence;
+	}
+});
 Object.defineProperty(exports, "hasPortableActor", {
 	enumerable: true,
 	get: function() {
@@ -9559,6 +9727,12 @@ Object.defineProperty(exports, "parseAcceptSignature", {
 		return parseAcceptSignature;
 	}
 });
+Object.defineProperty(exports, "parseKeyOwnerEvidence", {
+	enumerable: true,
+	get: function() {
+		return parseKeyOwnerEvidence;
+	}
+});
 Object.defineProperty(exports, "parseRfc9421SignatureInput", {
 	enumerable: true,
 	get: function() {