@fedify/fedify 2.1.23 → 2.1.25

package/dist/sig/accept.test.mjs

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature, t as formatAcceptSignature } from "../accept-Dd__NiUL.mjs";
+import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature, t as formatAcceptSignature } from "../accept-BavzedPB.mjs";
 import { test } from "@fedify/fixture";
 import { deepStrictEqual, strictEqual } from "node:assert/strict";
 //#region src/sig/accept.test.ts

package/dist/sig/http.test.mjs

@@ -3,13 +3,13 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-DVILvP5e.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { a as assertExists, t as assertStringIncludes } from "../std__assert-Duiq_YC9.mjs";
+import { i as assertExists, t as assertStringIncludes } from "../std__assert-BUOJXi-Z.mjs";
 import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
+import { t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { t as exportJwk } from "../key-DywPPmb0.mjs";
-import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-DIh9_s_-.mjs";
-import { i as rsaPrivateKey2, l as rsaPublicKey5, o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-BAK-tUlf.mjs";
+import { t as exportJwk } from "../key-x9f-H7eO.mjs";
+import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-B5qAeoJd.mjs";
+import { i as rsaPrivateKey2, l as rsaPublicKey5, o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-CtZLJq76.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, exportSpki } from "@fedify/vocab-runtime";
 import { encodeBase64 } from "byte-encodings/base64";
@@ -421,6 +421,46 @@ test("verifyRequest() [rfc9421] successful GET verification", async () => {
 		currentTime: Temporal.Instant.from(`${(/* @__PURE__ */ new Date(currentTimestamp * 1e3)).toISOString()}`)
 	}), rsaPublicKey2, "Valid signature should verify to the correct public key");
 });
+for (const failure of [
+	"missing key",
+	"invalid signature",
+	"digest mismatch",
+	"empty body",
+	"cached key"
+]) test(`verifyRequest() [rfc9421] multiple POST signatures: ${failure}`, async () => {
+	const body = failure === "empty body" ? "" : "Hello, world!";
+	const currentTime = Temporal.Instant.from("2024-03-05T08:09:44Z");
+	const signed = await signRequest(new Request("https://example.com/inbox", {
+		method: "POST",
+		body
+	}), rsaPrivateKey2, new URL("https://example.com/key2"), {
+		spec: "rfc9421",
+		currentTime
+	});
+	const input = signed.headers.get("Signature-Input");
+	const signature = signed.headers.get("Signature");
+	const firstInput = failure === "missing key" ? input.replace("https://example.com/key2", "https://example.com/missing-key") : input;
+	signed.headers.set("Signature-Input", `${firstInput}, ${input.replace(/^sig1=/, "sig2=")}`);
+	signed.headers.set("Signature", `sig1=:AAAAAA==:, ${signature.replace(/^sig1=/, "sig2=")}`);
+	const request = failure === "digest mismatch" ? new Request(signed, { body: "Tampered body" }) : signed;
+	const loaded = [];
+	assertEquals(await verifyRequest(request, {
+		keyCache: failure === "cached key" ? {
+			get: () => Promise.resolve(rsaPublicKey1),
+			set: async () => {}
+		} : void 0,
+		spec: "rfc9421",
+		currentTime,
+		contextLoader: mockDocumentLoader,
+		documentLoader: (url, options) => {
+			loaded.push(url);
+			return mockDocumentLoader(url, options);
+		}
+	}), failure === "digest mismatch" ? null : rsaPublicKey2);
+	assertEquals(loaded, failure === "digest mismatch" ? [] : failure === "missing key" ? ["https://example.com/missing-key", "https://example.com/key2"] : ["https://example.com/key2", "https://example.com/key2"]);
+	assertFalse(request.bodyUsed);
+	assertEquals(await request.text(), failure === "digest mismatch" ? "Tampered body" : body);
+});
 test("verifyRequest() [rfc9421] manual POST verification", async () => {
 	const currentTimestamp = 1709626184;
 	const currentTime = Temporal.Instant.from("2024-03-05T08:09:44Z");

package/dist/sig/key.test.mjs

@@ -2,11 +2,12 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-BUOJXi-Z.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
+import { t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-DywPPmb0.mjs";
-import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
+import { a as generateCryptoKeyPair, i as fetchKeyDetailed, o as importJwk, r as fetchKey, s as validateCryptoKey, t as exportJwk } from "../key-x9f-H7eO.mjs";
+import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CtZLJq76.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 import { FetchError } from "@fedify/vocab-runtime";
@@ -267,7 +268,7 @@ test("fetchKeyDetailed()", async () => {
 		key: rsaPublicKey1,
 		cached: false
 	});
-	assertEquals(documentLoaderCalls, 1);
+	assertEquals(documentLoaderCalls, 2);
 	const spans = exporter.getSpans("activitypub.fetch_key");
 	assertEquals(spans.length, 2);
 	assertEquals(spans[0].attributes["activitypub.actor.key.cached"], true);
@@ -398,5 +399,171 @@ test("fetchKey() returns null for a malformed actor publicKey", async () => {
 		cached: true
 	});
 });
+test("fetchKey() rejects a key whose owner does not link back", async () => {
+	const keyId = "https://attacker.example/key";
+	const keyDocument = await rsaPublicKey1.toJsonLd({ contextLoader: mockDocumentLoader });
+	const serveKeyOwnedBy = (owner) => ({
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					...keyDocument,
+					id: keyId,
+					owner
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	});
+	assertEquals(await fetchKey(keyId, CryptographicKey, serveKeyOwnedBy("https://example.com/person")), {
+		key: null,
+		cached: false
+	});
+	assertEquals(await fetchKey(keyId, CryptographicKey, serveKeyOwnedBy("https://impersonated.invalid/users/victim")), {
+		key: null,
+		cached: false
+	});
+});
+test("fetchKey() rejects a Multikey whose controller does not link back", async () => {
+	const keyId = "https://attacker.example/multikey";
+	const keyDocument = await ed25519Multikey.toJsonLd({ contextLoader: mockDocumentLoader });
+	assertEquals(await fetchKey(keyId, Multikey, {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					...keyDocument,
+					id: keyId,
+					controller: "https://example.com/person2"
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	}), {
+		key: null,
+		cached: false
+	});
+});
+test("fetchKey() rejects an actor document from another origin", async () => {
+	const keyId = "https://attacker.example/key";
+	const impersonated = "https://example.com/person";
+	const { publicKeyPem } = await rsaPublicKey1.toJsonLd({ contextLoader: mockDocumentLoader });
+	assertEquals(await fetchKey(keyId, CryptographicKey, {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: impersonated,
+					type: "Person",
+					publicKey: [{
+						id: `${impersonated}#main-key`,
+						type: "CryptographicKey",
+						owner: impersonated,
+						publicKeyPem
+					}]
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	}), {
+		key: null,
+		cached: false
+	});
+});
+test("fetchKey() rejects a key that disowns the actor document holding it", async () => {
+	const actorId = "https://attacker.example/actor";
+	const keyId = `${actorId}#main-key`;
+	const { publicKeyPem } = await rsaPublicKey1.toJsonLd({ contextLoader: mockDocumentLoader });
+	assertEquals(await fetchKey(keyId, CryptographicKey, {
+		documentLoader(resource) {
+			if (resource === keyId || resource === actorId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: actorId,
+					type: "Person",
+					publicKey: [{
+						id: keyId,
+						type: "CryptographicKey",
+						owner: "https://example.com/person",
+						publicKeyPem
+					}]
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	}), {
+		key: null,
+		cached: false
+	});
+});
+test("fetchKey() records the owner its actor document establishes", async () => {
+	const { key } = await fetchKey("https://example.com/users/handle#main-key", CryptographicKey, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	assertEquals(key?.ownerId, new URL("https://example.com/users/handle"));
+});
+test("fetchKey() accepts a key document that leaves its id implicit", async () => {
+	const keyId = "https://example.com/key";
+	const keyDocument = await rsaPublicKey1.toJsonLd({ contextLoader: mockDocumentLoader });
+	delete keyDocument.id;
+	const { key } = await fetchKey(keyId, CryptographicKey, {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: keyDocument
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	});
+	assertEquals(key?.id, new URL(keyId));
+	assertEquals(key?.ownerId, new URL("https://example.com/person"));
+	assert(key?.publicKey != null);
+});
+test("fetchKey() records the controller an actor document establishes", async () => {
+	const actorId = "https://example.com/multikey-actor";
+	const keyId = `${actorId}#assertion`;
+	const { publicKeyMultibase } = await ed25519Multikey.toJsonLd({ contextLoader: mockDocumentLoader });
+	const { key } = await fetchKey(keyId, Multikey, {
+		documentLoader(resource) {
+			if (resource === actorId || resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: actorId,
+				document: {
+					"@context": [
+						"https://www.w3.org/ns/activitystreams",
+						"https://w3id.org/security/v1",
+						"https://w3id.org/security/multikey/v1",
+						"https://w3id.org/security/data-integrity/v1",
+						"https://www.w3.org/ns/did/v1"
+					],
+					id: actorId,
+					type: "Person",
+					assertionMethod: [{
+						id: keyId,
+						type: "Multikey",
+						publicKeyMultibase
+					}]
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	});
+	assertEquals(key?.controllerId, new URL(actorId));
+	assert(key?.publicKey != null);
+});
 //#endregion
 export {};

package/dist/sig/ld.test.mjs

@@ -3,16 +3,19 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
+import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { i as generateCryptoKeyPair } from "../key-DywPPmb0.mjs";
-import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { a as compactJsonLd, d as isInvalidUrlTypeError, f as signJsonLd, h as verifySignature, i as attachSignature, m as verifyJsonLd, n as UnsafeJsonLdError, o as createSignature, s as detachSignature } from "../ld-Ch6FVq7X.mjs";
+import { a as generateCryptoKeyPair } from "../key-x9f-H7eO.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CtZLJq76.mjs";
+import { a as compactJsonLd, d as isInvalidUrlTypeError, f as signJsonLd, h as verifySignature, i as attachSignature, m as verifyJsonLd, n as UnsafeJsonLdError, o as createSignature, s as detachSignature } from "../ld-cfUwoi0C.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { CryptographicKey } from "@fedify/vocab";
 import { encodeBase64 } from "byte-encodings/base64";
 //#region src/sig/ld.test.ts
 test("isInvalidUrlTypeError()", () => {
+	assert(isInvalidUrlTypeError(/* @__PURE__ */ new TypeError("Invalid URL string.")));
+	assertFalse(isInvalidUrlTypeError(/* @__PURE__ */ new Error("Invalid URL string.")));
+	assertFalse(isInvalidUrlTypeError(/* @__PURE__ */ new TypeError("Invalid URL string. Other error")));
 	assert(isInvalidUrlTypeError(/* @__PURE__ */ new TypeError("Invalid URL: http://[")));
 	assert(isInvalidUrlTypeError(/* @__PURE__ */ new TypeError("\"http://[\" cannot be parsed as a URL.")));
 	const error = /* @__PURE__ */ new TypeError("Failed to parse URL");
@@ -763,5 +766,57 @@ test("compactJsonLd() rejects inputs that compact into @graph wrappers", async (
 		content: "two"
 	}], mockDocumentLoader), UnsafeJsonLdError, "Unsupported JSON-LD keyword: @graph.");
 });
+test("verifyJsonLd() rejects a key that claims a forged owner", async () => {
+	const keyId = new URL("https://attacker.example/key");
+	const impersonated = "https://example.com/person";
+	const { publicKeyPem } = await rsaPublicKey2.toJsonLd({ contextLoader: mockDocumentLoader });
+	const signed = await signJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		id: "https://attacker.example/activities/1",
+		type: "Create",
+		actor: impersonated
+	}, rsaPrivateKey2, keyId, { contextLoader: mockDocumentLoader });
+	const serveKeyOwnedBy = (owner) => (resource) => {
+		if (resource === keyId.href) return Promise.resolve({
+			contextUrl: null,
+			documentUrl: resource,
+			document: {
+				"@context": "https://w3id.org/security/v1",
+				id: keyId.href,
+				type: "CryptographicKey",
+				owner,
+				publicKeyPem
+			}
+		});
+		if (resource === "https://attacker.example/actor") return Promise.resolve({
+			contextUrl: null,
+			documentUrl: resource,
+			document: {
+				"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+				id: resource,
+				type: "Person",
+				publicKey: [keyId.href]
+			}
+		});
+		return mockDocumentLoader(resource);
+	};
+	assertEquals(await verifySignature(signed, {
+		documentLoader: serveKeyOwnedBy(impersonated),
+		contextLoader: mockDocumentLoader
+	}), null);
+	assertFalse(await verifyJsonLd(signed, {
+		documentLoader: serveKeyOwnedBy(impersonated),
+		contextLoader: mockDocumentLoader
+	}));
+	const honestLoader = serveKeyOwnedBy("https://attacker.example/actor");
+	assertInstanceOf(await verifySignature(signed, {
+		documentLoader: honestLoader,
+		contextLoader: mockDocumentLoader
+	}), CryptographicKey);
+	assertFalse(await verifyJsonLd(signed, {
+		documentLoader: honestLoader,
+		contextLoader: mockDocumentLoader
+	}));
+});
 //#endregion
 export {};

package/dist/sig/mod.cjs

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

package/dist/sig/mod.d.cts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { C as exportJwk, D as importJwk, E as generateCryptoKeyPair, S as KeyCache, T as fetchKeyDetailed, _ as validateAcceptSignature, a as VerifyRequestDetailedResult, b as FetchKeyOptions, c as signRequest, d as AcceptSignatureMember, f as AcceptSignatureParameters, g as parseAcceptSignature, h as fulfillAcceptSignature, i as SignRequestOptions, l as verifyRequest, m as formatAcceptSignature, n as HttpMessageSignaturesSpecDeterminer, o as VerifyRequestFailureReason, p as FulfillAcceptSignatureResult, r as Rfc9421SignRequestOptions, s as VerifyRequestOptions, t as HttpMessageSignaturesSpec, u as verifyRequestDetailed, v as FetchKeyDetailedResult, w as fetchKey, x as FetchKeyResult, y as FetchKeyErrorResult } from "../http-C87EWkO0.cjs";
-import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "../owner-DEvZuyOE.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-D5YlzzP3.cjs";
+import { C as exportJwk, D as importJwk, E as generateCryptoKeyPair, S as KeyCache, T as fetchKeyDetailed, _ as validateAcceptSignature, a as VerifyRequestDetailedResult, b as FetchKeyOptions, c as signRequest, d as AcceptSignatureMember, f as AcceptSignatureParameters, g as parseAcceptSignature, h as fulfillAcceptSignature, i as SignRequestOptions, l as verifyRequest, m as formatAcceptSignature, n as HttpMessageSignaturesSpecDeterminer, o as VerifyRequestFailureReason, p as FulfillAcceptSignatureResult, r as Rfc9421SignRequestOptions, s as VerifyRequestOptions, t as HttpMessageSignaturesSpec, u as verifyRequestDetailed, v as FetchKeyDetailedResult, w as fetchKey, x as FetchKeyResult, y as FetchKeyErrorResult } from "../http-DqZhyEso.cjs";
+import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "../owner-B3hNQCG8.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-DiuFTYUt.cjs";
 export { AcceptSignatureMember, AcceptSignatureParameters, CreateProofOptions, CreateSignatureOptions, DoesActorOwnKeyOptions, FetchKeyDetailedResult, FetchKeyErrorResult, FetchKeyOptions, FetchKeyResult, FulfillAcceptSignatureResult, GetKeyOwnerOptions, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, Rfc9421SignRequestOptions, SignJsonLdOptions, SignObjectOptions, SignRequestOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyProofOptions, VerifyRequestDetailedResult, VerifyRequestFailureReason, VerifyRequestOptions, VerifySignatureOptions, attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/mod.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { C as exportJwk, D as importJwk, E as generateCryptoKeyPair, S as KeyCache, T as fetchKeyDetailed, _ as validateAcceptSignature, a as VerifyRequestDetailedResult, b as FetchKeyOptions, c as signRequest, d as AcceptSignatureMember, f as AcceptSignatureParameters, g as parseAcceptSignature, h as fulfillAcceptSignature, i as SignRequestOptions, l as verifyRequest, m as formatAcceptSignature, n as HttpMessageSignaturesSpecDeterminer, o as VerifyRequestFailureReason, p as FulfillAcceptSignatureResult, r as Rfc9421SignRequestOptions, s as VerifyRequestOptions, t as HttpMessageSignaturesSpec, u as verifyRequestDetailed, v as FetchKeyDetailedResult, w as fetchKey, x as FetchKeyResult, y as FetchKeyErrorResult } from "../http-BDZeS5om.js";
-import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "../owner-CnngXDNJ.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-CjiK2zrW.js";
+import { C as exportJwk, D as importJwk, E as generateCryptoKeyPair, S as KeyCache, T as fetchKeyDetailed, _ as validateAcceptSignature, a as VerifyRequestDetailedResult, b as FetchKeyOptions, c as signRequest, d as AcceptSignatureMember, f as AcceptSignatureParameters, g as parseAcceptSignature, h as fulfillAcceptSignature, i as SignRequestOptions, l as verifyRequest, m as formatAcceptSignature, n as HttpMessageSignaturesSpecDeterminer, o as VerifyRequestFailureReason, p as FulfillAcceptSignatureResult, r as Rfc9421SignRequestOptions, s as VerifyRequestOptions, t as HttpMessageSignaturesSpec, u as verifyRequestDetailed, v as FetchKeyDetailedResult, w as fetchKey, x as FetchKeyResult, y as FetchKeyErrorResult } from "../http-Dl00HXr4.js";
+import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "../owner-CiBPcC6F.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-BLDHhuW0.js";
 export { AcceptSignatureMember, AcceptSignatureParameters, CreateProofOptions, CreateSignatureOptions, DoesActorOwnKeyOptions, FetchKeyDetailedResult, FetchKeyErrorResult, FetchKeyOptions, FetchKeyResult, FulfillAcceptSignatureResult, GetKeyOwnerOptions, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, Rfc9421SignRequestOptions, SignJsonLdOptions, SignObjectOptions, SignRequestOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyProofOptions, VerifyRequestDetailedResult, VerifyRequestFailureReason, VerifyRequestOptions, VerifySignatureOptions, attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/mod.js

@@ -1,5 +1,5 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as verifyRequestDetailed, c as fetchKeyDetailed, f as formatAcceptSignature, h as validateAcceptSignature, i as verifyRequest, l as generateCryptoKeyPair, m as parseAcceptSignature, o as exportJwk, p as fulfillAcceptSignature, r as signRequest, s as fetchKey, u as importJwk } from "../http-88deUx3Y.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-K3inAqnp.js";
+import { _ as validateAcceptSignature, a as verifyRequestDetailed, c as fetchKey, d as importJwk, g as parseAcceptSignature, h as fulfillAcceptSignature, i as verifyRequest, l as fetchKeyDetailed, m as formatAcceptSignature, o as exportJwk, r as signRequest, u as generateCryptoKeyPair } from "../http-CdJ6n4rA.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-Dsa_ZC-M.js";
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/owner.test.mjs

@@ -2,11 +2,11 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-BUOJXi-Z.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
-import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-BAK-tUlf.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-Cygg-fHW.mjs";
+import { t as assert } from "../assert-BhQd8QHP.mjs";
+import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-CtZLJq76.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-DklgvZXn.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 //#region src/sig/owner.test.ts
@@ -40,7 +40,7 @@ test("doesActorOwnKey() records OpenTelemetry span", async () => {
 		id: new URL("https://example.com/activity"),
 		actor: new URL("https://example.com/person")
 	}), new CryptographicKey({
-		id: new URL("https://example.com/person#key"),
+		id: new URL("https://example.com/key"),
 		owner: new URL("https://example.com/person")
 	}), {
 		documentLoader: mockDocumentLoader,
@@ -50,9 +50,108 @@ test("doesActorOwnKey() records OpenTelemetry span", async () => {
 	assertEquals(spans.length, 1);
 	const span = spans[0];
 	assertEquals(span.attributes["activitypub.actor.id"], "https://example.com/person");
-	assertEquals(span.attributes["activitypub.key.id"], "https://example.com/person#key");
+	assertEquals(span.attributes["activitypub.key.id"], "https://example.com/key");
 	assertEquals(span.attributes["activitypub.key_ownership.verified"], true);
-	assertEquals(span.attributes["activitypub.key_ownership.method"], "owner_id");
+	assertEquals(span.attributes["activitypub.key_ownership.method"], "key_owner");
+});
+test("doesActorOwnKey() rejects a key that only claims to be owned", async () => {
+	const options = {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	};
+	assertFalse(await doesActorOwnKey(new Create({ actor: new URL("https://example.com/person") }), new CryptographicKey({
+		id: new URL("https://attacker.example/key"),
+		owner: new URL("https://example.com/person")
+	}), options));
+	const unresolvable = new URL("https://impersonated.invalid/users/victim");
+	assertFalse(await doesActorOwnKey(new Create({ actor: unresolvable }), new CryptographicKey({
+		id: new URL("https://attacker.example/key"),
+		owner: unresolvable
+	}), options));
+});
+test("doesActorOwnKey() ignores an actor embedded in the activity", async () => {
+	const { publicKeyPem } = await rsaPublicKey1.toJsonLd({ contextLoader: mockDocumentLoader });
+	const activity = await Create.fromJsonLd({
+		"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+		id: "https://example.com/activity",
+		type: "Create",
+		actor: {
+			id: "https://example.com/person",
+			type: "Person",
+			publicKey: {
+				id: "https://attacker.example/key",
+				type: "CryptographicKey",
+				owner: "https://example.com/person",
+				publicKeyPem
+			}
+		}
+	}, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	assertEquals(activity.actorId, new URL("https://example.com/person"));
+	assertFalse(await doesActorOwnKey(activity, new CryptographicKey({ id: new URL("https://attacker.example/key") }), {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	}));
+});
+test("getKeyOwner() rejects an actor document from another origin", async () => {
+	const keyId = "https://attacker.example/key";
+	const { publicKeyPem } = await rsaPublicKey1.toJsonLd({ contextLoader: mockDocumentLoader });
+	const options = {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: "https://example.com/person",
+					type: "Person",
+					publicKey: [{
+						id: keyId,
+						type: "CryptographicKey",
+						publicKeyPem
+					}]
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	};
+	assertEquals(await getKeyOwner(new URL(keyId), options), null);
+});
+test("doesActorOwnKey() matches a key that leaves its id implicit", async () => {
+	const actorId = "https://example.com/implicit-key-actor";
+	const { publicKeyPem } = await rsaPublicKey1.toJsonLd({ contextLoader: mockDocumentLoader });
+	const options = {
+		documentLoader(resource) {
+			if (resource === actorId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: actorId,
+					type: "Person",
+					publicKey: [{
+						type: "CryptographicKey",
+						owner: actorId,
+						publicKeyPem
+					}]
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	};
+	const activity = new Create({ actor: new URL(actorId) });
+	assert(await doesActorOwnKey(activity, new CryptographicKey({
+		owner: new URL(actorId),
+		publicKey: rsaPublicKey1.publicKey
+	}), options));
+	assertFalse(await doesActorOwnKey(activity, new CryptographicKey({
+		owner: new URL(actorId),
+		publicKey: rsaPublicKey2.publicKey
+	}), options));
 });
 //#endregion
 export {};

package/dist/sig/proof.test.mjs

@@ -2,11 +2,11 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-BUOJXi-Z.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
-import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
-import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { i as verifyProof, n as signObject, r as verifyObject, t as createProof } from "../proof-Dt5GV-xi.mjs";
+import { n as assertInstanceOf } from "../assert-BhQd8QHP.mjs";
+import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CtZLJq76.mjs";
+import { i as verifyProof, n as signObject, r as verifyObject, t as createProof } from "../proof-CI4rsVLu.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, DataIntegrityProof, Multikey, Note, Place } from "@fedify/vocab";
 import { decodeMultibase, importMultibaseKey } from "@fedify/vocab-runtime";
@@ -253,5 +253,74 @@ test("verifyObject()", async () => {
 	assertInstanceOf(note, Note);
 	assertEquals(note.content, "Hello world");
 });
+test("verifyObject() rejects a key that claims a forged controller", async () => {
+	const keyId = new URL("https://attacker.example/multikey");
+	const impersonated = "https://example.com/person2";
+	const attackerActor = "https://attacker.example/actor";
+	const multikeyDocument = await ed25519Multikey.toJsonLd({ contextLoader: mockDocumentLoader });
+	const options = {
+		format: "compact",
+		contextLoader: mockDocumentLoader,
+		documentLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	};
+	const signed = await signObject(new Create({
+		id: new URL("https://attacker.example/activities/1"),
+		actor: new URL(impersonated),
+		object: new Note({
+			id: new URL("https://attacker.example/notes/1"),
+			attribution: new URL(impersonated),
+			content: "Hello world"
+		})
+	}), ed25519PrivateKey, keyId, options);
+	const jsonLd = await signed.toJsonLd(options);
+	const serveKeyControlledBy = (controller) => (resource) => {
+		if (resource === keyId.href) return Promise.resolve({
+			contextUrl: null,
+			documentUrl: resource,
+			document: {
+				...multikeyDocument,
+				id: keyId.href,
+				controller
+			}
+		});
+		if (resource === attackerActor) return Promise.resolve({
+			contextUrl: null,
+			documentUrl: resource,
+			document: {
+				"@context": [
+					"https://www.w3.org/ns/activitystreams",
+					"https://w3id.org/security/v1",
+					"https://w3id.org/security/multikey/v1",
+					"https://w3id.org/security/data-integrity/v1",
+					"https://www.w3.org/ns/did/v1"
+				],
+				id: resource,
+				type: "Person",
+				assertionMethod: [keyId.href]
+			}
+		});
+		return mockDocumentLoader(resource);
+	};
+	assertEquals(await verifyObject(Create, jsonLd, {
+		documentLoader: serveKeyControlledBy(impersonated),
+		contextLoader: mockDocumentLoader
+	}), null);
+	const honestLoader = serveKeyControlledBy(attackerActor);
+	let proof = null;
+	for await (const p of signed.getProofs(options)) {
+		proof = p;
+		break;
+	}
+	assertInstanceOf(proof, DataIntegrityProof);
+	assertInstanceOf(await verifyProof(jsonLd, proof, {
+		documentLoader: honestLoader,
+		contextLoader: mockDocumentLoader
+	}), Multikey);
+	assertEquals(await verifyObject(Create, jsonLd, {
+		documentLoader: honestLoader,
+		contextLoader: mockDocumentLoader
+	}), null);
+});
 //#endregion
 export {};