@fedify/fedify 2.4.3 → 2.4.5-dev.2442

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-Qk4WqslS.mjs";
+import { C as generateCryptoKeyPair, S as fetchKeyDetailed, T as validateCryptoKey, _ as wrapContextLoaderForJsonLd, w as importJwk, x as fetchKey, y as exportJwk } from "../ld-DjK2r7Tq.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-Qk4WqslS.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-DjK2r7Tq.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-nIOXkRme.mjs";
-import { p as verifyRequestDetailed } from "../http-CQcqhcga.mjs";
-import { o as createFederation } from "../middleware-B582s7UO.mjs";
-import { t as doesActorOwnKey } from "../owner-CcyHGdSK.mjs";
+import { c as verifyPortableObjectProof } from "../proof-bC_S5Pka.mjs";
+import { p as verifyRequestDetailed } from "../http-wf5LuVhT.mjs";
+import { o as createFederation } from "../middleware-VMeVcza7.mjs";
+import { t as doesActorOwnKey } from "../owner-MYmQvfAW.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-nIOXkRme.mjs";
-import { p as verifyRequestDetailed } from "../http-CQcqhcga.mjs";
-import { t as doesActorOwnKey } from "../owner-CcyHGdSK.mjs";
+import { c as verifyPortableObjectProof } from "../proof-bC_S5Pka.mjs";
+import { p as verifyRequestDetailed } from "../http-wf5LuVhT.mjs";
+import { t as doesActorOwnKey } from "../owner-MYmQvfAW.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-BFC8b7mH.cjs");
-const require_portable_collection = require("../portable-collection-BHZq0F_c.cjs");
+const require_http = require("../http-DwiAt6qm.cjs");
+const require_portable_collection = require("../portable-collection-Dqycbd4w.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-B5pRXkmQ.js";
-import { n as doesActorOwnKey, r as getKeyOwner, t as verifyPortableObject } from "../portable-collection-Chb6A43p.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-Eia1HcEX.js";
+import { n as doesActorOwnKey, r as getKeyOwner, t as verifyPortableObject } from "../portable-collection-DOJ_TENm.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-CcyHGdSK.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-MYmQvfAW.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-0RzCsflU.mjs";
+import { t as verifyPortableObject } from "../portable-collection-DQnT0cZ4.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-nIOXkRme.mjs";
-import { n as getKeyOwner } from "../owner-CcyHGdSK.mjs";
-import { t as verifyPortableObject } from "../portable-collection-0RzCsflU.mjs";
+import { c as verifyPortableObjectProof, d as verifyProof } from "../proof-bC_S5Pka.mjs";
+import { n as getKeyOwner } from "../owner-MYmQvfAW.mjs";
+import { t as verifyPortableObject } from "../portable-collection-DQnT0cZ4.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-Qk4WqslS.mjs";
-import { d as verifyProof, r as createProof } from "../proof-nIOXkRme.mjs";
-import { n as resolvePortableActorKey } from "../portable-key-BY6G_X28.mjs";
-import { f as verifyRequest, l as signRequest, p as verifyRequestDetailed } from "../http-CQcqhcga.mjs";
+import { S as fetchKeyDetailed, h as verifyJsonLd, p as signJsonLd, x as fetchKey } from "../ld-DjK2r7Tq.mjs";
+import { d as verifyProof, r as createProof } from "../proof-bC_S5Pka.mjs";
+import { n as resolvePortableActorKey } from "../portable-key-BCK9qPc6.mjs";
+import { f as verifyRequest, l as signRequest, p as verifyRequestDetailed } from "../http-wf5LuVhT.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-CcyHGdSK.mjs";
-import { t as KvKeyCache } from "../keycache-D-MNltOk.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-MYmQvfAW.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";

package/dist/sig/proof.test.mjs

@@ -11,10 +11,10 @@ import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { a as verificationObservation } from "../verification-Dpfcw8ml.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { a as signObject, c as verifyPortableObjectProof, d as verifyProof, i as hasProofLike, o as verifyMapLocalProof, r as createProof, s as verifyObject } from "../proof-nIOXkRme.mjs";
-import { f as verifyRequest } from "../http-CQcqhcga.mjs";
+import { a as signObject, c as verifyPortableObjectProof, d as verifyProof, i as hasProofLike, o as verifyMapLocalProof, r as createProof, s as verifyObject } from "../proof-bC_S5Pka.mjs";
+import { f as verifyRequest } from "../http-wf5LuVhT.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-Wf9RroxL.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-XwuoivPh.mjs";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place, Translation } from "@fedify/vocab";
 import { decodeMultibase, encodeMultibase, exportDidKey, exportMultibaseKey, formatIri, importMultibaseKey, parseIri } from "@fedify/vocab-runtime";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
@@ -2464,5 +2464,56 @@ test("getAuthenticatedDocumentLoader() signs portable object requests to gateway
 		esm_default.hardReset();
 	}
 });
+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/sig/tootik-request-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-nIOXkRme.mjs";
-import { p as verifyRequestDetailed } from "../http-CQcqhcga.mjs";
-import { o as createFederation } from "../middleware-B582s7UO.mjs";
-import { t as doesActorOwnKey } from "../owner-CcyHGdSK.mjs";
+import { c as verifyPortableObjectProof } from "../proof-bC_S5Pka.mjs";
+import { p as verifyRequestDetailed } from "../http-wf5LuVhT.mjs";
+import { o as createFederation } from "../middleware-VMeVcza7.mjs";
+import { t as doesActorOwnKey } from "../owner-MYmQvfAW.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { encodeHex } from "byte-encodings/hex";

package/dist/sig/tootik-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-nIOXkRme.mjs";
-import { p as verifyRequestDetailed } from "../http-CQcqhcga.mjs";
-import { t as doesActorOwnKey } from "../owner-CcyHGdSK.mjs";
+import { c as verifyPortableObjectProof } from "../proof-bC_S5Pka.mjs";
+import { p as verifyRequestDetailed } from "../http-wf5LuVhT.mjs";
+import { t as doesActorOwnKey } from "../owner-MYmQvfAW.mjs";
 import { Create } from "@fedify/vocab";
 import { decodeMultibase, importDidKey } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/sig/verification.test.mjs

@@ -2,9 +2,9 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { a as verificationObservation } from "../verification-Dpfcw8ml.mjs";
-import { h as verifyJsonLd, p as signJsonLd } from "../ld-Qk4WqslS.mjs";
-import { a as signObject, s as verifyObject } from "../proof-nIOXkRme.mjs";
-import { l as signRequest, p as verifyRequestDetailed } from "../http-CQcqhcga.mjs";
+import { h as verifyJsonLd, p as signJsonLd } from "../ld-DjK2r7Tq.mjs";
+import { a as signObject, s as verifyObject } from "../proof-bC_S5Pka.mjs";
+import { l as signRequest, p as verifyRequestDetailed } from "../http-wf5LuVhT.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
 import { Activity, Create, CryptographicKey, Multikey } from "@fedify/vocab";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/{temporal-D5tHfTGO.mjs → temporal-BaGwCXi9.mjs}

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

package/dist/testing/kv.test.mjs

@@ -6,7 +6,7 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as ManualClockKvStore } from "../kv-DBRWVx3Q.mjs";
 import { n as baseOptions, o as stringSchema, t as MockQueue } from "../tasks-IG3pHfvZ.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
-import { o as createFederation } from "../middleware-B582s7UO.mjs";
+import { o as createFederation } from "../middleware-VMeVcza7.mjs";
 //#region src/testing/kv.test.ts
 test("ManualClockKvStore keeps an entry at its exact expiration instant", async () => {
 	const kv = new ManualClockKvStore();

package/dist/utils/docloader.test.mjs

@@ -5,9 +5,9 @@ import { t as esm_default } from "../esm-BHXXx4Wx.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
-import { f as verifyRequest } from "../http-CQcqhcga.mjs";
+import { f as verifyRequest } from "../http-wf5LuVhT.mjs";
 import { i as rsaPrivateKey2 } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-Wf9RroxL.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-XwuoivPh.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";
@@ -635,6 +635,70 @@ const unsupportedUrls = [
 	"file:///collection",
 	`data:application/ld+json,${encodeURIComponent(JSON.stringify({ id: "https://example.com/data" }))}`
 ];
+function isCredentialUrlError(error) {
+	return error instanceof UrlError && error.reason === "disallowed" && error.message === "URLs with credentials are not allowed";
+}
+test("getAuthenticatedDocumentLoader() rejects URLs with credentials", async (t) => {
+	const identity = {
+		keyId: new URL("https://example.com/key2"),
+		privateKey: rsaPrivateKey2
+	};
+	const start = "https://8.8.8.8/start";
+	const target = "https://user:pass@8.8.8.8/document";
+	for (const allowPrivateAddress of [false, true]) {
+		const loader = getAuthenticatedDocumentLoader(identity, { allowPrivateAddress });
+		for (const path of [
+			"direct",
+			"redirect",
+			"Link",
+			"HTML"
+		]) await t.step(`${path}, allowPrivateAddress=${allowPrivateAddress}`, async () => {
+			await withFetchStub((request) => {
+				if (request.url !== start) return Response.json({});
+				if (path === "redirect") return Response.redirect(target, 302);
+				if (path === "HTML") return new Response(`<link rel="alternate" type="application/activity+json" href="${target}">`, { headers: { "Content-Type": "text/html" } });
+				return new Response("", { headers: {
+					"Content-Type": "text/plain",
+					Link: `<${target}>; rel="alternate"; type="application/activity+json"`
+				} });
+			}, async (fetched) => {
+				await rejects(loader(path === "direct" ? target : start), isCredentialUrlError);
+				deepStrictEqual(fetched.map((r) => r.url), path === "direct" ? [] : [start]);
+			});
+		});
+		for (const url of [
+			"https://user@8.8.8.8/document",
+			"https://:pass@8.8.8.8/document",
+			"https://%75ser:p%40ss@8.8.8.8/document",
+			"http://user:pass@8.8.8.8/document"
+		]) await t.step(`${url}, allowPrivateAddress=${allowPrivateAddress}`, async () => {
+			await withFetchStub(() => Response.json({}), async (fetched) => {
+				await rejects(loader(url), isCredentialUrlError);
+				deepStrictEqual(fetched, []);
+			});
+		});
+		for (const url of ["https://:@8.8.8.8/document", "https://8.8.8.8/@user?q=@pass"]) await t.step(`allows ${url}, allowPrivateAddress=${allowPrivateAddress}`, async () => {
+			await withFetchStub(() => Response.json({ done: true }), async (fetched) => {
+				deepStrictEqual((await loader(url)).document, { done: true });
+				deepStrictEqual(fetched.map((r) => r.url), [new URL(url).href]);
+			});
+		});
+	}
+	for (const firstSpec of ["rfc9421", "draft-cavage-http-signatures-12"]) await t.step(`redirect after fallback from ${firstSpec}`, async () => {
+		const loader = getAuthenticatedDocumentLoader(identity, {
+			allowPrivateAddress: true,
+			specDeterminer: {
+				determineSpec: () => firstSpec,
+				rememberSpec: () => {}
+			}
+		});
+		await withFetchStub((request) => request.url !== start ? Response.json({}) : request.headers.has("Signature-Input") === (firstSpec === "rfc9421") ? new Response(null, { status: 401 }) : Response.redirect(target, 302), async (fetched) => {
+			await rejects(loader(start), isCredentialUrlError);
+			deepStrictEqual(fetched.map((r) => r.url), [start, start]);
+			deepStrictEqual(fetched.map((r) => r.headers.has("Signature-Input")), [firstSpec === "rfc9421", firstSpec !== "rfc9421"]);
+		});
+	});
+});
 function isUnsupportedProtocolError(error, url) {
 	return error instanceof UrlError && error.message === `Unsupported protocol: ${new URL(url).protocol}` && error.reason === "disallowed";
 }