@fedify/fedify 2.4.0-dev.1583 → 2.4.0-dev.1618

package/dist/sig/key.test.mjs

@@ -1,12 +1,12 @@
-import "@js-temporal/polyfill";
+import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-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 { t as assertThrows } from "../assert_throws-zN79lgIC.mjs";
-import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-BBKNHoB9.mjs";
-import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CSYsOMFG.mjs";
+import { t as assertEquals } from "../assert_equals-BV7oLMxm.mjs";
+import "../std__assert-B2NnY9bq.mjs";
+import { t as assertRejects } from "../assert_rejects-EgstcQy5.mjs";
+import { t as assertThrows } from "../assert_throws-NiFfqbnH.mjs";
+import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-C3t-PS3M.mjs";
+import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-Dbyd7bhl.mjs";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, exportDidKey } from "@fedify/vocab-runtime";

package/dist/sig/ld.test.d.mts

@@ -1,2 +1,2 @@
-import { Temporal } from "@js-temporal/polyfill";
+import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";

package/dist/sig/ld.test.mjs

@@ -1,13 +1,13 @@
-import "@js-temporal/polyfill";
+import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-PBVKNMJd.mjs";
-import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-DAdaaIWM.mjs";
-import { t as assertThrows } from "../assert_throws-zN79lgIC.mjs";
-import { t as assert } from "../assert-DvVHoIZ0.mjs";
-import { i as generateCryptoKeyPair } from "../key-BBKNHoB9.mjs";
-import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CSYsOMFG.mjs";
-import { 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-DLyXLPDS.mjs";
+import { t as assertEquals } from "../assert_equals-BV7oLMxm.mjs";
+import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-EgstcQy5.mjs";
+import { t as assertThrows } from "../assert_throws-NiFfqbnH.mjs";
+import { t as assert } from "../assert-CJ1KXcvv.mjs";
+import { i as generateCryptoKeyPair } from "../key-C3t-PS3M.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-Dbyd7bhl.mjs";
+import { 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-D8wAPjxC.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { encodeBase64 } from "byte-encodings/base64";

package/dist/sig/mod.cjs

@@ -1,8 +1,7 @@
-const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_http = require("../http-jCq51U37.cjs");
-const require_proof = require("../proof-DkeR_Fsm.cjs");
+const require_http = require("../http-D5ylizT7.cjs");
+const require_proof = require("../proof-DcOiiLDF.cjs");
 exports.attachSignature = require_proof.attachSignature;
 exports.createProof = require_proof.createProof;
 exports.createSignature = require_proof.createSignature;

package/dist/sig/mod.js

@@ -1,5 +1,5 @@
-import { Temporal } from "@js-temporal/polyfill";
+import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { A as formatAcceptSignature, M as parseAcceptSignature, N as validateAcceptSignature, a as verifyRequestDetailed, c as fetchKeyDetailed, i as verifyRequest, j as fulfillAcceptSignature, l as generateCryptoKeyPair, o as exportJwk, r as signRequest, s as fetchKey, u as importJwk } from "../http-CphHLbTC.js";
-import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "../proof-IDHRILpm.js";
+import { A as formatAcceptSignature, M as parseAcceptSignature, N as validateAcceptSignature, a as verifyRequestDetailed, c as fetchKeyDetailed, i as verifyRequest, j as fulfillAcceptSignature, l as generateCryptoKeyPair, o as exportJwk, r as signRequest, s as fetchKey, u as importJwk } from "../http-DD07Erm7.js";
+import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "../proof--HiDnLAE.js";
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, hasProofLike, hasSignatureLike, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/owner.test.d.mts

@@ -1,2 +1,2 @@
-import { Temporal } from "@js-temporal/polyfill";
+import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";

package/dist/sig/owner.test.mjs

@@ -1,12 +1,12 @@
-import "@js-temporal/polyfill";
+import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-PBVKNMJd.mjs";
-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-BukzQW4T.mjs";
+import { t as assertEquals } from "../assert_equals-BV7oLMxm.mjs";
+import "../std__assert-B2NnY9bq.mjs";
+import { r as assertFalse } from "../assert_rejects-EgstcQy5.mjs";
+import { t as assert } from "../assert-CJ1KXcvv.mjs";
+import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-Dbyd7bhl.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-BjdNNmKF.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.d.mts

@@ -1,2 +1,2 @@
-import { Temporal } from "@js-temporal/polyfill";
+import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";

package/dist/sig/proof.test.mjs

@@ -1,14 +1,14 @@
-import { Temporal } from "@js-temporal/polyfill";
+import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-PBVKNMJd.mjs";
-import "../std__assert-Dh6uLf_q.mjs";
-import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-DAdaaIWM.mjs";
-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-BVglyYRW.mjs";
+import { t as assertEquals } from "../assert_equals-BV7oLMxm.mjs";
+import "../std__assert-B2NnY9bq.mjs";
+import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-EgstcQy5.mjs";
+import { t as assertInstanceOf } from "../assert_instance_of-Q9KTBnrf.mjs";
+import { t as assert } from "../assert-CJ1KXcvv.mjs";
+import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-Dbyd7bhl.mjs";
+import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-URuqsICz.mjs";
+import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-1Xy5Ur-T.mjs";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { decodeMultibase, exportDidKey, exportMultibaseKey, importMultibaseKey, parseIri } from "@fedify/vocab-runtime";
@@ -590,5 +590,142 @@ test("verifyObject()", async () => {
 	assertInstanceOf(note, Note);
 	assertEquals(note.content, "Hello world");
 });
+test("verifyObject() accepts did:key proofs for matching portable attribution origin", async () => {
+	const did = await exportDidKey(ed25519PublicKey.publicKey);
+	const keyId = new URL(`${did}#${did.substring(8)}`);
+	const verified = await verifyObject(Note, await (await signObject(new Note({
+		id: parseIri(`ap://did:key:${did.substring(8)}/objects/1`),
+		attribution: parseIri(`ap://did:key:${did.substring(8)}/actor`),
+		content: "Portable note"
+	}), ed25519PrivateKey, keyId, {
+		contextLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	})).toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	}), {
+		documentLoader() {
+			throw new TypeError("did:key must not use the document loader");
+		},
+		contextLoader: mockDocumentLoader
+	});
+	assertInstanceOf(verified, Note);
+	assertEquals(verified.content, "Portable note");
+});
+test("verifyObject() accepts multiple portable attributions from the same did:key origin", async () => {
+	const did = await exportDidKey(ed25519PublicKey.publicKey);
+	const method = did.substring(8);
+	const keyId = new URL(`${did}#${method}`);
+	const verified = await verifyObject(Create, await (await signObject(new Create({
+		id: parseIri(`ap://did:key:${method}/activities/1`),
+		actor: parseIri(`ap://did:key:${method}/actor`),
+		attribution: parseIri(`ap://did:key:${method}/profile`),
+		object: new Note({
+			id: parseIri(`ap://did:key:${method}/objects/1`),
+			content: "Portable note"
+		})
+	}), ed25519PrivateKey, keyId, {
+		contextLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	})).toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	}), {
+		documentLoader() {
+			throw new TypeError("did:key must not use the document loader");
+		},
+		contextLoader: mockDocumentLoader
+	});
+	assertInstanceOf(verified, Create);
+	assertEquals(verified.actorId, parseIri(`ap://did:key:${method}/actor`));
+	assertEquals(verified.attributionId, parseIri(`ap://did:key:${method}/profile`));
+});
+test("verifyObject() rejects HTTPS keys claiming a portable DID controller", async () => {
+	const victimDid = "did:key:z6MkVictim";
+	const keyId = new URL("https://attacker.example/keys/ed25519");
+	assertEquals(await verifyObject(Note, await (await signObject(new Note({
+		id: parseIri("ap://did:key:z6MkVictim/objects/1"),
+		attribution: parseIri("ap://did:key:z6MkVictim/actor"),
+		content: "Spoofed portable note"
+	}), ed25519PrivateKey, keyId, {
+		contextLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	})).toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	}), {
+		documentLoader: async (url) => {
+			if (url === keyId.href) return {
+				documentUrl: url,
+				contextUrl: null,
+				document: {
+					"@context": "https://w3id.org/security/multikey/v1",
+					id: keyId.href,
+					type: "Multikey",
+					controller: victimDid,
+					publicKeyMultibase: await exportMultibaseKey(ed25519PublicKey.publicKey)
+				}
+			};
+			throw new TypeError(`Unexpected fetch: ${url}`);
+		},
+		contextLoader: mockDocumentLoader
+	}), null);
+});
+test("verifyObject() rejects HTTPS keys claiming an exact DID attribution", async () => {
+	const victimDid = "did:key:z6MkVictim";
+	const keyId = new URL("https://attacker.example/keys/ed25519");
+	assertEquals(await verifyObject(Note, await (await signObject(new Note({
+		id: parseIri("ap://did:key:z6MkVictim/objects/1"),
+		attribution: new URL(victimDid),
+		content: "Spoofed DID-attributed note"
+	}), ed25519PrivateKey, keyId, {
+		contextLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	})).toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	}), {
+		documentLoader: async (url) => {
+			if (url === keyId.href) return {
+				documentUrl: url,
+				contextUrl: null,
+				document: {
+					"@context": "https://w3id.org/security/multikey/v1",
+					id: keyId.href,
+					type: "Multikey",
+					controller: victimDid,
+					publicKeyMultibase: await exportMultibaseKey(ed25519PublicKey.publicKey)
+				}
+			};
+			throw new TypeError(`Unexpected fetch: ${url}`);
+		},
+		contextLoader: mockDocumentLoader
+	}), null);
+});
+test("verifyObject() rejects did:key proofs from another portable attribution origin", async () => {
+	const did = await exportDidKey(ed25519PublicKey.publicKey);
+	const keyId = new URL(`${did}#${did.substring(8)}`);
+	assertEquals(await verifyObject(Note, await (await signObject(new Note({
+		id: parseIri(`ap://did:key:${did.substring(8)}/objects/1`),
+		attribution: parseIri("ap://did:key:z6MkOther/actor"),
+		content: "Portable note"
+	}), ed25519PrivateKey, keyId, {
+		contextLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	})).toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	}), {
+		documentLoader() {
+			throw new TypeError("did:key must not use the document loader");
+		},
+		contextLoader: mockDocumentLoader
+	}), null);
+});
 //#endregion
 export {};

package/dist/{std__assert-Dh6uLf_q.mjs → std__assert-B2NnY9bq.mjs}

@@ -1,10 +1,10 @@
-import "@js-temporal/polyfill";
+import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { l as AssertionError, s as format } from "./assert_equals-PBVKNMJd.mjs";
-import "./assert_rejects-DAdaaIWM.mjs";
-import "./assert_throws-zN79lgIC.mjs";
-import "./assert_strict_equals-BzqyKuYL.mjs";
+import { l as AssertionError, s as format } from "./assert_equals-BV7oLMxm.mjs";
+import "./assert_rejects-EgstcQy5.mjs";
+import "./assert_throws-NiFfqbnH.mjs";
+import "./assert_strict_equals-Ec20AUwa.mjs";
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_exists.js
 /**
 * Make an assertion that actual is not null or undefined.