@fedify/fedify 2.3.13 → 2.3.15-dev.2482

package/dist/sig/proof.test.mjs

@@ -8,7 +8,7 @@ import { n as assertGreaterOrEqual, t as assertRejects } from "../assert_rejects
 import { n as assertInstanceOf, t as assert } from "../assert-CEO06XCw.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-D4iTv7uM.mjs";
-import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-mf6h7n4_.mjs";
+import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-DMcUrrp8.mjs";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { decodeMultibase, importMultibaseKey } from "@fedify/vocab-runtime";
@@ -599,5 +599,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/{temporal-_3yIqdvy.mjs → temporal-Cji8Y8eQ.mjs}

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

package/dist/utils/docloader.test.mjs

@@ -5,9 +5,9 @@ import { t as esm_default } from "../esm-vrlUxr60.mjs";
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BjJn2daJ.mjs";
 import { t as assertRejects } from "../assert_rejects-D1HYAik3.mjs";
-import { l as verifyRequest } from "../http-BRrpIDS1.mjs";
+import { l as verifyRequest } from "../http-BNCLeQJ-.mjs";
 import { i as rsaPrivateKey2 } from "../keys-BAK-tUlf.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-QDpF5t9M.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-BVj35vgR.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
@@ -466,6 +466,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";
 }

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

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

package/dist/utils/mod.cjs

@@ -1,6 +1,6 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_kv_cache = require("../kv-cache-poF6Tqnz.cjs");
+const require_kv_cache = require("../kv-cache-Bw_gduSm.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 "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-BmqdF048.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-C0AqpjoS.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.3.13",
+  "version": "2.3.15-dev.2482+41d364a2",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -152,10 +152,10 @@
     "jsonld": "^9.0.0",
     "structured-field-values": "^2.0.4",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/uri-template": "2.3.13",
-    "@fedify/vocab": "2.3.13",
-    "@fedify/vocab-runtime": "2.3.13",
-    "@fedify/webfinger": "2.3.13"
+    "@fedify/vocab": "2.3.15-dev.2482+41d364a2",
+    "@fedify/vocab-runtime": "2.3.15-dev.2482+41d364a2",
+    "@fedify/uri-template": "2.3.15-dev.2482+41d364a2",
+    "@fedify/webfinger": "2.3.15-dev.2482+41d364a2"
   },
   "devDependencies": {
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
@@ -168,7 +168,7 @@
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
     "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.3.13"
+    "@fedify/vocab-tools": "^2.3.15-dev.2482+41d364a2"
   },
   "scripts": {
     "build:self": "tsdown",