@fedify/fedify 2.4.2 → 2.4.4

package/dist/nodeinfo/handler.test.mjs

@@ -5,7 +5,7 @@ import { r as createRequestContext } from "../context-8Tu9kea0.mjs";
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { D as handleNodeInfoJrd, E as handleNodeInfo, o as createFederation } from "../middleware-C-swet0z.mjs";
+import { D as handleNodeInfoJrd, E as handleNodeInfo, o as createFederation } from "../middleware-C_gtR3fV.mjs";
 import { test } from "@fedify/fixture";
 //#region src/nodeinfo/handler.test.ts
 test("handleNodeInfo()", async () => {

package/dist/{owner-BHUhedVc.mjs → owner-Dc-Lg_Xn.mjs}

@@ -2,10 +2,10 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { d as isPortableUri, l as isPortableId, n as getCanonicalPortableId, p as isSamePublicKey$1, s as isCompatibleKeyId } from "./portable-key-id-Ca30-hOa.mjs";
-import { n as version, t as name } from "./deno-BZ4z-lJJ.mjs";
+import { n as version, t as name } from "./deno-CO1X_K_q.mjs";
 import { i as parseKeyOwnerEvidence, r as getVerifiedKeyOwnerEvidence } from "./key-owner-evidence-APB6NpSk.mjs";
-import { E as verifyKeyOwnership, b as fetchActorDocument, y as exportJwk } from "./ld-Dkkyk65e.mjs";
-import { n as resolvePortableActorKey, t as fetchPortableGatewayKey } from "./portable-key-Cdw3vfl-.mjs";
+import { E as verifyKeyOwnership, b as fetchActorDocument, y as exportJwk } from "./ld-Cy86r-Ty.mjs";
+import { n as resolvePortableActorKey, t as fetchPortableGatewayKey } from "./portable-key-ClXZ25LT.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{portable-collection-DL-1Wy1s.cjs → portable-collection-Bl2UkqcO.cjs}

@@ -1,5 +1,5 @@
 const { URLPattern } = require("urlpattern-polyfill");
-const require_http = require("./http-x1satM4y.cjs");
+const require_http = require("./http-g5f1D2tm.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");

package/dist/{portable-collection-CfIc190c.js → portable-collection-CjdP7fQ4.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { At as isPortableUri, B as fetchActorDocument, Dt as isCompatibleKeyId, J as getVerifiedKeyOwnerEvidence, K as verifyKeyOwnership, Mt as isSamePublicKey$1, Nt as name, Ot as isPortableId, Pt as version, St as getCanonicalPortableId, Y as parseKeyOwnerEvidence, b as verifyPortableObjectProofWithRoot, l as fetchPortableGatewayKey, u as resolvePortableActorKey, v as verifyPortableObjectProof, z as exportJwk } from "./http-Qq7jR2rC.js";
+import { At as isPortableUri, B as fetchActorDocument, Dt as isCompatibleKeyId, J as getVerifiedKeyOwnerEvidence, K as verifyKeyOwnership, Mt as isSamePublicKey$1, Nt as name, Ot as isPortableId, Pt as version, St as getCanonicalPortableId, Y as parseKeyOwnerEvidence, b as verifyPortableObjectProofWithRoot, l as fetchPortableGatewayKey, u as resolvePortableActorKey, v as verifyPortableObjectProof, z as exportJwk } from "./http-D_AGUmSq.js";
 import { getLogger } from "@logtape/logtape";
 import { CollectionPage, CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{portable-collection-DONEPTXV.mjs → portable-collection-DSKqMgvr.mjs}

@@ -1,8 +1,8 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-BZ4z-lJJ.mjs";
-import { c as verifyPortableObjectProof, u as verifyPortableObjectProofWithRoot } from "./proof-DuSE1ABD.mjs";
+import { n as version, t as name } from "./deno-CO1X_K_q.mjs";
+import { c as verifyPortableObjectProof, u as verifyPortableObjectProofWithRoot } from "./proof-kJtQ49gr.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CollectionPage, Object as Object$1, isActor } from "@fedify/vocab";
 import { trace } from "@opentelemetry/api";

package/dist/{portable-key-Cdw3vfl-.mjs → portable-key-ClXZ25LT.mjs}

@@ -2,7 +2,7 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { a as getRawCanonicalPortableId, c as isPortableActorDocument, d as isPortableUri, n as getCanonicalPortableId, p as isSamePublicKey } from "./portable-key-id-Ca30-hOa.mjs";
-import { u as verifyPortableObjectProofWithRoot } from "./proof-DuSE1ABD.mjs";
+import { u as verifyPortableObjectProofWithRoot } from "./proof-kJtQ49gr.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Multikey, Object as Object$1 } from "@fedify/vocab";
 import { FetchError, formatIri, getDocumentLoader, isGatewayUrl, parseIri, toCompatibleEf61Id } from "@fedify/vocab-runtime";

package/dist/{proof-DuSE1ABD.mjs → proof-kJtQ49gr.mjs}

@@ -3,9 +3,9 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { i as getPortableDid, l as isPortableId } from "./portable-key-id-Ca30-hOa.mjs";
 import { a as verificationObservation, i as triedKey, n as observeCheck, t as observeAttempt } from "./verification-Dpfcw8ml.mjs";
-import { n as version, t as name } from "./deno-BZ4z-lJJ.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-CRv6_IBg.mjs";
-import { T as validateCryptoKey, c as getNormalizationContextLoader, v as bypassKeyCacheReads, x as fetchKey } from "./ld-Dkkyk65e.mjs";
+import { n as version, t as name } from "./deno-CO1X_K_q.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-BguhdXt-.mjs";
+import { T as validateCryptoKey, c as getNormalizationContextLoader, v as bypassKeyCacheReads, x as fetchKey } from "./ld-Cy86r-Ty.mjs";
 import { n as preloadedOnlyDocumentLoader } from "./public-audience--klBIOk1.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-4IJqPYos.mjs";
 import { getLogger } from "@logtape/logtape";

package/dist/{send-D9oTjA6A.mjs → send-D6hcL5qf.mjs}

@@ -2,9 +2,9 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { d as isPortableUri } from "./portable-key-id-Ca30-hOa.mjs";
-import { n as version, t as name } from "./deno-BZ4z-lJJ.mjs";
-import { n as getDurationMs, r as getFederationMetrics } from "./metrics-CRv6_IBg.mjs";
-import { n as doubleKnock } from "./http-B5w_qcIg.mjs";
+import { n as version, t as name } from "./deno-CO1X_K_q.mjs";
+import { n as getDurationMs, r as getFederationMetrics } from "./metrics-BguhdXt-.mjs";
+import { n as doubleKnock } from "./http-DkLKT8Vp.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError, UrlError, canonicalizePortableUri, getFe34Origin, isGatewayUrl, toCompatibleEf61Id, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/sig/compound-proof-discovery.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { a as inspectCompoundPortableObjectApplicability, n as discoverCompoundProofDocuments } from "../compound-proof-G2J_bU0u.mjs";
+import { a as inspectCompoundPortableObjectApplicability, n as discoverCompoundProofDocuments } from "../compound-proof-fxkyiXYM.mjs";
 import { t as map_local_create_note_default } from "../map-local-create-note-B0SeXJms.mjs";
 import { test } from "@fedify/fixture";
 //#region src/sig/compound-proof-discovery.test.ts

package/dist/sig/compound-proof-producer.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { a as inspectCompoundPortableObjectApplicability, i as findUnsupportedCompoundProofShape, t as containsCompoundPortableObject } from "../compound-proof-G2J_bU0u.mjs";
+import { a as inspectCompoundPortableObjectApplicability, i as findUnsupportedCompoundProofShape, t as containsCompoundPortableObject } from "../compound-proof-fxkyiXYM.mjs";
 import { test } from "@fedify/fixture";
 //#region src/sig/compound-proof-producer.test.ts
 const portableId = "ap+ef61://did:key:z6MkAlice/objects/1";

package/dist/sig/compound-proof-verification.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { l as verifyPortableObjectProofPolicy, o as verifyMapLocalProof } from "../proof-DuSE1ABD.mjs";
+import { l as verifyPortableObjectProofPolicy, o as verifyMapLocalProof } from "../proof-kJtQ49gr.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { a as inspectCompoundPortableObjectApplicability, o as verifyCompoundPortableObjectProofs, s as verifyCompoundProofDocuments, t as containsCompoundPortableObject } from "../compound-proof-G2J_bU0u.mjs";
+import { a as inspectCompoundPortableObjectApplicability, o as verifyCompoundPortableObjectProofs, s as verifyCompoundProofDocuments, t as containsCompoundPortableObject } from "../compound-proof-fxkyiXYM.mjs";
 import { t as map_local_create_note_default } from "../map-local-create-note-B0SeXJms.mjs";
 import { t as map_local_context_conflict_default } from "../map-local-context-conflict-DOYEEJ3u.mjs";
 import { CryptographicKey, Multikey, Person } from "@fedify/vocab";

package/dist/sig/compound-proof.test.mjs

@@ -6,9 +6,9 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { n as preloadedOnlyDocumentLoader } from "../public-audience--klBIOk1.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { a as signObject, d as verifyProof } from "../proof-DuSE1ABD.mjs";
+import { a as signObject, d as verifyProof } from "../proof-kJtQ49gr.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { s as verifyCompoundProofDocuments } from "../compound-proof-G2J_bU0u.mjs";
+import { s as verifyCompoundProofDocuments } from "../compound-proof-fxkyiXYM.mjs";
 import { t as map_local_create_note_default } from "../map-local-create-note-B0SeXJms.mjs";
 import { t as map_local_context_conflict_default } from "../map-local-context-conflict-DOYEEJ3u.mjs";
 import { Create, DataIntegrityProof, Note, Question } from "@fedify/vocab";

package/dist/sig/http.test.mjs

@@ -12,10 +12,10 @@ import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { y as exportJwk } from "../ld-Dkkyk65e.mjs";
-import { a as listRequestSignatures, c as selectRequestSignature, f as verifyRequest, i as formatRfc9421SignatureParameters, l as signRequest, n as doubleKnock, o as parseRfc9421Signature, p as verifyRequestDetailed, r as formatRfc9421Signature, s as parseRfc9421SignatureInput, t as createRfc9421SignatureBase, u as timingSafeEqual } from "../http-B5w_qcIg.mjs";
+import { y as exportJwk } from "../ld-Cy86r-Ty.mjs";
+import { a as listRequestSignatures, c as selectRequestSignature, f as verifyRequest, i as formatRfc9421SignatureParameters, l as signRequest, n as doubleKnock, o as parseRfc9421Signature, p as verifyRequestDetailed, r as formatRfc9421Signature, s as parseRfc9421SignatureInput, t as createRfc9421SignatureBase, u as timingSafeEqual } from "../http-DkLKT8Vp.mjs";
 import { a as rsaPrivateKey3, i as rsaPrivateKey2, l as rsaPublicKey5, n as ed25519PrivateKey, o as rsaPublicKey1, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { t as KvKeyCache } from "../keycache-D-MNltOk.mjs";
+import { t as KvKeyCache } from "../keycache-N2opu4-3.mjs";
 import { FetchError, UrlError, exportSpki, getDocumentLoader } from "@fedify/vocab-runtime";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { encodeBase64 } from "byte-encodings/base64";

package/dist/sig/key.test.mjs

@@ -2,12 +2,13 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
+import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { C as generateCryptoKeyPair, S as fetchKeyDetailed, T as validateCryptoKey, _ as wrapContextLoaderForJsonLd, w as importJwk, x as fetchKey, y as exportJwk } from "../ld-Dkkyk65e.mjs";
+import { C as generateCryptoKeyPair, S as fetchKeyDetailed, T as validateCryptoKey, _ as wrapContextLoaderForJsonLd, w as importJwk, x as fetchKey, y as exportJwk } from "../ld-Cy86r-Ty.mjs";
 import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
 import { CryptographicKey, Multikey, Person } from "@fedify/vocab";
 import { FetchError, UrlError, exportDidKey, getDocumentLoader } from "@fedify/vocab-runtime";
@@ -1051,5 +1052,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

@@ -8,7 +8,7 @@ import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { C as generateCryptoKeyPair, 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-Dkkyk65e.mjs";
+import { C as generateCryptoKeyPair, 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-Cy86r-Ty.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
@@ -995,5 +995,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/mitra-receive-interop.test.mjs

@@ -5,10 +5,10 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { c as verifyPortableObjectProof } from "../proof-DuSE1ABD.mjs";
-import { p as verifyRequestDetailed } from "../http-B5w_qcIg.mjs";
-import { o as createFederation } from "../middleware-C-swet0z.mjs";
-import { t as doesActorOwnKey } from "../owner-BHUhedVc.mjs";
+import { c as verifyPortableObjectProof } from "../proof-kJtQ49gr.mjs";
+import { p as verifyRequestDetailed } from "../http-DkLKT8Vp.mjs";
+import { o as createFederation } from "../middleware-C_gtR3fV.mjs";
+import { t as doesActorOwnKey } from "../owner-Dc-Lg_Xn.mjs";
 import { Create, Person } from "@fedify/vocab";
 import { canonicalizePortableUri, decodeMultibase, importDidKey } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/sig/mitra-send-interop.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { c as verifyPortableObjectProof } from "../proof-DuSE1ABD.mjs";
-import { p as verifyRequestDetailed } from "../http-B5w_qcIg.mjs";
-import { t as doesActorOwnKey } from "../owner-BHUhedVc.mjs";
+import { c as verifyPortableObjectProof } from "../proof-kJtQ49gr.mjs";
+import { p as verifyRequestDetailed } from "../http-DkLKT8Vp.mjs";
+import { t as doesActorOwnKey } from "../owner-Dc-Lg_Xn.mjs";
 import { Create } from "@fedify/vocab";
 import { canonicalizePortableUri, decodeMultibase, fromCompatibleEf61Id, importDidKey } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/sig/mod.cjs

@@ -1,7 +1,7 @@
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_http = require("../http-x1satM4y.cjs");
-const require_portable_collection = require("../portable-collection-DL-1Wy1s.cjs");
+const require_http = require("../http-g5f1D2tm.cjs");
+const require_portable_collection = require("../portable-collection-Bl2UkqcO.cjs");
 exports.attachSignature = require_http.attachSignature;
 exports.createProof = require_http.createProof;
 exports.createSignature = require_http.createSignature;

package/dist/sig/mod.js

@@ -1,5 +1,5 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { D as createSignature, H as fetchKeyDetailed, I as verifyJsonLd, L as verifySignature, O as detachSignature, P as signJsonLd, T as attachSignature, U as generateCryptoKeyPair, V as fetchKey, W as importJwk, _ as verifyObject, _t as validateAcceptSignature, a as signRequest, c as verifyRequestDetailed, gt as parseAcceptSignature, h as signObject, ht as fulfillAcceptSignature, j as hasSignatureLike, m as hasProofLike, mt as formatAcceptSignature, p as createProof, s as verifyRequest, v as verifyPortableObjectProof, x as verifyProof, z as exportJwk } from "../http-Qq7jR2rC.js";
-import { n as doesActorOwnKey, r as getKeyOwner, t as verifyPortableObject } from "../portable-collection-CfIc190c.js";
+import { D as createSignature, H as fetchKeyDetailed, I as verifyJsonLd, L as verifySignature, O as detachSignature, P as signJsonLd, T as attachSignature, U as generateCryptoKeyPair, V as fetchKey, W as importJwk, _ as verifyObject, _t as validateAcceptSignature, a as signRequest, c as verifyRequestDetailed, gt as parseAcceptSignature, h as signObject, ht as fulfillAcceptSignature, j as hasSignatureLike, m as hasProofLike, mt as formatAcceptSignature, p as createProof, s as verifyRequest, v as verifyPortableObjectProof, x as verifyProof, z as exportJwk } from "../http-D_AGUmSq.js";
+import { n as doesActorOwnKey, r as getKeyOwner, t as verifyPortableObject } from "../portable-collection-CjdP7fQ4.js";
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, hasProofLike, hasSignatureLike, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyPortableObject, verifyPortableObjectProof, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/owner.test.mjs

@@ -6,7 +6,7 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-BHUhedVc.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-Dc-Lg_Xn.mjs";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 //#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/portable-collection.test.mjs

@@ -2,7 +2,7 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as ed25519PrivateKey, r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { t as verifyPortableObject } from "../portable-collection-DONEPTXV.mjs";
+import { t as verifyPortableObject } from "../portable-collection-DSKqMgvr.mjs";
 import { Collection, CollectionPage, Note, OrderedCollection, Person, traverseCollection } from "@fedify/vocab";
 import { FetchError, encodeMultibase, exportDidKey, preloadedContexts } from "@fedify/vocab-runtime";
 import { test } from "@fedify/fixture";

package/dist/sig/portable-interop.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { c as verifyPortableObjectProof, d as verifyProof } from "../proof-DuSE1ABD.mjs";
-import { n as getKeyOwner } from "../owner-BHUhedVc.mjs";
-import { t as verifyPortableObject } from "../portable-collection-DONEPTXV.mjs";
+import { c as verifyPortableObjectProof, d as verifyProof } from "../proof-kJtQ49gr.mjs";
+import { n as getKeyOwner } from "../owner-Dc-Lg_Xn.mjs";
+import { t as verifyPortableObject } from "../portable-collection-DSKqMgvr.mjs";
 import { Application, DataIntegrityProof, lookupObject } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region test-vectors/fep-ef61/tootik-v0.25.4/actor.json

package/dist/sig/portable-key.test.mjs

@@ -2,13 +2,13 @@ import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
-import { S as fetchKeyDetailed, h as verifyJsonLd, p as signJsonLd, x as fetchKey } from "../ld-Dkkyk65e.mjs";
-import { d as verifyProof, r as createProof } from "../proof-DuSE1ABD.mjs";
-import { n as resolvePortableActorKey } from "../portable-key-Cdw3vfl-.mjs";
-import { f as verifyRequest, l as signRequest, p as verifyRequestDetailed } from "../http-B5w_qcIg.mjs";
+import { S as fetchKeyDetailed, h as verifyJsonLd, p as signJsonLd, x as fetchKey } from "../ld-Cy86r-Ty.mjs";
+import { d as verifyProof, r as createProof } from "../proof-kJtQ49gr.mjs";
+import { n as resolvePortableActorKey } from "../portable-key-ClXZ25LT.mjs";
+import { f as verifyRequest, l as signRequest, p as verifyRequestDetailed } from "../http-DkLKT8Vp.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-BHUhedVc.mjs";
-import { t as KvKeyCache } from "../keycache-D-MNltOk.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-Dc-Lg_Xn.mjs";
+import { t as KvKeyCache } from "../keycache-N2opu4-3.mjs";
 import { Create, CryptographicKey, Multikey, Note, Person } from "@fedify/vocab";
 import { FetchError, encodeMultibase, exportDidKey, exportSpki, parseIri, preloadedContexts } from "@fedify/vocab-runtime";
 import { test } from "@fedify/fixture";