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

package/dist/sig/proof.test.mjs

@@ -6,7 +6,8 @@ import "../std__assert-DflMZha5.mjs";
 import { n as assertInstanceOf } from "../assert-BhQd8QHP.mjs";
 import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CCxRJhWa.mjs";
-import { i as verifyProof, n as signObject, r as verifyObject, t as createProof } from "../proof-Bf8rYD7r.mjs";
+import { f as signJsonLd, h as verifySignature, s as detachSignature } from "../ld-9qfz9rP_.mjs";
+import { i as verifyProof, n as signObject, r as verifyObject, t as createProof } from "../proof-CiBs9Q4l.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, DataIntegrityProof, Multikey, Note, Place } from "@fedify/vocab";
 import { decodeMultibase, importMultibaseKey } from "@fedify/vocab-runtime";
@@ -48,7 +49,7 @@ test("createProof()", async () => {
 	assertEquals(proof.verificationMethodId, ed25519PublicKey.id);
 	assertEquals(proof.proofPurpose, "assertionMethod");
 	console.log(encodeHex(proof.proofValue));
-	assertEquals(proof.proofValue, decodeHex("203e6afc5b7c6affe08d2d67ad100cc6cdcf1f5a438063d16766204956aa8fdd67cc04088ccf69de36225cab19377b5a032542fd2454b9b9dd001ffbdef5aa03"));
+	assertEquals(proof.proofValue, decodeHex("22c2d53f7ac073d2e4ee74c8ccec2bf01984740729e8e13d2b02e185e2d490abf82f809fa7347fce78e564a166d78beccd819e1a78414c7fd8aed59fa7aaa90d"));
 	assertEquals(proof.created, created);
 	assertEquals(await verifyProof(await create.toJsonLd({
 		format: "compact",
@@ -152,6 +153,48 @@ test("signObject()", async () => {
 		contextLoader: mockDocumentLoader
 	}), TypeError, "Unsupported algorithm");
 });
+test("signObject() migrates proofs from an older context", async () => {
+	const oldContext = [
+		"https://w3id.org/identity/v1",
+		"https://www.w3.org/ns/activitystreams",
+		"https://w3id.org/security/data-integrity/v1"
+	];
+	const oldJson = await (await signObject(new Create({
+		id: new URL("https://example.com/activities/1"),
+		actor: new URL("https://example.com/users/alice")
+	}), ed25519PrivateKey, ed25519Multikey.id, {
+		contextLoader: mockDocumentLoader,
+		context: oldContext
+	})).toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader,
+		context: oldContext
+	});
+	const json = await (await signObject(await Create.fromJsonLd(oldJson, {
+		contextLoader: mockDocumentLoader,
+		documentLoader: mockDocumentLoader
+	}), ed25519PrivateKey, ed25519Multikey.id, { contextLoader: mockDocumentLoader })).toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader
+	});
+	const proofs = Array.isArray(json.proof) ? json.proof : [json.proof];
+	assertEquals(proofs.length, 1);
+	assertEquals(proofs[0].verificationMethod, ed25519Multikey.id.href);
+});
+test("signObject() skips context comparison for proofless objects", async () => {
+	const activity = new Create({
+		id: new URL("https://example.com/activities/1"),
+		actor: new URL("https://example.com/users/alice")
+	});
+	let unformattedSerializations = 0;
+	const originalToJsonLd = activity.toJsonLd.bind(activity);
+	Object.defineProperty(activity, "toJsonLd", { value: async (options) => {
+		if (options?.format == null) unformattedSerializations++;
+		return await originalToJsonLd(options);
+	} });
+	await signObject(activity, ed25519PrivateKey, ed25519Multikey.id, { contextLoader: mockDocumentLoader });
+	assertEquals(unformattedSerializations, 0);
+});
 test("verifyProof()", async () => {
 	const cache = {};
 	const options = {
@@ -210,6 +253,32 @@ test("verifyProof()", async () => {
 	}, proof, options), null);
 	assertEquals(await verifyProof(jsonLd, proof.clone({ created: Temporal.Now.instant() }), options), null);
 });
+test("signJsonLd() does not invalidate an existing proof", async () => {
+	const options = {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	};
+	const note = new Note({
+		id: new URL("https://example.com/notes/1"),
+		attribution: new URL("https://example.com/users/alice"),
+		content: "Hello"
+	});
+	const proof = await createProof(note, ed25519PrivateKey, ed25519PublicKey.id, options);
+	const withProof = {
+		...await note.toJsonLd({
+			format: "compact",
+			contextLoader: mockDocumentLoader
+		}),
+		proof: await proof.toJsonLd({
+			format: "compact",
+			contextLoader: mockDocumentLoader
+		})
+	};
+	const signed = await signJsonLd(withProof, rsaPrivateKey2, rsaPublicKey2.id, options);
+	assertEquals(signed["@context"], withProof["@context"]);
+	assertEquals(await verifyProof(detachSignature(signed), proof, options), ed25519Multikey);
+	assertEquals(await verifySignature(signed, options), rsaPublicKey2);
+});
 test("verifyObject()", async () => {
 	const options = {
 		documentLoader: mockDocumentLoader,

package/dist/{temporal-D6JQXNOJ.mjs → temporal-Dd-J410Z.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { c as getNormalizationContextLoader } from "./ld-B0eNy8WK.mjs";
+import { c as getNormalizationContextLoader } from "./ld-9qfz9rP_.mjs";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 import { normalizeDateTimeLiteral } from "@fedify/vocab-runtime/temporal";
 //#region src/federation/temporal.ts

package/dist/utils/docloader.test.mjs

@@ -5,9 +5,9 @@ import { t as esm_default } from "../esm-DVILvP5e.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-DflMZha5.mjs";
 import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
-import { u as verifyRequest } from "../http-CUOxcDgn.mjs";
+import { u as verifyRequest } from "../http-C3d2DXwF.mjs";
 import { i as rsaPrivateKey2 } from "../keys-CCxRJhWa.mjs";
-import { n as getAuthenticatedDocumentLoader, t as createAuthenticatedDocumentLoader } from "../docloader-BxW_P_Rq.mjs";
+import { n as getAuthenticatedDocumentLoader, t as createAuthenticatedDocumentLoader } from "../docloader-BXR2f83H.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
 import { openDirectFetch, openPublicFetch } from "@fedify/vocab-runtime/internal";

package/dist/utils/mod.cjs

@@ -1,6 +1,6 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_kv_cache = require("../kv-cache-Di_SbH_3.cjs");
+const require_kv_cache = require("../kv-cache-BMlo_kyv.cjs");
 exports.getAuthenticatedDocumentLoader = require_kv_cache.getAuthenticatedDocumentLoader;
 exports.kvCache = require_kv_cache.kvCache;

package/dist/utils/mod.js

@@ -1,4 +1,4 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-C0MyXzft.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-Zw0soD-7.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.0.36-dev.2530+fb03bc56",
+  "version": "2.0.36-dev.2598+90504ae2",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -144,9 +144,9 @@
     "uri-template-router": "^1.0.0",
     "url-template": "^3.1.1",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab-runtime": "2.0.36-dev.2530+fb03bc56",
-    "@fedify/vocab": "2.0.36-dev.2530+fb03bc56",
-    "@fedify/webfinger": "2.0.36-dev.2530+fb03bc56"
+    "@fedify/vocab": "2.0.36-dev.2598+90504ae2",
+    "@fedify/vocab-runtime": "2.0.36-dev.2598+90504ae2",
+    "@fedify/webfinger": "2.0.36-dev.2598+90504ae2"
   },
   "devDependencies": {
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
@@ -159,7 +159,7 @@
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
     "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.0.36-dev.2530+fb03bc56"
+    "@fedify/vocab-tools": "^2.0.36-dev.2598+90504ae2"
   },
   "scripts": {
     "build:self": "tsdown",