@fedify/fedify 2.0.33-dev.2393 → 2.0.33-dev.2414

package/dist/sig/owner.test.mjs

@@ -2,11 +2,11 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BUOJXi-Z.mjs";
-import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
+import "../std__assert-DflMZha5.mjs";
+import { r as assertFalse } from "../assert_throws-D4DNWrux.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
 import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-CCxRJhWa.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-BjEWxmUB.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-DRXYR3jY.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 //#region src/sig/owner.test.ts

package/dist/sig/proof.test.mjs

@@ -2,11 +2,11 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BUOJXi-Z.mjs";
-import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
+import "../std__assert-DflMZha5.mjs";
 import { n as assertInstanceOf } from "../assert-BhQd8QHP.mjs";
+import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CCxRJhWa.mjs";
-import { i as verifyProof, n as signObject, r as verifyObject, t as createProof } from "../proof-Bql3eTTO.mjs";
+import { i as verifyProof, n as signObject, r as verifyObject, t as createProof } from "../proof-DYP1abqL.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, DataIntegrityProof, Multikey, Note, Place } from "@fedify/vocab";
 import { decodeMultibase, importMultibaseKey } from "@fedify/vocab-runtime";

package/dist/{std__assert-BUOJXi-Z.mjs → std__assert-DflMZha5.mjs}

@@ -2,8 +2,8 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { a as red, i as buildMessage, l as AssertionError, n as diffStr, r as diff, s as format } from "./assert_equals-Ew3jOFa3.mjs";
-import "./assert_rejects-B-qJtC9Z.mjs";
-import "./assert_throws-4NwKEy2q.mjs";
+import "./assert_throws-D4DNWrux.mjs";
+import "./assert_rejects-WyYSTDDX.mjs";
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_exists.js
 /**
 * Make an assertion that actual is not null or undefined.

package/dist/{temporal-DfRW9i0G.mjs → temporal-BwiXwu1s.mjs}

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

package/dist/utils/docloader.test.mjs

@@ -3,11 +3,11 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-DVILvP5e.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BUOJXi-Z.mjs";
-import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
-import { l as verifyRequest } from "../http-3dkQNA1w.mjs";
+import "../std__assert-DflMZha5.mjs";
+import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
+import { l as verifyRequest } from "../http-BRdkmpRl.mjs";
 import { i as rsaPrivateKey2 } from "../keys-CCxRJhWa.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-BrE3qvhE.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-C40rdqSR.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
 import { configure, reset } from "@logtape/logtape";
@@ -445,5 +445,75 @@ test("getAuthenticatedDocumentLoader() rejects cancellation before fetching", as
 		esm_default.hardReset();
 	}
 });
+const unsupportedUrls = [
+	"ftp://example.com/collection",
+	"file:///collection",
+	`data:application/ld+json,${encodeURIComponent(JSON.stringify({ id: "https://example.com/data" }))}`
+];
+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/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-C1QP476R.cjs");
+const require_kv_cache = require("../kv-cache-CCCwr3Y2.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-CCRkxYgt.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-DT2Fk4wy.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.0.33-dev.2393+8f913f03",
+  "version": "2.0.33-dev.2414+98deefa2",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -144,9 +144,9 @@
     "uri-template-router": "^1.0.0",
     "url-template": "^3.1.1",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab": "2.0.33-dev.2393+8f913f03",
-    "@fedify/webfinger": "2.0.33-dev.2393+8f913f03",
-    "@fedify/vocab-runtime": "2.0.33-dev.2393+8f913f03"
+    "@fedify/vocab": "2.0.33-dev.2414+98deefa2",
+    "@fedify/vocab-runtime": "2.0.33-dev.2414+98deefa2",
+    "@fedify/webfinger": "2.0.33-dev.2414+98deefa2"
   },
   "devDependencies": {
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
@@ -159,7 +159,7 @@
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
     "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.0.33-dev.2393+8f913f03"
+    "@fedify/vocab-tools": "^2.0.33-dev.2414+98deefa2"
   },
   "scripts": {
     "build:self": "tsdown",