@fedify/fedify 2.0.36-dev.2551 → 2.0.36-dev.2598

package/dist/{middleware-DThg01d8.cjs → middleware-CXoG7ZAW.cjs}

@@ -2,10 +2,10 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
-const require_http = require("./http-DbDnj-Q7.cjs");
+const require_http = require("./http-CO_IVq7x.cjs");
 const require_types = require("./types-DOvyymM4.cjs");
-const require_proof = require("./proof-vVwkNRv4.cjs");
-const require_kv_cache = require("./kv-cache-BdA7HpfF.cjs");
+const require_proof = require("./proof-BrreJTRF.cjs");
+const require_kv_cache = require("./kv-cache-BMlo_kyv.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");
@@ -351,7 +351,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-D9TWYyT_.cjs"));
+		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-Ad6kTSBf.cjs"));
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -2996,7 +2996,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 		await this.sendActivity(keys, message.inboxes, activity, {
 			collectionSync: message.collectionSync,
 			orderingKey: message.orderingKey,
-			context
+			context,
+			activityJsonLd: hasTopLevelProof(message.activity) ? message.activity : void 0
 		});
 	}
 	async #listenOutboxMessage(_, message, span) {
@@ -3403,7 +3404,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				proofCreated = true;
 			}
 		}
-		let jsonLd = await activity.toJsonLd({
+		let jsonLd = options.activityJsonLd != null ? require_proof.detachSignature(options.activityJsonLd) : await activity.toJsonLd({
 			format: "compact",
 			contextLoader
 		});
@@ -4120,7 +4121,17 @@ var ContextImpl = class ContextImpl {
 			allowPrivateAddress: this.federation.allowPrivateAddress
 		});
 	}
-	sendActivity(sender, recipients, activity, options = {}) {
+	async sendActivity(sender, recipients, activity, options = {}) {
+		let activityJsonLd = void 0;
+		let hasProof = activity.proofIds.length > 0;
+		if (!hasProof) for await (const _ of activity.getProofs({ contextLoader: this.contextLoader })) {
+			hasProof = true;
+			break;
+		}
+		if (hasProof) {
+			activityJsonLd = await activity.toJsonLd({ contextLoader: this.contextLoader });
+			if (!hasTopLevelProof(activityJsonLd)) activityJsonLd = void 0;
+		}
 		return this.tracerProvider.getTracer(require_http.name, require_http.version).startActiveSpan(this.federation.outboxQueue == null || options.immediate ? "activitypub.outbox" : "activitypub.fanout", {
 			kind: this.federation.outboxQueue == null || options.immediate ? _opentelemetry_api.SpanKind.CLIENT : _opentelemetry_api.SpanKind.PRODUCER,
 			attributes: {
@@ -4133,7 +4144,7 @@ var ContextImpl = class ContextImpl {
 		}, async (span) => {
 			try {
 				if (activity.id != null) span.setAttribute("activitypub.activity.id", activity.id.href);
-				await this.sendActivityInternal(sender, recipients, activity, options, span);
+				await this.sendActivityInternal(sender, recipients, activity, options, span, activityJsonLd);
 			} catch (e) {
 				span.setStatus({
 					code: _opentelemetry_api.SpanStatusCode.ERROR,
@@ -4145,7 +4156,7 @@ var ContextImpl = class ContextImpl {
 			}
 		});
 	}
-	async sendActivityInternal(sender, recipients, activity, options, span) {
+	async sendActivityInternal(sender, recipients, activity, options, span, activityJsonLd) {
 		const logger = (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
@@ -4192,14 +4203,23 @@ var ContextImpl = class ContextImpl {
 				if (!(error instanceof RouterError)) throw error;
 			}
 		} else expandedRecipients = [recipients];
-		const opts = {
-			context: this,
-			orderingKey: options.orderingKey,
-			collectionSync,
-			immediate: options.immediate
-		};
 		span.setAttribute("activitypub.inboxes", expandedRecipients.length);
 		for (const activityTransformer of this.federation.activityTransformers) activity = activityTransformer(activity, this);
+		let contextMatches = false;
+		if (activityJsonLd != null) {
+			const capturedJsonLd = activityJsonLd;
+			const transformedJsonLd = await activity.toJsonLd({
+				format: "compact",
+				contextLoader: this.contextLoader
+			});
+			const contentChanged = getContentFields(transformedJsonLd) !== getContentFields(capturedJsonLd);
+			contextMatches = getContextFields(transformedJsonLd) === getContextFields(capturedJsonLd);
+			const proofsChanged = getProofFields(transformedJsonLd) !== getProofFields(capturedJsonLd);
+			if (contentChanged || !contextMatches && proofsChanged) {
+				activity = activity.clone({ proofs: await getUncapturedProofs(activity, capturedJsonLd, this.contextLoader) });
+				activityJsonLd = void 0;
+			} else if (proofsChanged) activityJsonLd = void 0;
+		}
 		span?.setAttribute("activitypub.activity.id", activity?.id?.href ?? "");
 		if (activity.actorId == null) {
 			logger.error("Activity {activityId} to send does not have an actor.", {
@@ -4210,14 +4230,27 @@ var ContextImpl = class ContextImpl {
 		}
 		if (actorKeyPairs != null) {
 			const contextLoader = this.contextLoader;
+			if (actorKeyPairs.some((kp) => kp.privateKey.algorithm.name === "Ed25519" && kp.multikey.id != null)) {
+				if (activityJsonLd != null && !contextMatches) activity = activity.clone({ proofs: [] });
+			}
+			let proofAdded = false;
 			for (const kp of actorKeyPairs) {
 				if (kp.privateKey.algorithm.name !== "Ed25519" || kp.multikey.id == null) continue;
 				activity = await require_proof.signObject(activity, kp.privateKey, kp.multikey.id, {
 					contextLoader,
 					tracerProvider: this.tracerProvider
 				});
+				proofAdded = true;
 			}
+			if (proofAdded) activityJsonLd = void 0;
 		}
+		const opts = {
+			context: this,
+			orderingKey: options.orderingKey,
+			collectionSync,
+			immediate: options.immediate,
+			activityJsonLd
+		};
 		const inboxes = extractInboxes({
 			recipients: expandedRecipients,
 			preferSharedInbox: options.preferSharedInbox,
@@ -4247,7 +4280,7 @@ var ContextImpl = class ContextImpl {
 				actorIds: [...actorIds],
 				sharedInbox
 			}])),
-			activity: await activity.toJsonLd({
+			activity: activityJsonLd != null ? require_proof.detachSignature(activityJsonLd) : await activity.toJsonLd({
 				format: "compact",
 				contextLoader: this.contextLoader
 			}),
@@ -4733,6 +4766,69 @@ var KvSpecDeterminer = class {
 function notFound(_request) {
 	return new Response("Not Found", { status: 404 });
 }
+function hasTopLevelProof(value) {
+	return typeof value === "object" && value != null && !Array.isArray(value) && globalThis.Object.prototype.hasOwnProperty.call(value, "proof");
+}
+function getContentFields(value) {
+	if (typeof value !== "object" || value == null || Array.isArray(value)) return JSON.stringify(sortJsonKeys(value));
+	const record = { ...value };
+	delete record["@context"];
+	delete record.proof;
+	delete record.signature;
+	return JSON.stringify(sortJsonKeys(record));
+}
+function getContextFields(value) {
+	if (typeof value !== "object" || value == null || Array.isArray(value)) return JSON.stringify(sortJsonKeys(value));
+	const context = value["@context"];
+	return JSON.stringify(sortJsonKeys(context ?? null));
+}
+function getProofEntries(value) {
+	if (typeof value !== "object" || value == null || Array.isArray(value)) return [];
+	const proof = value.proof;
+	if (proof == null) return [];
+	return Array.isArray(proof) ? proof : [proof];
+}
+function normalizeProofEntry(proof) {
+	const stripped = stripContexts(proof);
+	if (typeof stripped !== "object" || stripped == null || Array.isArray(stripped)) return stripped;
+	const record = { ...stripped };
+	if (typeof record.created === "string") try {
+		record.created = Temporal.Instant.from(record.created).toString();
+	} catch {}
+	return record;
+}
+function getProofEntryFields(proof) {
+	return JSON.stringify(sortJsonKeys(normalizeProofEntry(proof)));
+}
+function getProofFields(value) {
+	return JSON.stringify(getProofEntries(value).map(getProofEntryFields).sort());
+}
+async function getUncapturedProofs(activity, capturedJsonLd, contextLoader) {
+	const capturedProofs = new Set(getProofEntries(capturedJsonLd).map(getProofEntryFields));
+	const retainedProofs = [];
+	for await (const proof of activity.getProofs({ contextLoader })) {
+		const proofJsonLd = await proof.toJsonLd({
+			format: "compact",
+			contextLoader
+		});
+		if (!capturedProofs.has(getProofEntryFields(proofJsonLd))) retainedProofs.push(proof);
+	}
+	return retainedProofs;
+}
+function stripContexts(value) {
+	if (Array.isArray(value)) return value.map(stripContexts);
+	if (typeof value !== "object" || value == null) return value;
+	const record = { ...value };
+	delete record["@context"];
+	delete record.signature;
+	for (const key of globalThis.Object.keys(record)) record[key] = stripContexts(record[key]);
+	return record;
+}
+function sortJsonKeys(value) {
+	if (Array.isArray(value)) return value.map(sortJsonKeys);
+	if (typeof value !== "object" || value == null) return value;
+	return globalThis.Object.fromEntries(globalThis.Object.entries(value).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([key, item]) => [key, sortJsonKeys(item)]));
+}
 function notAcceptable(_request) {
 	return new Response("Not Acceptable", {
 		status: 406,

package/dist/{mod-DVPS4yam.d.cts → mod-BA6vqC2S.d.cts}

@@ -10,7 +10,7 @@ import { TracerProvider } from "@opentelemetry/api";
 * @since 1.0.0
 */
 interface Signature {
-  "@context"?: "https://w3id.org/identity/v1";
+  "@context"?: "https://w3id.org/identity/v1" | "https://w3id.org/security/v1";
   type: "RsaSignature2017";
   id?: string;
   creator: string;
@@ -19,16 +19,26 @@ interface Signature {
 }
 /**
 * Attaches a LD signature to the given JSON-LD document.
+*
+* When the document's context does not already define the `signature`
+* property, the returned document adds a minimal inline context for it.
+* Without that definition, expanding the attached signature would produce a
+* blank node predicate, which is not valid RDF.  Documents that already carry
+* a `proof` are left unchanged, since a new context definition would invalidate
+* the proof.  Documents whose context includes an unrecognized remote context
+* are also left unchanged, since that context may already define `signature`.
 * @param jsonLd The JSON-LD document to attach the signature to.  It is not
 *               modified.
 * @param signature The signature to attach.
 * @returns The JSON-LD document with the attached signature.
 * @throws {TypeError} If the input document is not a valid JSON-LD document.
+*                    Top-level arrays are rejected, since a Linked Data
+*                    Signature is attached to a single node.
 * @since 1.0.0
 */
 declare function attachSignature(jsonLd: unknown, signature: Signature): {
   signature: Signature;
-};
+} & Record<string, unknown>;
 /**
 * Options for creating Linked Data Signatures.
 * @since 1.0.0
@@ -46,6 +56,12 @@ interface CreateSignatureOptions {
 }
 /**
 * Creates a LD signature for the given JSON-LD document.
+*
+* If the document's context does not define the `signature` property, the
+* signature is computed over the document with a minimal inline definition
+* added.  Use {@link attachSignature} to attach the signature to that exact
+* document.  Documents that already carry a `proof`, or whose context includes
+* an unrecognized remote context, are hashed unchanged.
 * @param jsonLd The JSON-LD document to sign.
 * @param privateKey The private key to sign the document.
 * @param keyId The ID of the public key that corresponds to the private key.
@@ -173,11 +189,7 @@ interface CreateProofOptions {
 * @throws {TypeError} If the private key is invalid or unsupported.
 * @since 0.10.0
 */
-declare function createProof(object: Object$1, privateKey: CryptoKey, keyId: URL, {
-  contextLoader,
-  context,
-  created
-}?: CreateProofOptions): Promise<DataIntegrityProof>;
+declare function createProof(object: Object$1, privateKey: CryptoKey, keyId: URL, options?: CreateProofOptions): Promise<DataIntegrityProof>;
 /**
 * Options for {@link signObject}.
 * @since 0.10.0

package/dist/{mod-BS-jg3Wx.d.ts → mod-CL9Ep0uo.d.ts}

@@ -10,7 +10,7 @@ import { DocumentLoader } from "@fedify/vocab-runtime";
 * @since 1.0.0
 */
 interface Signature {
-  "@context"?: "https://w3id.org/identity/v1";
+  "@context"?: "https://w3id.org/identity/v1" | "https://w3id.org/security/v1";
   type: "RsaSignature2017";
   id?: string;
   creator: string;
@@ -19,16 +19,26 @@ interface Signature {
 }
 /**
 * Attaches a LD signature to the given JSON-LD document.
+*
+* When the document's context does not already define the `signature`
+* property, the returned document adds a minimal inline context for it.
+* Without that definition, expanding the attached signature would produce a
+* blank node predicate, which is not valid RDF.  Documents that already carry
+* a `proof` are left unchanged, since a new context definition would invalidate
+* the proof.  Documents whose context includes an unrecognized remote context
+* are also left unchanged, since that context may already define `signature`.
 * @param jsonLd The JSON-LD document to attach the signature to.  It is not
 *               modified.
 * @param signature The signature to attach.
 * @returns The JSON-LD document with the attached signature.
 * @throws {TypeError} If the input document is not a valid JSON-LD document.
+*                    Top-level arrays are rejected, since a Linked Data
+*                    Signature is attached to a single node.
 * @since 1.0.0
 */
 declare function attachSignature(jsonLd: unknown, signature: Signature): {
   signature: Signature;
-};
+} & Record<string, unknown>;
 /**
 * Options for creating Linked Data Signatures.
 * @since 1.0.0
@@ -46,6 +56,12 @@ interface CreateSignatureOptions {
 }
 /**
 * Creates a LD signature for the given JSON-LD document.
+*
+* If the document's context does not define the `signature` property, the
+* signature is computed over the document with a minimal inline definition
+* added.  Use {@link attachSignature} to attach the signature to that exact
+* document.  Documents that already carry a `proof`, or whose context includes
+* an unrecognized remote context, are hashed unchanged.
 * @param jsonLd The JSON-LD document to sign.
 * @param privateKey The private key to sign the document.
 * @param keyId The ID of the public key that corresponds to the private key.
@@ -173,11 +189,7 @@ interface CreateProofOptions {
 * @throws {TypeError} If the private key is invalid or unsupported.
 * @since 0.10.0
 */
-declare function createProof(object: Object$1, privateKey: CryptoKey, keyId: URL, {
-  contextLoader,
-  context,
-  created
-}?: CreateProofOptions): Promise<DataIntegrityProof>;
+declare function createProof(object: Object$1, privateKey: CryptoKey, keyId: URL, options?: CreateProofOptions): Promise<DataIntegrityProof>;
 /**
 * Options for {@link signObject}.
 * @since 0.10.0

package/dist/mod.cjs

@@ -4,11 +4,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
 require("./compat/mod.cjs");
-const require_http = require("./http-DbDnj-Q7.cjs");
-const require_middleware = require("./middleware-DThg01d8.cjs");
+const require_http = require("./http-CO_IVq7x.cjs");
+const require_middleware = require("./middleware-CXoG7ZAW.cjs");
 const require_types = require("./types-DOvyymM4.cjs");
-const require_proof = require("./proof-vVwkNRv4.cjs");
-const require_kv_cache = require("./kv-cache-BdA7HpfF.cjs");
+const require_proof = require("./proof-BrreJTRF.cjs");
+const require_kv_cache = require("./kv-cache-BMlo_kyv.cjs");
 const require_federation_mod = require("./federation/mod.cjs");
 require("./nodeinfo/mod.cjs");
 require("./runtime/mod.cjs");

package/dist/mod.d.cts

@@ -6,7 +6,7 @@ import { $ as AuthorizePredicate, A as CreateExponentialBackoffPolicyOptions, B
 import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "./kv-CZKl1IUS.cjs";
 import { actorDehydrator, autoIdAssigner, getDefaultActivityTransformers } from "./compat/mod.cjs";
 import { n as handleWebFinger, t as WebFingerHandlerParameters } from "./mod-w1oyHseQ.cjs";
-import { _ as verifyJsonLd, a as createProof, c as verifyProof, d as VerifyJsonLdOptions, f as VerifySignatureOptions, g as signJsonLd, h as detachSignature, i as VerifyProofOptions, l as CreateSignatureOptions, m as createSignature, n as SignObjectOptions, o as signObject, p as attachSignature, r as VerifyObjectOptions, s as verifyObject, t as CreateProofOptions, u as SignJsonLdOptions, v as verifySignature } from "./mod-DVPS4yam.cjs";
+import { _ as verifyJsonLd, a as createProof, c as verifyProof, d as VerifyJsonLdOptions, f as VerifySignatureOptions, g as signJsonLd, h as detachSignature, i as VerifyProofOptions, l as CreateSignatureOptions, m as createSignature, n as SignObjectOptions, o as signObject, p as attachSignature, r as VerifyObjectOptions, s as verifyObject, t as CreateProofOptions, u as SignJsonLdOptions, v as verifySignature } from "./mod-BA6vqC2S.cjs";
 import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./mod-BPDfu4Ey.cjs";
 export * from "@fedify/vocab-runtime";
 

package/dist/mod.d.ts

@@ -6,7 +6,7 @@ import { $ as AuthorizePredicate, A as CreateExponentialBackoffPolicyOptions, B
 import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "./kv-CxaI4eGo.js";
 import { actorDehydrator, autoIdAssigner, getDefaultActivityTransformers } from "./compat/mod.js";
 import { n as handleWebFinger, t as WebFingerHandlerParameters } from "./mod-I-34OMN3.js";
-import { _ as verifyJsonLd, a as createProof, c as verifyProof, d as VerifyJsonLdOptions, f as VerifySignatureOptions, g as signJsonLd, h as detachSignature, i as VerifyProofOptions, l as CreateSignatureOptions, m as createSignature, n as SignObjectOptions, o as signObject, p as attachSignature, r as VerifyObjectOptions, s as verifyObject, t as CreateProofOptions, u as SignJsonLdOptions, v as verifySignature } from "./mod-BS-jg3Wx.js";
+import { _ as verifyJsonLd, a as createProof, c as verifyProof, d as VerifyJsonLdOptions, f as VerifySignatureOptions, g as signJsonLd, h as detachSignature, i as VerifyProofOptions, l as CreateSignatureOptions, m as createSignature, n as SignObjectOptions, o as signObject, p as attachSignature, r as VerifyObjectOptions, s as verifyObject, t as CreateProofOptions, u as SignJsonLdOptions, v as verifySignature } from "./mod-CL9Ep0uo.js";
 import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./mod-DGP89q0u.js";
 export * from "@fedify/vocab-runtime";
 

package/dist/mod.js

@@ -3,11 +3,11 @@ import { URLPattern } from "urlpattern-polyfill";
 import "./chunk-CRNNMoPX.js";
 import { n as autoIdAssigner, r as getDefaultActivityTransformers, t as actorDehydrator } from "./transformers-BGMIq1cs.js";
 import "./compat/mod.js";
-import { c as importJwk, i as exportJwk, n as signRequest, o as fetchKey, r as verifyRequest, s as generateCryptoKeyPair } from "./http-BS1CmlZ6.js";
-import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "./middleware-CQRCnFB4.js";
+import { c as importJwk, i as exportJwk, n as signRequest, o as fetchKey, r as verifyRequest, s as generateCryptoKeyPair } from "./http-CfyVeGgF.js";
+import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "./middleware-BKs_a9P1.js";
 import { n as getNodeInfo, r as parseNodeInfo, t as nodeInfoToJson } from "./types-B1_pRFE_.js";
-import { _ as signJsonLd, a as doesActorOwnKey, b as verifySignature, d as createSignature, f as detachSignature, i as verifyProof, l as attachSignature, n as signObject, o as getKeyOwner, r as verifyObject, t as createProof, y as verifyJsonLd } from "./proof-BBHUW8ev.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-BARiicPE.js";
+import { _ as signJsonLd, a as doesActorOwnKey, b as verifySignature, d as createSignature, f as detachSignature, i as verifyProof, l as attachSignature, n as signObject, o as getKeyOwner, r as verifyObject, t as createProof, y as verifyJsonLd } from "./proof-CE8nwTF6.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-Zw0soD-7.js";
 import { InProcessMessageQueue, MemoryKvStore, ParallelMessageQueue } from "./federation/mod.js";
 import "./nodeinfo/mod.js";
 import "./runtime/mod.js";

package/dist/nodeinfo/handler.test.mjs

@@ -5,7 +5,7 @@ import { n as createRequestContext } from "../context-Juj6bdHC.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-DflMZha5.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { a as createFederation, h as handleNodeInfoJrd, m as handleNodeInfo } from "../middleware-DDM0j-X6.mjs";
+import { a as createFederation, h as handleNodeInfoJrd, m as handleNodeInfo } from "../middleware-BhYpLGA_.mjs";
 import { test } from "@fedify/fixture";
 //#region src/nodeinfo/handler.test.ts
 test("handleNodeInfo()", async () => {

package/dist/{owner-BI33UeIv.mjs → owner-R4ffU9Ht.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-D_rTMbAD.mjs";
-import { n as fetchActorDocument, s as verifyKeyOwnership, t as exportJwk } from "./key-1Gf85RN1.mjs";
+import { n as version, t as name } from "./deno--OYa_lxj.mjs";
+import { n as fetchActorDocument, s as verifyKeyOwnership, t as exportJwk } from "./key-D5e9c_yV.mjs";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{proof-vVwkNRv4.cjs → proof-BrreJTRF.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-DbDnj-Q7.cjs");
+const require_http = require("./http-CO_IVq7x.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");
@@ -300,24 +300,110 @@ function assertSafeJsonLd(jsonLd) {
 		}
 	}
 }
+const signatureTermDefinition = { "signature": "https://w3id.org/security#signature" };
+const signatureDefiningContexts = new Set(["https://w3id.org/identity/v1", "https://w3id.org/security/v1"]);
+const signatureFreeContexts = getSignatureFreeContexts();
+function getSignatureFreeContexts() {
+	const urls = /* @__PURE__ */ new Set();
+	for (const [url, document] of globalThis.Object.entries(_fedify_vocab_runtime.preloadedContexts)) {
+		if (typeof document !== "object" || document == null) continue;
+		const context = document["@context"];
+		if (typeof context !== "object" || context == null || Array.isArray(context)) continue;
+		const record = context;
+		if (!globalThis.Object.prototype.hasOwnProperty.call(record, "signature")) urls.add(url);
+	}
+	return urls;
+}
+function getContextEntryEffect(entry) {
+	if (entry == null) return "resets";
+	if (typeof entry === "string") {
+		if (signatureDefiningContexts.has(entry)) return "defines";
+		if (signatureFreeContexts.has(entry)) return "absent";
+		return "unknown";
+	}
+	if (typeof entry !== "object") return "absent";
+	const record = entry;
+	if (globalThis.Object.prototype.hasOwnProperty.call(record, "signature")) {
+		const definition = record["signature"];
+		const contextProtected = record["@protected"] === true;
+		const imported = globalThis.Object.prototype.hasOwnProperty.call(record, "@import");
+		if (definition == null) {
+			if (contextProtected) return "defines";
+			return imported ? "unknown" : "resets";
+		}
+		if (typeof definition === "object" && !Array.isArray(definition)) {
+			const term = definition;
+			const protectedTerm = contextProtected || term["@protected"] === true;
+			if (globalThis.Object.prototype.hasOwnProperty.call(term, "@id") && term["@id"] == null) {
+				if (protectedTerm) return "defines";
+				return imported ? "unknown" : "resets";
+			}
+		}
+		return "defines";
+	}
+	if (globalThis.Object.prototype.hasOwnProperty.call(record, "@import")) return "unknown";
+	return "absent";
+}
+function getSignatureTermState(context) {
+	if (context == null) return "absent";
+	if (!Array.isArray(context)) {
+		const effect = getContextEntryEffect(context);
+		return effect === "defines" ? "defined" : effect === "unknown" ? "unknown" : "absent";
+	}
+	let state = "absent";
+	for (const entry of context) {
+		const effect = getContextEntryEffect(entry);
+		if (effect === "defines") state = "defined";
+		else if (effect === "resets") state = "absent";
+		else if (effect === "unknown" && state !== "defined") state = "unknown";
+	}
+	return state;
+}
+function prepareSignatureDocument(jsonLd) {
+	if (typeof jsonLd !== "object" || jsonLd == null || Array.isArray(jsonLd)) return jsonLd;
+	const document = jsonLd;
+	if (document["proof"] != null) return { ...document };
+	const context = document["@context"];
+	if (getSignatureTermState(context) !== "absent") return { ...document };
+	const definition = { ...signatureTermDefinition };
+	return {
+		...document,
+		"@context": context == null ? [definition] : Array.isArray(context) ? [...context, definition] : [context, definition]
+	};
+}
 /**
 * Attaches a LD signature to the given JSON-LD document.
+*
+* When the document's context does not already define the `signature`
+* property, the returned document adds a minimal inline context for it.
+* Without that definition, expanding the attached signature would produce a
+* blank node predicate, which is not valid RDF.  Documents that already carry
+* a `proof` are left unchanged, since a new context definition would invalidate
+* the proof.  Documents whose context includes an unrecognized remote context
+* are also left unchanged, since that context may already define `signature`.
 * @param jsonLd The JSON-LD document to attach the signature to.  It is not
 *               modified.
 * @param signature The signature to attach.
 * @returns The JSON-LD document with the attached signature.
 * @throws {TypeError} If the input document is not a valid JSON-LD document.
+*                    Top-level arrays are rejected, since a Linked Data
+*                    Signature is attached to a single node.
 * @since 1.0.0
 */
 function attachSignature(jsonLd, signature) {
-	if (typeof jsonLd !== "object" || jsonLd == null) throw new TypeError("Failed to attach signature; invalid JSON-LD document.");
-	return {
-		...jsonLd,
-		signature
-	};
+	if (typeof jsonLd !== "object" || jsonLd == null || Array.isArray(jsonLd)) throw new TypeError("Failed to attach signature; invalid JSON-LD document.");
+	const output = prepareSignatureDocument(jsonLd);
+	output.signature = signature;
+	return output;
 }
 /**
 * Creates a LD signature for the given JSON-LD document.
+*
+* If the document's context does not define the `signature` property, the
+* signature is computed over the document with a minimal inline definition
+* added.  Use {@link attachSignature} to attach the signature to that exact
+* document.  Documents that already carry a `proof`, or whose context includes
+* an unrecognized remote context, are hashed unchanged.
 * @param jsonLd The JSON-LD document to sign.
 * @param privateKey The private key to sign the document.
 * @param keyId The ID of the public key that corresponds to the private key.
@@ -331,14 +417,17 @@ async function createSignature(jsonLd, privateKey, keyId, { contextLoader, creat
 	require_http.validateCryptoKey(privateKey, "private");
 	if (privateKey.algorithm.name !== "RSASSA-PKCS1-v1_5") throw new TypeError("Unsupported algorithm: " + privateKey.algorithm.name);
 	const options = {
-		"@context": "https://w3id.org/identity/v1",
 		creator: keyId.href,
 		created: created?.toString() ?? (/* @__PURE__ */ new Date()).toISOString()
 	};
-	const message = await hashJsonLd(options, contextLoader) + await hashJsonLd(jsonLd, contextLoader);
+	const message = await hashJsonLd({
+		"@context": "https://w3id.org/identity/v1",
+		...options
+	}, contextLoader) + await hashJsonLd(prepareSignatureDocument(jsonLd), contextLoader);
 	const messageBytes = new TextEncoder().encode(message);
 	const signature = await crypto.subtle.sign("RSASSA-PKCS1-v1_5", privateKey, messageBytes);
 	return {
+		"@context": "https://w3id.org/security/v1",
 		...options,
 		type: "RsaSignature2017",
 		signatureValue: (0, byte_encodings_base64.encodeBase64)(signature)
@@ -730,7 +819,10 @@ const logger = (0, _logtape_logtape.getLogger)([
 * @throws {TypeError} If the private key is invalid or unsupported.
 * @since 0.10.0
 */
-async function createProof(object, privateKey, keyId, { contextLoader, context, created } = {}) {
+async function createProof(object, privateKey, keyId, options = {}) {
+	return (await createProofInternal(object, privateKey, keyId, options)).proof;
+}
+async function createProofInternal(object, privateKey, keyId, { contextLoader, context, created } = {}) {
 	require_http.validateCryptoKey(privateKey, "private");
 	if (privateKey.algorithm.name !== "Ed25519") throw new TypeError("Unsupported algorithm: " + privateKey.algorithm.name);
 	const compactMsg = await object.clone({ proofs: [] }).toJsonLd({
@@ -757,13 +849,25 @@ async function createProof(object, privateKey, keyId, { contextLoader, context,
 	digest.set(new Uint8Array(proofDigest), 0);
 	digest.set(new Uint8Array(msgDigest), proofDigest.byteLength);
 	const sig = await crypto.subtle.sign("Ed25519", privateKey, digest);
-	return new _fedify_vocab.DataIntegrityProof({
-		cryptosuite: "eddsa-jcs-2022",
-		verificationMethod: keyId,
-		proofPurpose: "assertionMethod",
-		created: created ?? Temporal.Now.instant(),
-		proofValue: new Uint8Array(sig)
-	});
+	return {
+		proof: new _fedify_vocab.DataIntegrityProof({
+			cryptosuite: "eddsa-jcs-2022",
+			verificationMethod: keyId,
+			proofPurpose: "assertionMethod",
+			created: created ?? Temporal.Now.instant(),
+			proofValue: new Uint8Array(sig)
+		}),
+		jsonLd: compactMsg
+	};
+}
+function getJsonLdContextKey(value) {
+	const context = typeof value === "object" && value != null && !Array.isArray(value) ? value["@context"] ?? null : null;
+	return JSON.stringify(sortJsonKeys(context));
+}
+function sortJsonKeys(value) {
+	if (Array.isArray(value)) return value.map(sortJsonKeys);
+	if (typeof value !== "object" || value == null) return value;
+	return globalThis.Object.fromEntries(globalThis.Object.entries(value).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([key, item]) => [key, sortJsonKeys(item)]));
 }
 /**
 * Signs the given object with the private key and returns the signed object.
@@ -779,9 +883,18 @@ async function signObject(object, privateKey, keyId, options = {}) {
 	return await (options.tracerProvider ?? _opentelemetry_api.trace.getTracerProvider()).getTracer(require_http.name, require_http.version).startActiveSpan("object_integrity_proofs.sign", { attributes: { "activitypub.object.type": (0, _fedify_vocab.getTypeId)(object).href } }, async (span) => {
 		try {
 			if (object.id != null) span.setAttribute("activitypub.object.id", object.id.href);
+			const { proof, jsonLd } = await createProofInternal(object, privateKey, keyId, options);
 			const existingProofs = [];
-			for await (const proof of object.getProofs(options)) existingProofs.push(proof);
-			const proof = await createProof(object, privateKey, keyId, options);
+			let hasProofs = object.proofIds.length > 0;
+			if (!hasProofs) for await (const _ of object.getProofs(options)) {
+				hasProofs = true;
+				break;
+			}
+			if (hasProofs) {
+				let sameContext = true;
+				if (options.context == null) sameContext = getJsonLdContextKey(await object.toJsonLd({ contextLoader: options.contextLoader })) === getJsonLdContextKey(jsonLd);
+				if (sameContext) for await (const existingProof of object.getProofs(options)) existingProofs.push(existingProof);
+			}
 			if (span.isRecording()) {
 				if (proof.cryptosuite != null) span.setAttribute("object_integrity_proofs.cryptosuite", proof.cryptosuite);
 				if (proof.verificationMethodId != null) span.setAttribute("object_integrity_proofs.key_id", proof.verificationMethodId.href);