@fedify/fedify 2.0.28-dev.1979 → 2.0.28-dev.1982

package/dist/sig/key.test.mjs

@@ -4,9 +4,10 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.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 validateCryptoKey, i as importJwk, n as fetchKey, r as generateCryptoKeyPair, t as exportJwk } from "../key-BQUnVMwc.mjs";
-import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CtZLJq76.mjs";
+import { a as importJwk, i as generateCryptoKeyPair, o as validateCryptoKey, r as fetchKey, t as exportJwk } from "../key-bSphUqhB.mjs";
+import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CCxRJhWa.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 //#region src/sig/key.test.ts
@@ -331,5 +332,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,11 +3,11 @@ 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 { r as generateCryptoKeyPair } from "../key-BQUnVMwc.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-CVbwQ8Fz.mjs";
+import { i as generateCryptoKeyPair } from "../key-bSphUqhB.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CCxRJhWa.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-D0uFMLmq.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { CryptographicKey } from "@fedify/vocab";
 import { encodeBase64 } from "byte-encodings/base64";
@@ -763,5 +763,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-BLqv_3ue.cjs");
-const require_proof = require("../proof-liMyPvsb.cjs");
+const require_http = require("../http-BgOlx4n1.cjs");
+const require_proof = require("../proof-xCEe8t7U.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 { a as signRequest, c as FetchKeyResult, d as fetchKey, f as generateCryptoKeyPair, i as VerifyRequestOptions, l as KeyCache, n as HttpMessageSignaturesSpecDeterminer, o as verifyRequest, p as importJwk, r as SignRequestOptions, s as FetchKeyOptions, t as HttpMessageSignaturesSpec, u as exportJwk } from "../http-RYvZHWMc.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-CB6pc2pw.cjs";
+import { a as signRequest, c as FetchKeyResult, d as fetchKey, f as generateCryptoKeyPair, i as VerifyRequestOptions, l as KeyCache, n as HttpMessageSignaturesSpecDeterminer, o as verifyRequest, p as importJwk, r as SignRequestOptions, s as FetchKeyOptions, t as HttpMessageSignaturesSpec, u as exportJwk } from "../http-Bs6thuCC.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-IOWUF5Yr.cjs";
 export { CreateProofOptions, CreateSignatureOptions, DoesActorOwnKeyOptions, FetchKeyOptions, FetchKeyResult, GetKeyOwnerOptions, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, SignJsonLdOptions, SignObjectOptions, SignRequestOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyProofOptions, VerifyRequestOptions, VerifySignatureOptions, attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, generateCryptoKeyPair, getKeyOwner, importJwk, signJsonLd, signObject, signRequest, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifySignature };

package/dist/sig/mod.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { a as signRequest, c as FetchKeyResult, d as fetchKey, f as generateCryptoKeyPair, i as VerifyRequestOptions, l as KeyCache, n as HttpMessageSignaturesSpecDeterminer, o as verifyRequest, p as importJwk, r as SignRequestOptions, s as FetchKeyOptions, t as HttpMessageSignaturesSpec, u as exportJwk } from "../http-C4D0ajx0.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-CiQNNAQL.js";
+import { a as signRequest, c as FetchKeyResult, d as fetchKey, f as generateCryptoKeyPair, i as VerifyRequestOptions, l as KeyCache, n as HttpMessageSignaturesSpecDeterminer, o as verifyRequest, p as importJwk, r as SignRequestOptions, s as FetchKeyOptions, t as HttpMessageSignaturesSpec, u as exportJwk } from "../http-CDupyfOc.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-E7YM72JZ.js";
 export { CreateProofOptions, CreateSignatureOptions, DoesActorOwnKeyOptions, FetchKeyOptions, FetchKeyResult, GetKeyOwnerOptions, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, SignJsonLdOptions, SignObjectOptions, SignRequestOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyProofOptions, VerifyRequestOptions, VerifySignatureOptions, attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, generateCryptoKeyPair, getKeyOwner, importJwk, signJsonLd, signObject, signRequest, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifySignature };

package/dist/sig/mod.js

@@ -1,5 +1,5 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as fetchKey, i as exportJwk, n as signRequest, o as generateCryptoKeyPair, r as verifyRequest, s as importJwk } from "../http-Cx5dD1D_.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-EY-uItWr.js";
+import { c as importJwk, i as exportJwk, n as signRequest, o as fetchKey, r as verifyRequest, s as generateCryptoKeyPair } from "../http-CwcG2wDs.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-DsJHFTkx.js";
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, generateCryptoKeyPair, getKeyOwner, importJwk, signJsonLd, signObject, signRequest, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifySignature };

package/dist/sig/owner.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.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-CtZLJq76.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-D9CjMxWb.mjs";
+import { t as assert } from "../assert-BhQd8QHP.mjs";
+import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-CCxRJhWa.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-Bzg6w7eA.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

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.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-CtZLJq76.mjs";
-import { i as verifyProof, n as signObject, r as verifyObject, t as createProof } from "../proof-DZWmoF6Z.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-CCxRJhWa.mjs";
+import { i as verifyProof, n as signObject, r as verifyObject, t as createProof } from "../proof-CgLA51pO.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 {};

package/dist/{temporal-BovRWwqL.mjs → temporal-DPJlkHh3.mjs}

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

package/dist/{types-m8u9L86X.cjs → types-DWs-qZaY.cjs}

@@ -3,6 +3,80 @@ const { URLPattern } = require("urlpattern-polyfill");
 require("./chunk-DDcVe30Y.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
+//#region src/utils/body.ts
+/** Decoded JSON body limit: 16 MiB.  @internal */
+const MAX_BODY_SIZE = 16 * 1024 * 1024;
+/** A body exceeded the byte limit.  @internal */
+var BodyTooLargeError = class extends _fedify_vocab_runtime.FetchError {
+	/** Creates an error for a body exceeding the given limit. */
+	constructor(url, maxBytes) {
+		super(url, `Body exceeds the limit of ${maxBytes} bytes`);
+		this.name = "BodyTooLargeError";
+	}
+};
+/** Validates a finite, positive byte limit.  @internal */
+function validateBodySizeLimit(maxBytes) {
+	if (!Number.isSafeInteger(maxBytes) || maxBytes <= 0) throw new RangeError("The body size limit must be a positive safe integer.");
+}
+/**
+* Reads UTF-8 text while limiting bytes received from the body stream.
+* Fetch responses are already decompressed, so the stream count is authoritative.
+* @param message The response or request to read.
+* @param maxBytes The maximum number of decoded bytes to read.
+* @param url The URL to include in errors and logs.
+* @returns The decoded body text.
+* @throws {BodyTooLargeError} If the body exceeds the limit.
+* @internal
+*/
+async function readBoundedText(message, maxBytes, url) {
+	validateBodySizeLimit(maxBytes);
+	const reader = message.body?.getReader();
+	const tooLarge = () => {
+		(0, _logtape_logtape.getLogger)([
+			"fedify",
+			"runtime",
+			"body"
+		]).warn("Body from {url} exceeds the limit of {maxBytes} bytes.", {
+			url: url.toString(),
+			maxBytes
+		});
+		throw new BodyTooLargeError(url, maxBytes);
+	};
+	try {
+		const length = message.headers.get("Content-Length");
+		const encoding = message.headers.get("Content-Encoding");
+		if ((encoding == null || encoding.toLowerCase() === "identity") && length != null && /^\d+$/.test(length) && Number(length) > maxBytes) tooLarge();
+		if (reader == null) return "";
+		let size = 0;
+		const textReader = new ReadableStream({ async pull(controller) {
+			const { done, value } = await reader.read();
+			if (done) {
+				controller.close();
+				return;
+			}
+			size += value.byteLength;
+			if (size > maxBytes) tooLarge();
+			controller.enqueue(value);
+		} }, { highWaterMark: 0 }).pipeThrough(new TextDecoderStream()).getReader();
+		try {
+			const chunks = [];
+			while (true) {
+				const { done, value } = await textReader.read();
+				if (done) break;
+				chunks.push(value);
+			}
+			return chunks.join("");
+		} finally {
+			textReader.releaseLock();
+		}
+	} catch (error) {
+		if (reader != null) reader.cancel(error).catch(() => {});
+		throw error;
+	} finally {
+		reader?.releaseLock();
+	}
+}
+//#endregion
 //#region src/nodeinfo/client.ts
 const logger = (0, _logtape_logtape.getLogger)([
 	"fedify",
@@ -83,7 +157,7 @@ async function getNodeInfo(url, options = {}) {
 				});
 				return;
 			}
-			const wellKnownRd = await wellKnownResponse.json();
+			const wellKnownRd = JSON.parse(await readBoundedText(wellKnownResponse, MAX_BODY_SIZE, wellKnownUrl));
 			const link = wellKnownRd?.links?.find((link) => link != null && "rel" in link && (link.rel === "http://nodeinfo.diaspora.software/ns/schema/2.0" || link.rel === "http://nodeinfo.diaspora.software/ns/schema/2.1") && "href" in link && link.href != null);
 			if (link == null || link.href == null) {
 				logger.error("Failed to find a NodeInfo document link from {url}: {resourceDescriptor}", {
@@ -107,7 +181,7 @@ async function getNodeInfo(url, options = {}) {
 			});
 			return;
 		}
-		const data = await response.json();
+		const data = JSON.parse(await readBoundedText(response, MAX_BODY_SIZE, nodeInfoUrl));
 		if (options.parse === "none") return data;
 		return parseNodeInfo(data, { tryBestEffort: options.parse === "best-effort" }) ?? void 0;
 	} catch (error) {
@@ -353,6 +427,18 @@ function nodeInfoToJson(nodeInfo) {
 	};
 }
 //#endregion
+Object.defineProperty(exports, "BodyTooLargeError", {
+	enumerable: true,
+	get: function() {
+		return BodyTooLargeError;
+	}
+});
+Object.defineProperty(exports, "MAX_BODY_SIZE", {
+	enumerable: true,
+	get: function() {
+		return MAX_BODY_SIZE;
+	}
+});
 Object.defineProperty(exports, "getNodeInfo", {
 	enumerable: true,
 	get: function() {
@@ -371,3 +457,9 @@ Object.defineProperty(exports, "parseNodeInfo", {
 		return parseNodeInfo;
 	}
 });
+Object.defineProperty(exports, "readBoundedText", {
+	enumerable: true,
+	get: function() {
+		return readBoundedText;
+	}
+});