@fedify/fedify 2.4.0-dev.1570 → 2.4.0-dev.1573

package/dist/sig/owner.test.mjs

@@ -6,7 +6,7 @@ import "../std__assert-Dh6uLf_q.mjs";
 import { r as assertFalse } from "../assert_rejects-DAdaaIWM.mjs";
 import { t as assert } from "../assert-DvVHoIZ0.mjs";
 import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-CSYsOMFG.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-gz4TUfKG.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-BuTQfsLw.mjs";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/sig/owner.test.ts

package/dist/sig/proof.test.mjs

@@ -8,10 +8,10 @@ import { t as assertInstanceOf } from "../assert_instance_of-CxoC8bVq.mjs";
 import { t as assert } from "../assert-DvVHoIZ0.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CSYsOMFG.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-BNL8AC14.mjs";
-import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-CuQpZ_AT.mjs";
+import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-CYRfoVyl.mjs";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
-import { decodeMultibase, importMultibaseKey } from "@fedify/vocab-runtime";
+import { decodeMultibase, exportDidKey, exportMultibaseKey, importMultibaseKey, parseIri } from "@fedify/vocab-runtime";
 import { decodeHex } from "byte-encodings/hex";
 //#region src/sig/proof.test.ts
 const fep8b32TestVectorPrivateKey = await crypto.subtle.importKey("jwk", {
@@ -326,6 +326,66 @@ test("verifyProof()", async () => {
 	}), null);
 	assertFalse(contextLoaderCalls.includes("https://attacker.example/ctx"));
 });
+test("verifyProof() resolves did:key verification methods locally", async () => {
+	const multibaseKey = (await exportDidKey(ed25519PublicKey.publicKey)).slice(8);
+	const did = `did:key:${multibaseKey}`;
+	const keyId = new URL(`${did}#${multibaseKey}`);
+	const created = Temporal.Instant.from("2023-02-24T23:36:38Z");
+	const note = new Note({
+		id: parseIri(`ap://did:key:${multibaseKey}/objects/1`),
+		attribution: parseIri(`ap://did:key:${multibaseKey}/actor`),
+		content: "Portable hello"
+	});
+	const proof = await createProof(note, ed25519PrivateKey, keyId, {
+		created,
+		contextLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	});
+	const jsonLd = await note.toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	});
+	let documentLoaderCalls = 0;
+	assertEquals(await verifyProof(jsonLd, proof, {
+		contextLoader: mockDocumentLoader,
+		documentLoader() {
+			documentLoaderCalls++;
+			throw new TypeError("did:key must not use the document loader");
+		}
+	}), new Multikey({
+		id: keyId,
+		controller: new URL(did),
+		publicKey: ed25519PublicKey.publicKey
+	}));
+	assertEquals(documentLoaderCalls, 0);
+	const tampered = { ...jsonLd };
+	tampered.content = "Portable goodbye";
+	assertEquals(await verifyProof(tampered, proof, {
+		contextLoader: mockDocumentLoader,
+		documentLoader() {
+			throw new TypeError("did:key must not use the document loader");
+		}
+	}), null);
+	assertEquals(await verifyProof(jsonLd, proof.clone({ verificationMethod: new URL(`${did}#z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK`) }), {
+		contextLoader: mockDocumentLoader,
+		documentLoader() {
+			throw new TypeError("did:key must not use the document loader");
+		}
+	}), null);
+	const unsupportedMultibaseKey = await exportMultibaseKey(rsaPublicKey2.publicKey);
+	const unsupportedDid = `did:key:${unsupportedMultibaseKey}`;
+	const unsupportedProof = proof.clone({ verificationMethod: new URL(`${unsupportedDid}#${unsupportedMultibaseKey}`) });
+	let unsupportedDocumentLoaderCalls = 0;
+	assertEquals(await verifyProof(jsonLd, unsupportedProof, {
+		contextLoader: mockDocumentLoader,
+		documentLoader() {
+			unsupportedDocumentLoaderCalls++;
+			throw new TypeError("did:key must not use the document loader");
+		}
+	}), null);
+	assertEquals(unsupportedDocumentLoaderCalls, 0);
+});
 test("verifyProof() records verification duration metric", async (t) => {
 	const jsonLd = {
 		"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"],

package/dist/{temporal-CvVMrvJJ.mjs → temporal-uleCkDIj.mjs}

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

package/dist/utils/docloader.test.mjs

@@ -5,9 +5,9 @@ import { t as esm_default } from "../esm-vrlUxr60.mjs";
 import { t as assertEquals } from "../assert_equals-PBVKNMJd.mjs";
 import "../std__assert-Dh6uLf_q.mjs";
 import { t as assertRejects } from "../assert_rejects-DAdaaIWM.mjs";
-import { l as verifyRequest } from "../http-JdRPUYku.mjs";
+import { l as verifyRequest } from "../http-Bz2dzdDd.mjs";
 import { i as rsaPrivateKey2 } from "../keys-CSYsOMFG.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-CuFH35j1.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-B3zJcGV1.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { UrlError } from "@fedify/vocab-runtime";
 //#region src/utils/docloader.test.ts

package/dist/utils/kv-cache.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as kvCache, t as MockKvStore } from "../kv-cache-CM7w20U5.mjs";
+import { n as kvCache, t as MockKvStore } from "../kv-cache-DCxdceYC.mjs";
 import { deepStrictEqual, throws } from "node:assert";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { preloadedContexts } from "@fedify/vocab-runtime";

package/dist/utils/mod.cjs

@@ -1,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-C3rqzQvu.cjs");
+const require_kv_cache = require("../kv-cache-FrvAhESd.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-DSWq2JHU.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-CtSufpZ1.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.4.0-dev.1570+f1b6aaa3",
+  "version": "2.4.0-dev.1573+246bd0b2",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -151,10 +151,10 @@
     "jsonld": "^9.0.0",
     "structured-field-values": "^2.0.4",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab": "2.4.0-dev.1570+f1b6aaa3",
-    "@fedify/vocab-runtime": "2.4.0-dev.1570+f1b6aaa3",
-    "@fedify/uri-template": "2.4.0-dev.1570+f1b6aaa3",
-    "@fedify/webfinger": "2.4.0-dev.1570+f1b6aaa3"
+    "@fedify/vocab": "2.4.0-dev.1573+246bd0b2",
+    "@fedify/webfinger": "2.4.0-dev.1573+246bd0b2",
+    "@fedify/uri-template": "2.4.0-dev.1573+246bd0b2",
+    "@fedify/vocab-runtime": "2.4.0-dev.1573+246bd0b2"
   },
   "devDependencies": {
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
@@ -167,7 +167,7 @@
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
     "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.4.0-dev.1570+f1b6aaa3"
+    "@fedify/vocab-tools": "^2.4.0-dev.1573+246bd0b2"
   },
   "scripts": {
     "build:self": "tsdown",