@fedify/fedify 2.4.2 → 2.4.4

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-DuSE1ABD.mjs";
-import { f as verifyRequest } from "../http-B5w_qcIg.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-kJtQ49gr.mjs";
+import { f as verifyRequest } from "../http-DkLKT8Vp.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-DUXXI-7G.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-DFB_TNVp.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-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 { 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-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 { 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-Dkkyk65e.mjs";
-import { a as signObject, s as verifyObject } from "../proof-DuSE1ABD.mjs";
-import { l as signRequest, p as verifyRequestDetailed } from "../http-B5w_qcIg.mjs";
+import { h as verifyJsonLd, p as signJsonLd } from "../ld-Cy86r-Ty.mjs";
+import { a as signObject, s as verifyObject } from "../proof-kJtQ49gr.mjs";
+import { l as signRequest, p as verifyRequestDetailed } from "../http-DkLKT8Vp.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-iyAxBq0I.mjs → temporal-C8WqyM34.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { c as getNormalizationContextLoader } from "./ld-Dkkyk65e.mjs";
+import { c as getNormalizationContextLoader } from "./ld-Cy86r-Ty.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-C-swet0z.mjs";
+import { o as createFederation } from "../middleware-C_gtR3fV.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-B5w_qcIg.mjs";
+import { f as verifyRequest } from "../http-DkLKT8Vp.mjs";
 import { i as rsaPrivateKey2 } from "../keys-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-DUXXI-7G.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-DFB_TNVp.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";
@@ -99,45 +99,50 @@ test("getAuthenticatedDocumentLoader() validates redirects", async (t) => {
 	});
 	esm_default.hardReset();
 });
-test("getAuthenticatedDocumentLoader() cancellation", {
-	sanitizeResources: false,
-	sanitizeOps: false
-}, async (t) => {
+test("getAuthenticatedDocumentLoader() cancellation", async (t) => {
 	esm_default.spyGlobal();
-	await t.step("document loader cancellation", async () => {
-		esm_default.get("https://example.com/slow-object", () => new Promise((resolve) => {
-			setTimeout(() => {
-				resolve({
-					status: 200,
-					headers: { "Content-Type": "application/activity+json" },
-					body: {
-						"@context": "https://www.w3.org/ns/activitystreams",
-						type: "Note",
-						content: "Slow response"
-					}
+	try {
+		await t.step("document loader cancellation", async () => {
+			let responseTimer;
+			try {
+				esm_default.get("https://example.com/slow-object", () => new Promise((resolve) => {
+					responseTimer = setTimeout(() => {
+						resolve({
+							status: 200,
+							headers: { "Content-Type": "application/activity+json" },
+							body: {
+								"@context": "https://www.w3.org/ns/activitystreams",
+								type: "Note",
+								content: "Slow response"
+							}
+						});
+					}, 1e3);
+				}));
+				const loader = getAuthenticatedDocumentLoader({
+					keyId: new URL("https://example.com/key2"),
+					privateKey: rsaPrivateKey2
 				});
-			}, 1e3);
-		}));
-		const loader = getAuthenticatedDocumentLoader({
-			keyId: new URL("https://example.com/key2"),
-			privateKey: rsaPrivateKey2
+				const controller = new AbortController();
+				const promise = loader("https://example.com/slow-object", { signal: controller.signal });
+				controller.abort();
+				await assertRejects(() => promise, Error);
+				await assertRejects(() => loader("https://example.com/object", { signal: controller.signal }), Error);
+			} finally {
+				clearTimeout(responseTimer);
+			}
 		});
-		const controller = new AbortController();
-		const promise = loader("https://example.com/slow-object", { signal: controller.signal });
-		controller.abort();
-		await assertRejects(() => promise, Error);
-		await assertRejects(() => loader("https://example.com/object", { signal: controller.signal }), Error);
-	});
-	await t.step("immediate cancellation", async () => {
-		const loader = getAuthenticatedDocumentLoader({
-			keyId: new URL("https://example.com/key2"),
-			privateKey: rsaPrivateKey2
+		await t.step("immediate cancellation", async () => {
+			const loader = getAuthenticatedDocumentLoader({
+				keyId: new URL("https://example.com/key2"),
+				privateKey: rsaPrivateKey2
+			});
+			const controller = new AbortController();
+			controller.abort();
+			await assertRejects(() => loader("https://example.com/object", { signal: controller.signal }), Error);
 		});
-		const controller = new AbortController();
-		controller.abort();
-		await assertRejects(() => loader("https://example.com/object", { signal: controller.signal }), Error);
-	});
-	esm_default.hardReset();
+	} finally {
+		esm_default.hardReset();
+	}
 });
 test("getAuthenticatedDocumentLoader() bounds JSON after redirects", async () => {
 	esm_default.mockGlobal();
@@ -625,5 +630,139 @@ test("getAuthenticatedDocumentLoader() times out", async (t) => {
 		}
 	});
 });
+const unsupportedUrls = [
+	"ftp://example.com/collection",
+	"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";
+}
+async function withFetchStub(respond, callback) {
+	const fetched = [];
+	const originalFetch = globalThis.fetch;
+	globalThis.fetch = ((input, init) => {
+		const request = input instanceof Request && init == null ? input : new Request(input, init);
+		fetched.push(request);
+		return Promise.resolve(respond(request));
+	});
+	try {
+		await callback(fetched);
+	} finally {
+		globalThis.fetch = originalFetch;
+	}
+}
+for (const url of unsupportedUrls) {
+	const scheme = new URL(url).protocol;
+	const loader = getAuthenticatedDocumentLoader({
+		keyId: new URL("https://example.com/key2"),
+		privateKey: rsaPrivateKey2
+	}, { allowPrivateAddress: true });
+	test(`getAuthenticatedDocumentLoader() rejects ${scheme} URLs with private addresses allowed before fetching`, async () => {
+		await withFetchStub(() => Response.json({}), async (fetched) => {
+			await rejects(loader(url), (e) => isUnsupportedProtocolError(e, url));
+			deepStrictEqual(fetched, []);
+		});
+	});
+	test(`getAuthenticatedDocumentLoader() rejects redirects to ${scheme} URLs with private addresses allowed`, async () => {
+		const start = "https://example.com/redirect-to-unsupported";
+		await withFetchStub(() => Response.redirect(url, 302), async (fetched) => {
+			await rejects(loader(start), (e) => isUnsupportedProtocolError(e, url));
+			deepStrictEqual(fetched.map((r) => r.url), [start]);
+		});
+	});
+	for (const firstSpec of ["rfc9421", "draft-cavage-http-signatures-12"]) test(`getAuthenticatedDocumentLoader() rejects redirects to ${scheme} URLs after signature fallback from ${firstSpec}`, async () => {
+		const start = "https://example.com/fallback-redirect-to-unsupported";
+		const fallbackLoader = getAuthenticatedDocumentLoader({
+			keyId: new URL("https://example.com/key2"),
+			privateKey: rsaPrivateKey2
+		}, {
+			allowPrivateAddress: true,
+			specDeterminer: {
+				determineSpec: () => firstSpec,
+				rememberSpec: () => {}
+			}
+		});
+		await withFetchStub((request) => request.headers.has("Signature-Input") === (firstSpec === "rfc9421") ? new Response("Unauthorized", { status: 401 }) : Response.redirect(url, 302), async (fetched) => {
+			await rejects(fallbackLoader(start), (e) => isUnsupportedProtocolError(e, url));
+			deepStrictEqual(fetched.map((r) => r.url), [start, start]);
+			deepStrictEqual(fetched.map((r) => r.headers.has("Signature-Input")), [firstSpec === "rfc9421", firstSpec !== "rfc9421"]);
+		});
+	});
+	for (const html of [false, true]) test(`getAuthenticatedDocumentLoader() rejects ${html ? "HTML" : "Link header"} alternates to ${scheme} URLs with private addresses allowed`, async () => {
+		const start = "https://example.com/alternate-to-unsupported";
+		await withFetchStub(() => html ? new Response(`<link rel="alternate" type="application/activity+json" href="${url}">`, { headers: { "Content-Type": "text/html" } }) : new Response("", { headers: {
+			"Content-Type": "text/plain",
+			Link: `<${url}>; rel="alternate"; type="application/activity+json"`
+		} }), async (fetched) => {
+			await rejects(loader(start), (e) => isUnsupportedProtocolError(e, url));
+			deepStrictEqual(fetched.map((r) => r.url), [start]);
+		});
+	});
+}
 //#endregion
 export {};

package/dist/utils/kv-cache.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as kvCache, t as MockKvStore } from "../kv-cache-BgQMAKIg.mjs";
+import { n as kvCache, t as MockKvStore } from "../kv-cache-BxfOpUP9.mjs";
 import { preloadedContexts } from "@fedify/vocab-runtime";
 import { deepStrictEqual, throws } from "node:assert";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";

package/dist/utils/mod.cjs

@@ -1,5 +1,5 @@
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_kv_cache = require("../kv-cache-D4throaQ.cjs");
+const require_kv_cache = require("../kv-cache-HsXADkl9.cjs");
 exports.getAuthenticatedDocumentLoader = require_kv_cache.getAuthenticatedDocumentLoader;
 exports.kvCache = require_kv_cache.kvCache;

package/dist/utils/mod.js

@@ -1,4 +1,4 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-B0SZfzFb.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-C0AsMZ4U.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -151,10 +151,10 @@
     "structured-field-values": "^2.0.4",
     "temporal-polyfill": "^1.0.1",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/uri-template": "2.4.2",
-    "@fedify/vocab-runtime": "2.4.2",
-    "@fedify/webfinger": "2.4.2",
-    "@fedify/vocab": "2.4.2"
+    "@fedify/uri-template": "2.4.4",
+    "@fedify/vocab-runtime": "2.4.4",
+    "@fedify/webfinger": "2.4.4",
+    "@fedify/vocab": "2.4.4"
   },
   "devDependencies": {
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
@@ -167,7 +167,7 @@
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
     "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.4.2"
+    "@fedify/vocab-tools": "^2.4.4"
   },
   "scripts": {
     "build:self": "tsdown",