@fedify/fedify 2.2.18-dev.2386 → 2.2.19

package/dist/sig/key.test.mjs

@@ -2,14 +2,14 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BVFj8-_V.mjs";
-import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
+import "../std__assert-DNZ4Liil.mjs";
+import { r as assertFalse, t as assertThrows } from "../assert_throws-D4DNWrux.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
-import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
+import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-Dmjbg-bA.mjs";
-import { a as generateCryptoKeyPair, i as fetchKeyDetailed, o as importJwk, r as fetchKey, s as validateCryptoKey, t as exportJwk } from "../key-BtVvc9pe.mjs";
+import { a as generateCryptoKeyPair, i as fetchKeyDetailed, o as importJwk, r as fetchKey, s as validateCryptoKey, t as exportJwk } from "../key-DolXUaLH.mjs";
 import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { _ as wrapContextLoaderForJsonLd } from "../ld-1J9cdTp0.mjs";
+import { _ as wrapContextLoaderForJsonLd } from "../ld-rTdIfZ63.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { CryptographicKey, Multikey, Person } from "@fedify/vocab";
 import { FetchError, UrlError, getDocumentLoader } from "@fedify/vocab-runtime";
@@ -760,5 +760,199 @@ test("fetchKey() records the controller an actor document establishes", async ()
 	assertEquals(key?.controllerId, new URL(actorId));
 	assert(key?.publicKey != null);
 });
+test("fetchKey() rejects a key whose owner redirects to another actor", async () => {
+	const keyId = "https://evil.example/keys/1";
+	const victim = "https://victim.example/users/alice";
+	const mallory = "https://evil.example/users/mallory";
+	const { publicKeyPem } = await rsaPublicKey3.toJsonLd({ contextLoader: mockDocumentLoader });
+	const cache = {};
+	assertEquals(await fetchKey(keyId, CryptographicKey, {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": "https://w3id.org/security/v1",
+					id: keyId,
+					type: "CryptographicKey",
+					owner: victim,
+					publicKeyPem
+				}
+			});
+			if (resource === victim || resource === mallory) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: mallory,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: mallory,
+					type: "Person",
+					publicKey: keyId
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader,
+		keyCache: {
+			get(keyId) {
+				return Promise.resolve(cache[keyId.href]);
+			},
+			set(keyId, key) {
+				cache[keyId.href] = key;
+				return Promise.resolve();
+			}
+		}
+	}), {
+		key: null,
+		cached: false
+	});
+	assertEquals(cache, { [keyId]: null });
+});
+test("fetchKey() rejects a key whose owner resolves to another actor on the same origin", async () => {
+	const keyId = "https://victim.example/keys/bob";
+	const victim = "https://victim.example/users/alice";
+	const bob = "https://victim.example/users/bob";
+	const { publicKeyPem } = await rsaPublicKey3.toJsonLd({ contextLoader: mockDocumentLoader });
+	assertEquals(await fetchKey(keyId, CryptographicKey, {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": "https://w3id.org/security/v1",
+					id: keyId,
+					type: "CryptographicKey",
+					owner: victim,
+					publicKeyPem
+				}
+			});
+			if (resource === victim || resource === bob) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: bob,
+					type: "Person",
+					publicKey: keyId
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	}), {
+		key: null,
+		cached: false
+	});
+});
+test("fetchKey() rejects a Multikey whose controller redirects to another actor", async () => {
+	const keyId = "https://evil.example/keys/ed25519";
+	const victim = "https://victim.example/users/alice";
+	const mallory = "https://evil.example/users/mallory";
+	const multikeyDocument = await ed25519Multikey.toJsonLd({ contextLoader: mockDocumentLoader });
+	assertEquals(await fetchKey(keyId, Multikey, {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					...multikeyDocument,
+					id: keyId,
+					controller: victim
+				}
+			});
+			if (resource === victim || resource === mallory) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: mallory,
+				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: mallory,
+					type: "Person",
+					assertionMethod: [keyId]
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	}), {
+		key: null,
+		cached: false
+	});
+});
+test("fetchKey() accepts an owner whose document URL differs from its id", async () => {
+	const keyId = "https://victim.example/keys/alice";
+	const alice = "https://victim.example/users/alice";
+	const { publicKeyPem } = await rsaPublicKey3.toJsonLd({ contextLoader: mockDocumentLoader });
+	const { key, cached } = await fetchKey(keyId, CryptographicKey, {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": "https://w3id.org/security/v1",
+					id: keyId,
+					type: "CryptographicKey",
+					owner: alice,
+					publicKeyPem
+				}
+			});
+			if (resource === alice) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: `${alice}.json`,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: alice,
+					type: "Person",
+					publicKey: keyId
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	});
+	assertFalse(cached);
+	assertEquals(key?.id, new URL(keyId));
+	assertEquals(key?.ownerId, new URL(alice));
+});
+test("fetchKey() rejects an owner reached through a normalization redirect", async () => {
+	const keyId = "https://victim.example/keys/alice";
+	const canonical = "https://victim.example/users/alice";
+	const nonCanonical = "https://victim.example/users/Alice";
+	const { publicKeyPem } = await rsaPublicKey3.toJsonLd({ contextLoader: mockDocumentLoader });
+	assertEquals(await fetchKey(keyId, CryptographicKey, {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": "https://w3id.org/security/v1",
+					id: keyId,
+					type: "CryptographicKey",
+					owner: nonCanonical,
+					publicKeyPem
+				}
+			});
+			if (resource === canonical || resource === nonCanonical) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: canonical,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: canonical,
+					type: "Person",
+					publicKey: keyId
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	}), {
+		key: null,
+		cached: false
+	});
+});
 //#endregion
 export {};

package/dist/sig/ld.test.mjs

@@ -2,12 +2,12 @@ import "@js-temporal/polyfill";
 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 { r as assertFalse, t as assertThrows } from "../assert_throws-D4DNWrux.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
-import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { a as generateCryptoKeyPair } from "../key-BtVvc9pe.mjs";
+import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
+import { a as generateCryptoKeyPair } from "../key-DolXUaLH.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, 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-1J9cdTp0.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-rTdIfZ63.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { CryptographicKey } from "@fedify/vocab";
 import { encodeBase64 } from "byte-encodings/base64";
@@ -860,5 +860,50 @@ test("verifyJsonLd() rejects a key that claims a forged owner", async () => {
 		contextLoader: mockDocumentLoader
 	}));
 });
+test("verifyJsonLd() rejects a key whose owner redirects to another actor", async () => {
+	const keyId = new URL("https://evil.example/keys/1");
+	const victim = "https://victim.example/users/alice";
+	const mallory = "https://evil.example/users/mallory";
+	const { publicKeyPem } = await rsaPublicKey3.toJsonLd({ contextLoader: mockDocumentLoader });
+	const signed = await signJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		id: "https://victim.example/activities/forged",
+		type: "Create",
+		actor: victim,
+		object: {
+			type: "Note",
+			content: "forged"
+		}
+	}, rsaPrivateKey3, keyId, { contextLoader: mockDocumentLoader });
+	const options = {
+		documentLoader(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: victim,
+					publicKeyPem
+				}
+			});
+			if (resource === victim || resource === mallory) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: mallory,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: mallory,
+					type: "Person",
+					publicKey: keyId.href
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	};
+	assertEquals(await verifySignature(signed, options), null);
+	assertFalse(await verifyJsonLd(signed, options));
+});
 //#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-C_Qq0cNx.cjs");
-const require_proof = require("../proof-C6uAR-Hj.cjs");
+const require_http = require("../http-DrUG4fPS.cjs");
+const require_proof = require("../proof-DhaTTn-P.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 { URLPattern } from "urlpattern-polyfill";
-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-DP-vbG4o.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-BJ332wO_.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-DJK2udgX.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-CaQ4KG6y.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.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-BVFj8-_V.mjs";
-import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
+import "../std__assert-DNZ4Liil.mjs";
+import { r as assertFalse } from "../assert_throws-D4DNWrux.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
 import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-BAK-tUlf.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-CgurOfJ9.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-CVfzyM5V.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 //#region src/sig/owner.test.ts
@@ -153,5 +153,50 @@ test("doesActorOwnKey() matches a key that leaves its id implicit", async () =>
 		publicKey: rsaPublicKey2.publicKey
 	}), options));
 });
+test("doesActorOwnKey() rejects an actor ID that redirects to the key's owner", async () => {
+	const keyId = "https://evil.example/keys/1";
+	const victim = "https://victim.example/users/alice";
+	const mallory = "https://evil.example/users/mallory";
+	const { publicKeyPem } = await rsaPublicKey1.toJsonLd({ contextLoader: mockDocumentLoader });
+	const serveKeyOwnedBy = (owner) => ({
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": "https://w3id.org/security/v1",
+					id: keyId,
+					type: "CryptographicKey",
+					owner,
+					publicKeyPem
+				}
+			});
+			if (resource === victim || resource === mallory) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: mallory,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: mallory,
+					type: "Person",
+					publicKey: keyId
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	});
+	const activity = new Create({ actor: new URL(victim) });
+	assertFalse(await doesActorOwnKey(activity, new CryptographicKey({
+		id: new URL(keyId),
+		owner: new URL(mallory),
+		publicKey: rsaPublicKey1.publicKey
+	}), serveKeyOwnedBy(mallory)));
+	assertFalse(await doesActorOwnKey(activity, new CryptographicKey({
+		id: new URL(keyId),
+		owner: new URL(victim),
+		publicKey: rsaPublicKey1.publicKey
+	}), serveKeyOwnedBy(victim)));
+	assertEquals(await getKeyOwner(new URL(keyId), serveKeyOwnedBy(victim)), null);
+});
 //#endregion
 export {};

package/dist/sig/proof.test.mjs

@@ -2,12 +2,13 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BVFj8-_V.mjs";
-import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
+import "../std__assert-DNZ4Liil.mjs";
+import { r as assertFalse } from "../assert_throws-D4DNWrux.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
+import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-amccRMrV.mjs";
-import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-Dn4nm7pr.mjs";
+import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-gOGM-sJS.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place } from "@fedify/vocab";
 import { decodeMultibase, importMultibaseKey } from "@fedify/vocab-runtime";
@@ -437,5 +438,56 @@ test("verifyObject() rejects a key that claims a forged controller", async () =>
 		contextLoader: mockDocumentLoader
 	}), null);
 });
+test("verifyObject() rejects a key whose controller redirects to another actor", async () => {
+	const keyId = new URL("https://evil.example/keys/ed25519");
+	const victim = "https://victim.example/users/alice";
+	const mallory = "https://evil.example/users/mallory";
+	const multikeyDocument = await ed25519Multikey.toJsonLd({ contextLoader: mockDocumentLoader });
+	const signOptions = {
+		format: "compact",
+		contextLoader: mockDocumentLoader,
+		documentLoader: mockDocumentLoader,
+		context: ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/data-integrity/v1"]
+	};
+	assertEquals(await verifyObject(Create, await (await signObject(new Create({
+		id: new URL("https://victim.example/activities/forged"),
+		actor: new URL(victim),
+		object: new Note({
+			id: new URL("https://victim.example/notes/forged"),
+			attribution: new URL(victim),
+			content: "forged"
+		})
+	}), ed25519PrivateKey, keyId, signOptions)).toJsonLd(signOptions), {
+		documentLoader(resource) {
+			if (resource === keyId.href) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					...multikeyDocument,
+					id: keyId.href,
+					controller: victim
+				}
+			});
+			if (resource === victim || resource === mallory) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: mallory,
+				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: mallory,
+					type: "Person",
+					assertionMethod: [keyId.href]
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	}), null);
+});
 //#endregion
 export {};

package/dist/{std__assert-BVFj8-_V.mjs → std__assert-DNZ4Liil.mjs}

@@ -2,8 +2,8 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { l as AssertionError, s as format } from "./assert_equals-Ew3jOFa3.mjs";
-import "./assert_rejects-B-qJtC9Z.mjs";
-import "./assert_throws-4NwKEy2q.mjs";
+import "./assert_throws-D4DNWrux.mjs";
+import "./assert_rejects-WyYSTDDX.mjs";
 import "./assert_strict_equals-Dmjbg-bA.mjs";
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_exists.js
 /**

package/dist/{temporal-BZrzDMq2.mjs → temporal-CA4Y9hBJ.mjs}

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