@fedify/fedify 2.5.0-dev.2440 → 2.5.0-dev.2448

package/dist/{portable-collection-C-etRRF0.cjs → portable-collection-TC-kvkVI.cjs}

@@ -1,5 +1,5 @@
 const { URLPattern } = require("urlpattern-polyfill");
-const require_http = require("./http-CmFHJm6o.cjs");
+const require_http = require("./http-CAl7Num5.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");

package/dist/{portable-key-DSRuCUpF.mjs → portable-key-D5tFOoV-.mjs}

@@ -2,7 +2,7 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { a as getRawCanonicalPortableId, c as isPortableActorDocument, d as isPortableUri, n as getCanonicalPortableId, p as isSamePublicKey } from "./portable-key-id-Ca30-hOa.mjs";
-import { d as verifyPortableObjectProofWithRoot } from "./proof-DWpruPWs.mjs";
+import { p as verifyPortableObjectProofWithRoot } from "./proof-DPoF06nz.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Multikey, Object as Object$1 } from "@fedify/vocab";
 import { FetchError, formatIri, getDocumentLoader, isGatewayUrl, parseIri, toCompatibleEf61Id } from "@fedify/vocab-runtime";

package/dist/{proof-DWpruPWs.mjs → proof-DPoF06nz.mjs}

@@ -3,15 +3,15 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { i as getPortableDid, l as isPortableId } from "./portable-key-id-Ca30-hOa.mjs";
 import { a as verificationObservation, i as triedKey, n as observeCheck, t as observeAttempt } from "./verification-Dpfcw8ml.mjs";
-import { n as version, t as name } from "./deno-DR1uYWpm.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-DIM8ZCKq.mjs";
-import { T as validateCryptoKey, c as getNormalizationContextLoader, v as bypassKeyCacheReads, x as fetchKey } from "./ld-CUM16-EE.mjs";
+import { n as version, t as name } from "./deno-Dpewt_jJ.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-B-QxRSSR.mjs";
+import { C as fetchKey, D as validateCryptoKey, b as bypassKeyCacheReads, c as getNormalizationContextLoader } from "./ld-CQFuiah9.mjs";
 import { n as preloadedOnlyDocumentLoader } from "./public-audience--klBIOk1.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-4IJqPYos.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Activity, DataIntegrityProof, Multikey, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
-import { encodeMultibase, formatIri, fromCompatibleEf61Id, getDocumentLoader, getFe34Origin, parseGatewayUrl, parseIri } from "@fedify/vocab-runtime";
+import { encodeMultibase, formatIri, fromCompatibleEf61Id, getDocumentLoader, getFe34Origin, isTransientFetchError, parseGatewayUrl, parseIri } from "@fedify/vocab-runtime";
 import { encodeHex } from "byte-encodings/hex";
 import { getPortableActorGateways } from "@fedify/vocab-runtime/internal/jsonld-cache";
 import { isPlainJsonTree, retainSignedRepresentation } from "@fedify/vocab-runtime/internal/signed-representation";
@@ -671,6 +671,12 @@ async function verifyProofInternal(jsonLd, proof, options, messageDigestCache, r
 			keyId: proof.verificationMethodId.href,
 			error
 		});
+		const check = options[verificationObservation]?.check;
+		if (check != null && check.reason == null) check.reason = {
+			type: "keyFetchError",
+			keyId: new URL(proof.verificationMethodId.href),
+			result: { error: error instanceof Error ? error : new Error(String(error)) }
+		};
 		return null;
 	}
 	const publicKey = fetchedKey.key;
@@ -1199,6 +1205,39 @@ async function verifyPreparedPortableObjectProof(jsonLd, prepared, options, mess
 * @since 0.10.0
 */
 async function verifyObject(cls, jsonLd, options = {}) {
+	const result = await verifyObjectDetailed(cls, jsonLd, options);
+	return result.status === "verified" ? result.object : null;
+}
+/**
+* Same as {@link verifyObject}, but also tells who signed the verified proofs,
+* and whether a failure was caused by a key that could not be obtained for
+* a retryable reason.
+* @param cls The class of the object to verify.
+* @param jsonLd The JSON-LD object to verify.
+* @param options Additional options.
+* @returns The result.
+* @throws {TypeError} If the object is invalid or unsupported.
+* @internal
+*/
+async function verifyObjectDetailed(cls, jsonLd, options = {}) {
+	const classify = (result, checks) => {
+		if (result != null) return {
+			status: "verified",
+			object: result.object,
+			signers: result.signers
+		};
+		for (const check of checks) {
+			if (check.status === "error" && isTransientFetchError(check.error)) return {
+				status: "unavailable",
+				error: check.error
+			};
+			if (check.status === "rejected" && check.reason.type === "keyFetchError" && isRetryableKeyFetchError(check.reason.result)) return {
+				status: "unavailable",
+				error: "error" in check.reason.result ? check.reason.result.error : /* @__PURE__ */ new Error(`Fetching key ${check.reason.keyId.href} failed with ${check.reason.result.status}.`)
+			};
+		}
+		return { status: "invalid" };
+	};
 	if (options[verificationObservation]?.attempt == null) {
 		const observedOptions = {
 			...options,
@@ -1210,16 +1249,16 @@ async function verifyObject(cls, jsonLd, options = {}) {
 		return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("object_integrity_proofs.verify_object", async (span) => {
 			try {
 				return await observeAttempt(observedOptions, "objectIntegrity", async (observation) => {
-					const object = await verifyObject(cls, jsonLd, {
+					const result = await verifyObjectCore(cls, jsonLd, {
 						...options,
 						[verificationObservation]: observation
 					});
-					if (object == null) {
+					if (result == null) {
 						span.setStatus({ code: SpanStatusCode.ERROR });
 						span.setAttribute("activitypub.verification.failure_reason", observation.attempt?.reason?.type ?? "signatureVerificationFailed");
 					}
-					return object;
-				}, (value) => value != null);
+					return classify(result, observation.attempt?.checks ?? []);
+				}, (value) => value.status === "verified");
 			} catch (error) {
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
@@ -1231,6 +1270,15 @@ async function verifyObject(cls, jsonLd, options = {}) {
 			}
 		});
 	}
+	const checks = options[verificationObservation].attempt.checks;
+	const before = checks.length;
+	return classify(await verifyObjectCore(cls, jsonLd, options), checks.slice(before));
+}
+function isRetryableKeyFetchError(result) {
+	if ("error" in result) return isTransientFetchError(result.error);
+	return result.status >= 500 || result.status === 408 || result.status === 429;
+}
+async function verifyObjectCore(cls, jsonLd, options) {
 	const observation = options[verificationObservation];
 	const logger = getLogger([
 		"fedify",
@@ -1243,6 +1291,7 @@ async function verifyObject(cls, jsonLd, options = {}) {
 	const defaultDocumentLoader = getDocumentLoader();
 	const proofContextLoader = options.contextLoader ?? defaultDocumentLoader;
 	const attributions = new Set(object.attributionIds.map((uri) => uri.href));
+	const signers = [];
 	if (object instanceof Activity) for (const uri of object.actorIds) attributions.add(uri.href);
 	const rawProofValues = isJsonLdNode(jsonLd) ? await getRawProofValues(jsonLd, proofContextLoader) : [];
 	const rawProofCandidates = isJsonLdNode(jsonLd) ? await parseRawProofCandidates(jsonLd, rawProofValues, options, proofContextLoader) : [];
@@ -1301,6 +1350,11 @@ async function verifyObject(cls, jsonLd, options = {}) {
 			continue;
 		}
 		deleteAuthenticatedAttribution(attributions, key.controllerId, proof.verificationMethodId);
+		const signer = getAuthenticatedController(key.controllerId, proof.verificationMethodId);
+		if (signer != null && !signers.some((s) => s.kind === signer.kind && s.id.href === signer.id.href && s.keyId.href === proof.verificationMethodId.href)) signers.push({
+			...signer,
+			keyId: proof.verificationMethodId
+		});
 	}
 	if (acceptedPortableProofs < loadedPortableProofs) {
 		logger.debug("Some portable proof references could not be dereferenced.");
@@ -1314,7 +1368,41 @@ async function verifyObject(cls, jsonLd, options = {}) {
 		logger.debug("Some attributions are not authenticated by the proofs: {attributions}.", { attributions: [...attributions] });
 		return null;
 	}
-	return object;
+	return {
+		object,
+		signers
+	};
+}
+/**
+* Tells whom a key that verified an Object Integrity Proof authenticates.
+* @param key The key, i.e., the proof's verification method.
+* @returns The signer, or `null` if the key authenticates nobody.
+* @internal
+*/
+function getProofSigner(key) {
+	if (key.id == null || key.controllerId == null) return null;
+	const signer = getAuthenticatedController(key.controllerId, key.id);
+	return signer == null ? null : {
+		...signer,
+		keyId: key.id
+	};
+}
+/**
+* Tells whom a verified proof authenticates: the key's controller if it is an
+* ordinary actor, or the DID of a portable controller if the verification
+* method belongs to the same DID.
+*/
+function getAuthenticatedController(controllerId, verificationMethodId) {
+	if (!hasCryptographicOrigin(controllerId.href) && !isPortableId(controllerId)) return {
+		kind: "actor",
+		id: controllerId
+	};
+	const did = getPortableDid(controllerId);
+	if (did == null || !hasCryptographicOrigin(verificationMethodId.href) || getPortableDid(verificationMethodId) !== did || !URL.canParse(did)) return null;
+	return {
+		kind: "portableAuthority",
+		id: new URL(did)
+	};
 }
 function deleteAuthenticatedAttribution(attributions, controllerId, verificationMethodId) {
 	if (!hasCryptographicOrigin(controllerId.href) && !isPortableId(controllerId)) {
@@ -1329,4 +1417,4 @@ function hasCryptographicOrigin(iri) {
 	return /^did:/i.test(iri) || /^ap(?:\+ef61)?:\/\//i.test(iri);
 }
 //#endregion
-export { preparePortableObjectProofPolicy as a, verifyObject as c, verifyPortableObjectProofWithRoot as d, verifyPreparedPortableObjectProofPolicy as f, hasProofLike as i, verifyPortableObjectProof as l, classifyFep2277CoreType as n, signObject as o, verifyProof as p, createProof as r, verifyMapLocalProof as s, InvalidPortableObjectIdError as t, verifyPortableObjectProofPolicy as u };
+export { hasProofLike as a, verifyMapLocalProof as c, verifyPortableObjectProof as d, verifyPortableObjectProofPolicy as f, verifyProof as h, getProofSigner as i, verifyObject as l, verifyPreparedPortableObjectProofPolicy as m, classifyFep2277CoreType as n, preparePortableObjectProofPolicy as o, verifyPortableObjectProofWithRoot as p, createProof as r, signObject as s, InvalidPortableObjectIdError as t, verifyObjectDetailed as u };

package/dist/{send-H0z9Ey5l.mjs → send-CF44O1Df.mjs}

@@ -2,9 +2,9 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { d as isPortableUri } from "./portable-key-id-Ca30-hOa.mjs";
-import { n as version, t as name } from "./deno-DR1uYWpm.mjs";
-import { n as getDurationMs, r as getFederationMetrics } from "./metrics-DIM8ZCKq.mjs";
-import { n as doubleKnock } from "./http-CRrg14tX.mjs";
+import { n as version, t as name } from "./deno-Dpewt_jJ.mjs";
+import { n as getDurationMs, r as getFederationMetrics } from "./metrics-B-QxRSSR.mjs";
+import { n as doubleKnock } from "./http-BZkyQIkb.mjs";
 import { getLogger, withContext } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError, UrlError, canonicalizePortableUri, getFe34Origin, isGatewayUrl, toCompatibleEf61Id, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/sig/compound-proof-discovery.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { a as inspectCompoundPortableObjectApplicability, n as discoverCompoundProofDocuments } from "../compound-proof-D5r-dQMr.mjs";
+import { a as inspectCompoundPortableObjectApplicability, n as discoverCompoundProofDocuments } from "../compound-proof-heeXW2_A.mjs";
 import { t as map_local_create_note_default } from "../map-local-create-note-B0SeXJms.mjs";
 import { test } from "@fedify/fixture";
 //#region src/sig/compound-proof-discovery.test.ts

package/dist/sig/compound-proof-producer.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { a as inspectCompoundPortableObjectApplicability, i as findUnsupportedCompoundProofShape, t as containsCompoundPortableObject } from "../compound-proof-D5r-dQMr.mjs";
+import { a as inspectCompoundPortableObjectApplicability, i as findUnsupportedCompoundProofShape, t as containsCompoundPortableObject } from "../compound-proof-heeXW2_A.mjs";
 import { test } from "@fedify/fixture";
 //#region src/sig/compound-proof-producer.test.ts
 const portableId = "ap+ef61://did:key:z6MkAlice/objects/1";

package/dist/sig/compound-proof-verification.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { s as verifyMapLocalProof, u as verifyPortableObjectProofPolicy } from "../proof-DWpruPWs.mjs";
+import { c as verifyMapLocalProof, f as verifyPortableObjectProofPolicy } from "../proof-DPoF06nz.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { a as inspectCompoundPortableObjectApplicability, o as verifyCompoundPortableObjectProofs, s as verifyCompoundProofDocuments, t as containsCompoundPortableObject } from "../compound-proof-D5r-dQMr.mjs";
+import { a as inspectCompoundPortableObjectApplicability, o as verifyCompoundPortableObjectProofs, s as verifyCompoundProofDocuments, t as containsCompoundPortableObject } from "../compound-proof-heeXW2_A.mjs";
 import { t as map_local_create_note_default } from "../map-local-create-note-B0SeXJms.mjs";
 import { t as map_local_context_conflict_default } from "../map-local-context-conflict-DOYEEJ3u.mjs";
 import { CryptographicKey, Multikey, Person } from "@fedify/vocab";

package/dist/sig/compound-proof.test.mjs

@@ -6,9 +6,9 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { n as preloadedOnlyDocumentLoader } from "../public-audience--klBIOk1.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { o as signObject, p as verifyProof } from "../proof-DWpruPWs.mjs";
+import { h as verifyProof, s as signObject } from "../proof-DPoF06nz.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { s as verifyCompoundProofDocuments } from "../compound-proof-D5r-dQMr.mjs";
+import { s as verifyCompoundProofDocuments } from "../compound-proof-heeXW2_A.mjs";
 import { t as map_local_create_note_default } from "../map-local-create-note-B0SeXJms.mjs";
 import { t as map_local_context_conflict_default } from "../map-local-context-conflict-DOYEEJ3u.mjs";
 import { Create, DataIntegrityProof, Note, Question } from "@fedify/vocab";

package/dist/sig/http.test.mjs

@@ -12,8 +12,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 { y as exportJwk } from "../ld-CUM16-EE.mjs";
-import { a as listRequestSignatures, c as selectRequestSignature, f as verifyRequest, i as formatRfc9421SignatureParameters, l as signRequest, n as doubleKnock, o as parseRfc9421Signature, p as verifyRequestDetailed, r as formatRfc9421Signature, s as parseRfc9421SignatureInput, t as createRfc9421SignatureBase, u as timingSafeEqual } from "../http-CRrg14tX.mjs";
+import { x as exportJwk } from "../ld-CQFuiah9.mjs";
+import { a as listRequestSignatures, c as selectRequestSignature, f as verifyRequest, i as formatRfc9421SignatureParameters, l as signRequest, n as doubleKnock, o as parseRfc9421Signature, p as verifyRequestDetailed, r as formatRfc9421Signature, s as parseRfc9421SignatureInput, t as createRfc9421SignatureBase, u as timingSafeEqual } from "../http-BZkyQIkb.mjs";
 import { a as rsaPrivateKey3, i as rsaPrivateKey2, l as rsaPublicKey5, n as ed25519PrivateKey, o as rsaPublicKey1, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
 import { t as KvKeyCache } from "../keycache-N2opu4-3.mjs";
 import { FetchError, UrlError, exportSpki, getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/sig/key.test.mjs

@@ -8,7 +8,7 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { C as generateCryptoKeyPair, S as fetchKeyDetailed, T as validateCryptoKey, _ as wrapContextLoaderForJsonLd, w as importJwk, x as fetchKey, y as exportJwk } from "../ld-CUM16-EE.mjs";
+import { C as fetchKey, D as validateCryptoKey, E as importJwk, T as generateCryptoKeyPair, w as fetchKeyDetailed, x as exportJwk, y as wrapContextLoaderForJsonLd } from "../ld-CQFuiah9.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, Person } from "@fedify/vocab";
 import { FetchError, UrlError, exportDidKey, getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/sig/ld.test.mjs

@@ -8,7 +8,7 @@ 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 { C as generateCryptoKeyPair, 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-CUM16-EE.mjs";
+import { T as generateCryptoKeyPair, _ as verifyJsonLd, a as compactJsonLd, f as isInvalidUrlTypeError, i as attachSignature, m as signJsonLd, n as UnsafeJsonLdError, o as createSignature, s as detachSignature, u as hasSignatureLike, v as verifySignature } from "../ld-CQFuiah9.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/mitra-receive-interop.test.mjs

@@ -5,10 +5,10 @@ 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 assert } from "../assert-D1Eafmd_.mjs";
-import { l as verifyPortableObjectProof } from "../proof-DWpruPWs.mjs";
-import { p as verifyRequestDetailed } from "../http-CRrg14tX.mjs";
-import { o as createFederation } from "../middleware-CDdFG6xf.mjs";
-import { t as doesActorOwnKey } from "../owner-DoQDS_g0.mjs";
+import { d as verifyPortableObjectProof } from "../proof-DPoF06nz.mjs";
+import { p as verifyRequestDetailed } from "../http-BZkyQIkb.mjs";
+import { o as createFederation } from "../middleware-CuVa0UuS.mjs";
+import { t as doesActorOwnKey } from "../owner-ccKkQOAf.mjs";
 import { Create, Person } from "@fedify/vocab";
 import { canonicalizePortableUri, decodeMultibase, importDidKey } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/sig/mitra-send-interop.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { l as verifyPortableObjectProof } from "../proof-DWpruPWs.mjs";
-import { p as verifyRequestDetailed } from "../http-CRrg14tX.mjs";
-import { t as doesActorOwnKey } from "../owner-DoQDS_g0.mjs";
+import { d as verifyPortableObjectProof } from "../proof-DPoF06nz.mjs";
+import { p as verifyRequestDetailed } from "../http-BZkyQIkb.mjs";
+import { t as doesActorOwnKey } from "../owner-ccKkQOAf.mjs";
 import { Create } from "@fedify/vocab";
 import { canonicalizePortableUri, decodeMultibase, fromCompatibleEf61Id, importDidKey } from "@fedify/vocab-runtime";
 import { 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-CmFHJm6o.cjs");
-const require_portable_collection = require("../portable-collection-C-etRRF0.cjs");
+const require_http = require("../http-CAl7Num5.cjs");
+const require_portable_collection = require("../portable-collection-TC-kvkVI.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 { A as AcceptSignatureParameters, B as VerifyPortableObjectProofOptions, C as VerifyRequestDetailedResult, D as verifyRequest, E as signRequest, F as validateAcceptSignature, G as signObject, H as VerifyProofOptions, I as CreateProofOptions, J as verifyProof, K as verifyObject, L as SignObjectOptions, M as formatAcceptSignature, N as fulfillAcceptSignature, O as verifyRequestDetailed, P as parseAcceptSignature, R as VerifyObjectOptions, S as SignRequestOptions, T as VerifyRequestOptions, U as createProof, V as VerifyPortableObjectProofResult, W as hasProofLike, a as KeyCache, b as HttpMessageSignaturesSpecDeterminer, c as fetchKeyDetailed, i as FetchKeyResult, j as FulfillAcceptSignatureResult, k as AcceptSignatureMember, l as generateCryptoKeyPair, n as FetchKeyErrorResult, o as exportJwk, q as verifyPortableObjectProof, r as FetchKeyOptions, s as fetchKey, t as FetchKeyDetailedResult, u as importJwk, w as VerifyRequestFailureReason, x as Rfc9421SignRequestOptions, y as HttpMessageSignaturesSpec, z as VerifyPortableObjectProofFailureReason } from "../key-nYGY4QB9.cjs";
-import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "../owner-BF0L9cMt.cjs";
-import { a as CreateSignatureOptions, c as VerifySignatureOptions, d as detachSignature, f as hasSignatureLike, h as verifySignature, i as verifyPortableObject, l as attachSignature, m as verifyJsonLd, n as VerifyPortableObjectOptions, o as SignJsonLdOptions, p as signJsonLd, r as VerifyPortableObjectResult, s as VerifyJsonLdOptions, t as VerifyPortableObjectFailureReason, u as createSignature } from "../mod-xAfaLS4T.cjs";
+import { a as VerifySignatureOptions, c as detachSignature, d as verifyJsonLd, f as verifySignature, g as getKeyOwner, h as doesActorOwnKey, i as VerifyJsonLdOptions, l as hasSignatureLike, m as GetKeyOwnerOptions, o as attachSignature, p as DoesActorOwnKeyOptions, r as SignJsonLdOptions, s as createSignature, t as CreateSignatureOptions, u as signJsonLd } from "../ld-Cel1RRZ5.cjs";
+import { i as verifyPortableObject, n as VerifyPortableObjectOptions, r as VerifyPortableObjectResult, t as VerifyPortableObjectFailureReason } from "../mod-B2783_3v.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 { A as AcceptSignatureParameters, B as VerifyPortableObjectProofOptions, C as VerifyRequestDetailedResult, D as verifyRequest, E as signRequest, F as validateAcceptSignature, G as signObject, H as VerifyProofOptions, I as CreateProofOptions, J as verifyProof, K as verifyObject, L as SignObjectOptions, M as formatAcceptSignature, N as fulfillAcceptSignature, O as verifyRequestDetailed, P as parseAcceptSignature, R as VerifyObjectOptions, S as SignRequestOptions, T as VerifyRequestOptions, U as createProof, V as VerifyPortableObjectProofResult, W as hasProofLike, a as KeyCache, b as HttpMessageSignaturesSpecDeterminer, c as fetchKeyDetailed, i as FetchKeyResult, j as FulfillAcceptSignatureResult, k as AcceptSignatureMember, l as generateCryptoKeyPair, n as FetchKeyErrorResult, o as exportJwk, q as verifyPortableObjectProof, r as FetchKeyOptions, s as fetchKey, t as FetchKeyDetailedResult, u as importJwk, w as VerifyRequestFailureReason, x as Rfc9421SignRequestOptions, y as HttpMessageSignaturesSpec, z as VerifyPortableObjectProofFailureReason } from "../key-DhsBxxZN.js";
-import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "../owner-BSzr5-I8.js";
-import { a as CreateSignatureOptions, c as VerifySignatureOptions, d as detachSignature, f as hasSignatureLike, h as verifySignature, i as verifyPortableObject, l as attachSignature, m as verifyJsonLd, n as VerifyPortableObjectOptions, o as SignJsonLdOptions, p as signJsonLd, r as VerifyPortableObjectResult, s as VerifyJsonLdOptions, t as VerifyPortableObjectFailureReason, u as createSignature } from "../mod-BRpER-B0.js";
+import { a as VerifySignatureOptions, c as detachSignature, d as verifyJsonLd, f as verifySignature, g as getKeyOwner, h as doesActorOwnKey, i as VerifyJsonLdOptions, l as hasSignatureLike, m as GetKeyOwnerOptions, o as attachSignature, p as DoesActorOwnKeyOptions, r as SignJsonLdOptions, s as createSignature, t as CreateSignatureOptions, u as signJsonLd } from "../ld-CcuZ4NZa.js";
+import { i as verifyPortableObject, n as VerifyPortableObjectOptions, r as VerifyPortableObjectResult, t as VerifyPortableObjectFailureReason } from "../mod-BHQE-7WQ.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 detachSignature, C as verifyProof, D as attachSignature, G as generateCryptoKeyPair, I as signJsonLd, K as importJwk, N as hasSignatureLike, R as verifyJsonLd, U as fetchKey, V as exportJwk, W as fetchKeyDetailed, _t as fulfillAcceptSignature, a as signRequest, c as verifyRequestDetailed, g as signObject, gt as formatAcceptSignature, k as createSignature, m as hasProofLike, p as createProof, s as verifyRequest, v as verifyObject, vt as parseAcceptSignature, y as verifyPortableObjectProof, yt as validateAcceptSignature, z as verifySignature } from "../http-CgaoFGXV.js";
-import { n as doesActorOwnKey, r as getKeyOwner, t as verifyPortableObject } from "../portable-collection-BVKSWfBe.js";
+import { F as hasSignatureLike, H as verifySignature, J as generateCryptoKeyPair, K as fetchKey, M as detachSignature, St as validateAcceptSignature, T as verifyProof, V as verifyJsonLd, W as exportJwk, Y as importJwk, _ as signObject, a as signRequest, bt as fulfillAcceptSignature, c as verifyRequestDetailed, h as hasProofLike, j as createSignature, k as attachSignature, p as createProof, q as fetchKeyDetailed, s as verifyRequest, x as verifyPortableObjectProof, xt as parseAcceptSignature, y as verifyObject, yt as formatAcceptSignature, z as signJsonLd } from "../http-BBr-VLil.js";
+import { n as doesActorOwnKey, r as getKeyOwner, t as verifyPortableObject } from "../portable-collection-DUlQ3s2M.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-DoQDS_g0.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-ccKkQOAf.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-DiBqtGSM.mjs";
+import { t as verifyPortableObject } from "../portable-collection-CndnpXfo.mjs";
 import { Collection, CollectionPage, Note, OrderedCollection, Person, traverseCollection } from "@fedify/vocab";
 import { FetchError, encodeMultibase, exportDidKey, preloadedContexts } from "@fedify/vocab-runtime";
 import { test } from "@fedify/fixture";

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

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { l as verifyPortableObjectProof, p as verifyProof } from "../proof-DWpruPWs.mjs";
-import { n as getKeyOwner } from "../owner-DoQDS_g0.mjs";
-import { t as verifyPortableObject } from "../portable-collection-DiBqtGSM.mjs";
+import { d as verifyPortableObjectProof, h as verifyProof } from "../proof-DPoF06nz.mjs";
+import { n as getKeyOwner } from "../owner-ccKkQOAf.mjs";
+import { t as verifyPortableObject } from "../portable-collection-CndnpXfo.mjs";
 import { Application, DataIntegrityProof, lookupObject } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region test-vectors/fep-ef61/tootik-v0.25.4/actor.json

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

@@ -2,12 +2,12 @@ import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
-import { S as fetchKeyDetailed, h as verifyJsonLd, p as signJsonLd, x as fetchKey } from "../ld-CUM16-EE.mjs";
-import { p as verifyProof, r as createProof } from "../proof-DWpruPWs.mjs";
-import { n as resolvePortableActorKey } from "../portable-key-DSRuCUpF.mjs";
-import { f as verifyRequest, l as signRequest, p as verifyRequestDetailed } from "../http-CRrg14tX.mjs";
+import { C as fetchKey, _ as verifyJsonLd, m as signJsonLd, w as fetchKeyDetailed } from "../ld-CQFuiah9.mjs";
+import { h as verifyProof, r as createProof } from "../proof-DPoF06nz.mjs";
+import { n as resolvePortableActorKey } from "../portable-key-D5tFOoV-.mjs";
+import { f as verifyRequest, l as signRequest, p as verifyRequestDetailed } from "../http-BZkyQIkb.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-DoQDS_g0.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-ccKkQOAf.mjs";
 import { t as KvKeyCache } from "../keycache-N2opu4-3.mjs";
 import { Create, CryptographicKey, Multikey, Note, Person } from "@fedify/vocab";
 import { FetchError, encodeMultibase, exportDidKey, exportSpki, parseIri, preloadedContexts } from "@fedify/vocab-runtime";

package/dist/sig/proof.test.mjs

@@ -11,12 +11,12 @@ import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { a as verificationObservation } from "../verification-Dpfcw8ml.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { c as verifyObject, i as hasProofLike, l as verifyPortableObjectProof, o as signObject, p as verifyProof, r as createProof, s as verifyMapLocalProof } from "../proof-DWpruPWs.mjs";
-import { f as verifyRequest } from "../http-CRrg14tX.mjs";
+import { a as hasProofLike, c as verifyMapLocalProof, d as verifyPortableObjectProof, h as verifyProof, l as verifyObject, r as createProof, s as signObject, u as verifyObjectDetailed } from "../proof-DPoF06nz.mjs";
+import { f as verifyRequest } from "../http-BZkyQIkb.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-BpCJ2dHm.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-CpsDyqVN.mjs";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place, Translation } from "@fedify/vocab";
-import { decodeMultibase, encodeMultibase, exportDidKey, exportMultibaseKey, formatIri, importMultibaseKey, parseIri } from "@fedify/vocab-runtime";
+import { FetchError, decodeMultibase, encodeMultibase, exportDidKey, exportMultibaseKey, formatIri, importMultibaseKey, parseIri } from "@fedify/vocab-runtime";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { decodeHex } from "byte-encodings/hex";
 import jsonld from "@fedify/vocab-runtime/jsonld";
@@ -2594,5 +2594,45 @@ test("verifyObject() rejects a key whose controller redirects to another actor",
 		contextLoader: mockDocumentLoader
 	}), null);
 });
+test("verifyObjectDetailed() tells who signed the proofs", async () => {
+	const keyId = new URL("https://example.com/person2#key4");
+	const actor = new URL("https://example.com/person2");
+	const json = await (await signObject(new Create({
+		id: new URL("https://example.com/activities/detailed"),
+		actor,
+		object: new Note({ content: "Hello" })
+	}), ed25519PrivateKey, keyId, { contextLoader: mockDocumentLoader })).toJsonLd({ contextLoader: mockDocumentLoader });
+	const options = {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	};
+	const result = await verifyObjectDetailed(Create, json, options);
+	assertEquals(result.status, "verified");
+	assertEquals(result.status === "verified" ? result.signers.map((s) => [
+		s.kind,
+		s.id.href,
+		s.keyId.href
+	]) : [], [[
+		"actor",
+		actor.href,
+		keyId.href
+	]]);
+	const unsigned = await verifyObjectDetailed(Note, {
+		"@context": "https://www.w3.org/ns/activitystreams",
+		id: "https://example.com/notes/unsigned",
+		type: "Note"
+	}, options);
+	assertEquals(unsigned.status, "verified");
+	assertEquals(unsigned.status === "verified" ? unsigned.signers : null, []);
+	assertEquals((await verifyObjectDetailed(Create, json, {
+		...options,
+		documentLoader: (url) => url.startsWith("https://example.com/person2") ? Promise.reject(new FetchError(url, "Unavailable", new Response(null, { status: 503 }))) : mockDocumentLoader(url)
+	})).status, "unavailable");
+	assertEquals((await verifyObjectDetailed(Create, json, {
+		...options,
+		documentLoader: (url) => url.startsWith("https://example.com/person2") ? Promise.reject(new FetchError(url, "Gone", new Response(null, { status: 410 }))) : mockDocumentLoader(url)
+	})).status, "invalid");
+	assertEquals(await verifyObject(Create, json, options) != null, true);
+});
 //#endregion
 export {};

package/dist/sig/tootik-request-interop.test.mjs

@@ -5,10 +5,10 @@ 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 assert } from "../assert-D1Eafmd_.mjs";
-import { l as verifyPortableObjectProof } from "../proof-DWpruPWs.mjs";
-import { p as verifyRequestDetailed } from "../http-CRrg14tX.mjs";
-import { o as createFederation } from "../middleware-CDdFG6xf.mjs";
-import { t as doesActorOwnKey } from "../owner-DoQDS_g0.mjs";
+import { d as verifyPortableObjectProof } from "../proof-DPoF06nz.mjs";
+import { p as verifyRequestDetailed } from "../http-BZkyQIkb.mjs";
+import { o as createFederation } from "../middleware-CuVa0UuS.mjs";
+import { t as doesActorOwnKey } from "../owner-ccKkQOAf.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { encodeHex } from "byte-encodings/hex";

package/dist/sig/tootik-send-interop.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { l as verifyPortableObjectProof } from "../proof-DWpruPWs.mjs";
-import { p as verifyRequestDetailed } from "../http-CRrg14tX.mjs";
-import { t as doesActorOwnKey } from "../owner-DoQDS_g0.mjs";
+import { d as verifyPortableObjectProof } from "../proof-DPoF06nz.mjs";
+import { p as verifyRequestDetailed } from "../http-BZkyQIkb.mjs";
+import { t as doesActorOwnKey } from "../owner-ccKkQOAf.mjs";
 import { Create } from "@fedify/vocab";
 import { decodeMultibase, importDidKey } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/sig/verification.test.mjs

@@ -2,9 +2,9 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { a as verificationObservation } from "../verification-Dpfcw8ml.mjs";
-import { h as verifyJsonLd, p as signJsonLd } from "../ld-CUM16-EE.mjs";
-import { c as verifyObject, o as signObject } from "../proof-DWpruPWs.mjs";
-import { l as signRequest, p as verifyRequestDetailed } from "../http-CRrg14tX.mjs";
+import { _ as verifyJsonLd, m as signJsonLd } from "../ld-CQFuiah9.mjs";
+import { l as verifyObject, s as signObject } from "../proof-DPoF06nz.mjs";
+import { l as signRequest, p as verifyRequestDetailed } from "../http-BZkyQIkb.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
 import { Activity, Create, CryptographicKey, Multikey } from "@fedify/vocab";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/{temporal-BiSBCImA.mjs → temporal-XlZ4Wb94.mjs}

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