@fedify/vocab-runtime 2.4.2-dev.2362 → 2.4.3

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.4.2-dev.2362+46a1084e",
+  "version": "2.4.3",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",

package/dist/mod.cjs

@@ -16,7 +16,7 @@ let _multiformats_base_x = require("@multiformats/base-x");
 _multiformats_base_x = require_rolldown_runtime.__toESM(_multiformats_base_x, 1);
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.2-dev.2362+46a1084e";
+var version = "2.4.3";
 //#endregion
 //#region src/request.ts
 /**
@@ -688,7 +688,9 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 	const maximumRedirection = maxRedirection ?? DEFAULT_MAX_REDIRECTION;
 	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
 		options?.signal?.throwIfAborted();
-		const currentUrl = new URL(url).href;
+		const parsedUrl = new URL(url);
+		if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") throw new require_url.UrlError(`Unsupported protocol: ${parsedUrl.protocol}`);
+		const currentUrl = parsedUrl.href;
 		if (!skipPreloadedContexts && currentUrl in require_contexts.preloadedContexts) {
 			logger.debug("Using preloaded context: {url}.", { url: currentUrl });
 			return {

package/dist/mod.js

@@ -12,7 +12,7 @@ import { PublicKeyInfo } from "pkijs";
 import baseX from "@multiformats/base-x";
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.2-dev.2362+46a1084e";
+var version = "2.4.3";
 //#endregion
 //#region src/request.ts
 /**
@@ -684,7 +684,9 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 	const maximumRedirection = maxRedirection ?? DEFAULT_MAX_REDIRECTION;
 	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
 		options?.signal?.throwIfAborted();
-		const currentUrl = new URL(url).href;
+		const parsedUrl = new URL(url);
+		if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") throw new UrlError(`Unsupported protocol: ${parsedUrl.protocol}`);
+		const currentUrl = parsedUrl.href;
 		if (!skipPreloadedContexts && currentUrl in preloadedContexts) {
 			logger.debug("Using preloaded context: {url}.", { url: currentUrl });
 			return {

package/dist/tests/{body-CVX6mBij.mjs → body-BxgQG9WC.mjs}

@@ -1,4 +1,4 @@
-import { t as FetchError } from "./request-C0k1VFck.mjs";
+import { t as FetchError } from "./request-oKt9AzpG.mjs";
 import { getLogger } from "@logtape/logtape";
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */

package/dist/tests/{body-2150rRqY.cjs → body-CvKsJb4Z.cjs}

@@ -1,4 +1,4 @@
-const require_request = require("./request-BsWikXMu.cjs");
+const require_request = require("./request-CpZhH4yT.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */

package/dist/tests/body.test.cjs

@@ -1,4 +1,4 @@
-const require_body = require("./body-2150rRqY.cjs");
+const require_body = require("./body-CvKsJb4Z.cjs");
 let node_assert_strict = require("node:assert/strict");
 let node_test = require("node:test");
 let node_zlib = require("node:zlib");

package/dist/tests/body.test.mjs

@@ -1,4 +1,4 @@
-import { i as readBoundedText, t as BodyTooLargeError } from "./body-CVX6mBij.mjs";
+import { i as readBoundedText, t as BodyTooLargeError } from "./body-BxgQG9WC.mjs";
 import { deepStrictEqual, ok, rejects } from "node:assert/strict";
 import { test } from "node:test";
 import { gunzipSync, gzipSync } from "node:zlib";

package/dist/tests/decimal.test.cjs

@@ -1,11 +1,11 @@
 require("./url-BNakuZ8k.cjs");
-require("./docloader-BQhN7XvQ.cjs");
+require("./docloader-BrNGu5hc.cjs");
 require("./key-C-AYkdJJ.cjs");
 require("./multibase-B5Mea7Ip.cjs");
 require("./digest-3FeH2Y-Q.cjs");
 require("./langtag-Czjvxfzx.cjs");
 require("./langstr-_PqsL1ae.cjs");
-require("./portable-media-CAZBjFVO.cjs");
+require("./portable-media-CFeo3eUn.cjs");
 let node_test = require("node:test");
 let node_assert = require("node:assert");
 //#region src/decimal.ts

package/dist/tests/decimal.test.mjs

@@ -1,11 +1,11 @@
 import "./url-DMxmp7ZG.mjs";
-import "./docloader-BjD23rqy.mjs";
+import "./docloader-BVdiOb_c.mjs";
 import "./key-C2Db_TAJ.mjs";
 import "./multibase-BPnF_L4e.mjs";
 import "./digest-COC7xDiQ.mjs";
 import "./langtag-CUppHs_s.mjs";
 import "./langstr-DYRmJqFn.mjs";
-import "./portable-media-DvGLWcIZ.mjs";
+import "./portable-media-B1iQbOVN.mjs";
 import { test } from "node:test";
 import { deepStrictEqual, throws } from "node:assert";
 //#region src/decimal.ts

package/dist/tests/{docloader-BjD23rqy.mjs → docloader-BVdiOb_c.mjs}

@@ -1,5 +1,5 @@
-import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-C0k1VFck.mjs";
-import { i as readBoundedText, n as MAX_BODY_SIZE, r as readBoundedBytes, t as BodyTooLargeError } from "./body-CVX6mBij.mjs";
+import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-oKt9AzpG.mjs";
+import { i as readBoundedText, n as MAX_BODY_SIZE, r as readBoundedBytes, t as BodyTooLargeError } from "./body-BxgQG9WC.mjs";
 import { t as preloadedContexts } from "./contexts-duRA_dDC.mjs";
 import { t as HttpHeaderLink } from "./link-Cevmc87v.mjs";
 import { n as UrlError, x as validatePublicUrl } from "./url-DMxmp7ZG.mjs";
@@ -291,7 +291,9 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 	const maximumRedirection = maxRedirection ?? DEFAULT_MAX_REDIRECTION;
 	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
 		options?.signal?.throwIfAborted();
-		const currentUrl = new URL(url).href;
+		const parsedUrl = new URL(url);
+		if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") throw new UrlError(`Unsupported protocol: ${parsedUrl.protocol}`);
+		const currentUrl = parsedUrl.href;
 		if (!skipPreloadedContexts && currentUrl in preloadedContexts) {
 			logger.debug("Using preloaded context: {url}.", { url: currentUrl });
 			return {

package/dist/tests/{docloader-BQhN7XvQ.cjs → docloader-BrNGu5hc.cjs}

@@ -1,5 +1,5 @@
-const require_request = require("./request-BsWikXMu.cjs");
-const require_body = require("./body-2150rRqY.cjs");
+const require_request = require("./request-CpZhH4yT.cjs");
+const require_body = require("./body-CvKsJb4Z.cjs");
 const require_contexts = require("./contexts-C9Lj11SC.cjs");
 const require_link = require("./link-DlKm8bEr.cjs");
 const require_url = require("./url-BNakuZ8k.cjs");
@@ -291,7 +291,9 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 	const maximumRedirection = maxRedirection ?? DEFAULT_MAX_REDIRECTION;
 	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
 		options?.signal?.throwIfAborted();
-		const currentUrl = new URL(url).href;
+		const parsedUrl = new URL(url);
+		if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") throw new require_url.UrlError(`Unsupported protocol: ${parsedUrl.protocol}`);
+		const currentUrl = parsedUrl.href;
 		if (!skipPreloadedContexts && currentUrl in require_contexts.preloadedContexts) {
 			logger.debug("Using preloaded context: {url}.", { url: currentUrl });
 			return {

package/dist/tests/docloader.test.cjs

@@ -1,8 +1,8 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.cjs");
-const require_request = require("./request-BsWikXMu.cjs");
+const require_request = require("./request-CpZhH4yT.cjs");
 const require_contexts = require("./contexts-C9Lj11SC.cjs");
 const require_url = require("./url-BNakuZ8k.cjs");
-const require_docloader = require("./docloader-BQhN7XvQ.cjs");
+const require_docloader = require("./docloader-BrNGu5hc.cjs");
 const require_jsonld = require("./jsonld-CmDhHNTx.cjs");
 let node_zlib = require("node:zlib");
 let _logtape_logtape = require("@logtape/logtape");
@@ -2371,4 +2371,52 @@ function isTimeoutFetchError(error, url) {
 		})(url), (e) => isTimeoutFetchError(e, url));
 	});
 });
+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 require_url.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) => {
+		const url = input instanceof Request ? input.url : String(input);
+		fetched.push(url);
+		return Promise.resolve(respond(url));
+	};
+	try {
+		await callback(fetched);
+	} finally {
+		globalThis.fetch = originalFetch;
+	}
+}
+for (const url of unsupportedUrls) {
+	const scheme = new URL(url).protocol;
+	(0, _fedify_fixture.test)(`getDocumentLoader() rejects ${scheme} URLs with private addresses allowed before fetching`, async () => {
+		await withFetchStub(() => Response.json({}), async (fetched) => {
+			await (0, node_assert.rejects)(require_docloader.getDocumentLoader({ allowPrivateAddress: true })(url), (e) => isUnsupportedProtocolError(e, url));
+			(0, node_assert.deepStrictEqual)(fetched, []);
+		});
+	});
+	(0, _fedify_fixture.test)(`getDocumentLoader() 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 (0, node_assert.rejects)(require_docloader.getDocumentLoader({ allowPrivateAddress: true })(start), (e) => isUnsupportedProtocolError(e, url));
+			(0, node_assert.deepStrictEqual)(fetched, [start]);
+		});
+	});
+	for (const html of [false, true]) (0, _fedify_fixture.test)(`getDocumentLoader() 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 (0, node_assert.rejects)(require_docloader.getDocumentLoader({ allowPrivateAddress: true })(start), (e) => isUnsupportedProtocolError(e, url));
+			(0, node_assert.deepStrictEqual)(fetched, [start]);
+		});
+	});
+}
 //#endregion

package/dist/tests/docloader.test.mjs

@@ -1,7 +1,7 @@
-import { t as FetchError } from "./request-C0k1VFck.mjs";
+import { t as FetchError } from "./request-oKt9AzpG.mjs";
 import { n as cid_v1_default, t as preloadedContexts } from "./contexts-duRA_dDC.mjs";
 import { n as UrlError } from "./url-DMxmp7ZG.mjs";
-import { i as withDocumentLoaderTimeout, n as getRemoteDocument, r as resolveDocumentLoaderTimeout, t as getDocumentLoader } from "./docloader-BjD23rqy.mjs";
+import { i as withDocumentLoaderTimeout, n as getRemoteDocument, r as resolveDocumentLoaderTimeout, t as getDocumentLoader } from "./docloader-BVdiOb_c.mjs";
 import { t as jsonld_default } from "./jsonld-DweIJ07b.mjs";
 import { gzipSync } from "node:zlib";
 import { configure, reset } from "@logtape/logtape";
@@ -2389,5 +2389,53 @@ test("getDocumentLoader() times out a stalled body of such a status", async () =
 		})(url), (e) => isTimeoutFetchError(e, url));
 	});
 });
+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) => {
+		const url = input instanceof Request ? input.url : String(input);
+		fetched.push(url);
+		return Promise.resolve(respond(url));
+	};
+	try {
+		await callback(fetched);
+	} finally {
+		globalThis.fetch = originalFetch;
+	}
+}
+for (const url of unsupportedUrls) {
+	const scheme = new URL(url).protocol;
+	test(`getDocumentLoader() rejects ${scheme} URLs with private addresses allowed before fetching`, async () => {
+		await withFetchStub(() => Response.json({}), async (fetched) => {
+			await rejects(getDocumentLoader({ allowPrivateAddress: true })(url), (e) => isUnsupportedProtocolError(e, url));
+			deepStrictEqual(fetched, []);
+		});
+	});
+	test(`getDocumentLoader() 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(getDocumentLoader({ allowPrivateAddress: true })(start), (e) => isUnsupportedProtocolError(e, url));
+			deepStrictEqual(fetched, [start]);
+		});
+	});
+	for (const html of [false, true]) test(`getDocumentLoader() 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(getDocumentLoader({ allowPrivateAddress: true })(start), (e) => isUnsupportedProtocolError(e, url));
+			deepStrictEqual(fetched, [start]);
+		});
+	});
+}
 //#endregion
 export {};

package/dist/tests/{portable-media-DvGLWcIZ.mjs → portable-media-B1iQbOVN.mjs}

@@ -1,5 +1,5 @@
-import { r as getUserAgent } from "./request-C0k1VFck.mjs";
-import { r as readBoundedBytes } from "./body-CVX6mBij.mjs";
+import { r as getUserAgent } from "./request-oKt9AzpG.mjs";
+import { r as readBoundedBytes } from "./body-BxgQG9WC.mjs";
 import { g as parseGatewayUrl, x as validatePublicUrl } from "./url-DMxmp7ZG.mjs";
 import { a as verifyDigestMultibase, i as parseHashlink, r as parseDigestMultibase } from "./digest-COC7xDiQ.mjs";
 //#region src/portable-media.ts

package/dist/tests/{portable-media-CAZBjFVO.cjs → portable-media-CFeo3eUn.cjs}

@@ -1,5 +1,5 @@
-const require_request = require("./request-BsWikXMu.cjs");
-const require_body = require("./body-2150rRqY.cjs");
+const require_request = require("./request-CpZhH4yT.cjs");
+const require_body = require("./body-CvKsJb4Z.cjs");
 const require_url = require("./url-BNakuZ8k.cjs");
 const require_digest = require("./digest-3FeH2Y-Q.cjs");
 //#region src/portable-media.ts

package/dist/tests/portable-media.test.cjs

@@ -1,5 +1,5 @@
 const require_digest = require("./digest-3FeH2Y-Q.cjs");
-const require_portable_media = require("./portable-media-CAZBjFVO.cjs");
+const require_portable_media = require("./portable-media-CFeo3eUn.cjs");
 let node_assert_strict = require("node:assert/strict");
 let node_test = require("node:test");
 let node_http = require("node:http");

package/dist/tests/portable-media.test.mjs

@@ -1,5 +1,5 @@
 import { n as createHashlink, t as computeDigestMultibase } from "./digest-COC7xDiQ.mjs";
-import { t as fetchPortableMedia } from "./portable-media-DvGLWcIZ.mjs";
+import { t as fetchPortableMedia } from "./portable-media-B1iQbOVN.mjs";
 import { deepStrictEqual, equal, rejects } from "node:assert/strict";
 import { test } from "node:test";
 import { createServer } from "node:http";

package/dist/tests/{request-BsWikXMu.cjs → request-CpZhH4yT.cjs}

@@ -3,7 +3,7 @@ let node_process = require("node:process");
 node_process = require_rolldown_runtime.__toESM(node_process, 1);
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.2-dev.2362+46a1084e";
+var version = "2.4.3";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/{request-C0k1VFck.mjs → request-oKt9AzpG.mjs}

@@ -1,7 +1,7 @@
 import process from "node:process";
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.2-dev.2362+46a1084e";
+var version = "2.4.3";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/request.test.cjs

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.cjs");
-const require_request = require("./request-BsWikXMu.cjs");
+const require_request = require("./request-CpZhH4yT.cjs");
 let node_test = require("node:test");
 let node_process = require("node:process");
 node_process = require_rolldown_runtime.__toESM(node_process, 1);

package/dist/tests/request.test.mjs

@@ -1,4 +1,4 @@
-import { n as createActivityPubRequest, o as version, r as getUserAgent } from "./request-C0k1VFck.mjs";
+import { n as createActivityPubRequest, o as version, r as getUserAgent } from "./request-oKt9AzpG.mjs";
 import { test } from "node:test";
 import process from "node:process";
 import { deepStrictEqual } from "node:assert";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.4.2-dev.2362+46a1084e",
+  "version": "2.4.3",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",

package/src/docloader.test.ts

@@ -1612,3 +1612,93 @@ test("getDocumentLoader() times out a stalled body of such a status", async () =
     await rejects(loader(url), (e) => isTimeoutFetchError(e, url));
   });
 });
+
+const unsupportedUrls = [
+  "ftp://example.com/collection",
+  "file:///collection",
+  `data:application/ld+json,${
+    encodeURIComponent(JSON.stringify({ id: "https://example.com/data" }))
+  }`,
+];
+
+function isUnsupportedProtocolError(error: unknown, url: string): boolean {
+  return error instanceof UrlError &&
+    error.message === `Unsupported protocol: ${new URL(url).protocol}` &&
+    error.reason === "disallowed";
+}
+
+async function withFetchStub(
+  respond: (url: string) => Response,
+  callback: (fetched: string[]) => Promise<void>,
+): Promise<void> {
+  const fetched: string[] = [];
+  const originalFetch = globalThis.fetch;
+  globalThis.fetch = (input: RequestInfo | URL) => {
+    const url = input instanceof Request ? input.url : String(input);
+    fetched.push(url);
+    return Promise.resolve(respond(url));
+  };
+  try {
+    await callback(fetched);
+  } finally {
+    globalThis.fetch = originalFetch;
+  }
+}
+
+for (const url of unsupportedUrls) {
+  const scheme = new URL(url).protocol;
+
+  test(`getDocumentLoader() rejects ${scheme} URLs with private addresses allowed before fetching`, async () => {
+    await withFetchStub(() => Response.json({}), async (fetched) => {
+      await rejects(
+        getDocumentLoader({ allowPrivateAddress: true })(url),
+        (e) => isUnsupportedProtocolError(e, url),
+      );
+      deepStrictEqual(fetched, []);
+    });
+  });
+
+  test(`getDocumentLoader() 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(
+        getDocumentLoader({ allowPrivateAddress: true })(start),
+        (e) => isUnsupportedProtocolError(e, url),
+      );
+      deepStrictEqual(fetched, [start]);
+    });
+  });
+
+  for (const html of [false, true]) {
+    test(
+      `getDocumentLoader() 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(
+              getDocumentLoader({ allowPrivateAddress: true })(start),
+              (e) => isUnsupportedProtocolError(e, url),
+            );
+            deepStrictEqual(fetched, [start]);
+          },
+        );
+      },
+    );
+  }
+}

package/src/docloader.ts

@@ -557,7 +557,11 @@ export function getDocumentLoader(
     visited = new Set<string>(),
   ): Promise<RemoteDocument> {
     options?.signal?.throwIfAborted();
-    const currentUrl = new URL(url).href;
+    const parsedUrl = new URL(url);
+    if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") {
+      throw new UrlError(`Unsupported protocol: ${parsedUrl.protocol}`);
+    }
+    const currentUrl = parsedUrl.href;
     if (!skipPreloadedContexts && currentUrl in preloadedContexts) {
       logger.debug("Using preloaded context: {url}.", { url: currentUrl });
       return {