@fedify/vocab-runtime 2.1.29 → 2.1.30

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.1.29",
+  "version": "2.1.30",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",

package/dist/mod.cjs

@@ -4593,7 +4593,7 @@ const preloadedContexts = {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.1.29";
+var version = "2.1.30";
 //#endregion
 //#region src/request.ts
 /**
@@ -5255,6 +5255,7 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 		options?.signal?.throwIfAborted();
 		const parsedUrl = new URL(url);
 		if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") throw new UrlError(`Unsupported protocol: ${parsedUrl.protocol}`);
+		if (parsedUrl.username !== "" || parsedUrl.password !== "") throw new UrlError("URLs with credentials are not allowed");
 		const currentUrl = parsedUrl.href;
 		if (!skipPreloadedContexts && currentUrl in preloadedContexts) {
 			logger.debug("Using preloaded context: {url}.", { url: currentUrl });

package/dist/mod.js

@@ -4588,7 +4588,7 @@ const preloadedContexts = {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.1.29";
+var version = "2.1.30";
 //#endregion
 //#region src/request.ts
 /**
@@ -5250,6 +5250,7 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 		options?.signal?.throwIfAborted();
 		const parsedUrl = new URL(url);
 		if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") throw new UrlError(`Unsupported protocol: ${parsedUrl.protocol}`);
+		if (parsedUrl.username !== "" || parsedUrl.password !== "") throw new UrlError("URLs with credentials are not allowed");
 		const currentUrl = parsedUrl.href;
 		if (!skipPreloadedContexts && currentUrl in preloadedContexts) {
 			logger.debug("Using preloaded context: {url}.", { url: currentUrl });

package/dist/tests/{body-BI7IK9DK.cjs → body-Bda70xVu.cjs}

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

package/dist/tests/{body-C-p-RXaQ.mjs → body-C7C_CqNA.mjs}

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

package/dist/tests/body.test.cjs

@@ -1,5 +1,5 @@
 require("./chunk-Do9eywBl.cjs");
-const require_body = require("./body-BI7IK9DK.cjs");
+const require_body = require("./body-Bda70xVu.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 { r as readBoundedText, t as BodyTooLargeError } from "./body-C-p-RXaQ.mjs";
+import { r as readBoundedText, t as BodyTooLargeError } from "./body-C7C_CqNA.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,5 +1,5 @@
 require("./chunk-Do9eywBl.cjs");
-require("./docloader-Okt4FgM8.cjs");
+require("./docloader-D5BTSARP.cjs");
 require("./url-vZTgkIZg.cjs");
 require("./key-BarKGLQz.cjs");
 require("./multibase-8zhYPa7o.cjs");

package/dist/tests/decimal.test.mjs

@@ -1,4 +1,4 @@
-import "./docloader-DVamy9FW.mjs";
+import "./docloader-Bsosn1qB.mjs";
 import "./url-3fyJuqC0.mjs";
 import "./key-BDIsC6hV.mjs";
 import "./multibase-Ds75BvXs.mjs";

package/dist/tests/{docloader-DVamy9FW.mjs → docloader-Bsosn1qB.mjs}

@@ -1,5 +1,5 @@
-import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-B9R4Y9qS.mjs";
-import { n as MAX_BODY_SIZE, r as readBoundedText } from "./body-C-p-RXaQ.mjs";
+import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-Bri8X69i.mjs";
+import { n as MAX_BODY_SIZE, r as readBoundedText } from "./body-C7C_CqNA.mjs";
 import { t as HttpHeaderLink } from "./link-CYszIegt.mjs";
 import { o as validatePublicUrl, t as UrlError } from "./url-3fyJuqC0.mjs";
 import { getLogger } from "@logtape/logtape";
@@ -4705,6 +4705,7 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 		options?.signal?.throwIfAborted();
 		const parsedUrl = new URL(url);
 		if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") throw new UrlError(`Unsupported protocol: ${parsedUrl.protocol}`);
+		if (parsedUrl.username !== "" || parsedUrl.password !== "") throw new UrlError("URLs with credentials are not allowed");
 		const currentUrl = parsedUrl.href;
 		if (!skipPreloadedContexts && currentUrl in preloadedContexts) {
 			logger.debug("Using preloaded context: {url}.", { url: currentUrl });

package/dist/tests/{docloader-Okt4FgM8.cjs → docloader-D5BTSARP.cjs}

@@ -1,6 +1,6 @@
 require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-C_PrlGe_.cjs");
-const require_body = require("./body-BI7IK9DK.cjs");
+const require_request = require("./request-hHQ_KvBF.cjs");
+const require_body = require("./body-Bda70xVu.cjs");
 const require_link = require("./link-qDTmjPw_.cjs");
 const require_url = require("./url-vZTgkIZg.cjs");
 let _logtape_logtape = require("@logtape/logtape");
@@ -4706,6 +4706,7 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 		options?.signal?.throwIfAborted();
 		const parsedUrl = new URL(url);
 		if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") throw new require_url.UrlError(`Unsupported protocol: ${parsedUrl.protocol}`);
+		if (parsedUrl.username !== "" || parsedUrl.password !== "") throw new require_url.UrlError("URLs with credentials are not allowed");
 		const currentUrl = parsedUrl.href;
 		if (!skipPreloadedContexts && currentUrl in preloadedContexts) {
 			logger.debug("Using preloaded context: {url}.", { url: currentUrl });

package/dist/tests/docloader.test.cjs

@@ -1,6 +1,6 @@
 const require_chunk = require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-C_PrlGe_.cjs");
-const require_docloader = require("./docloader-Okt4FgM8.cjs");
+const require_request = require("./request-hHQ_KvBF.cjs");
+const require_docloader = require("./docloader-D5BTSARP.cjs");
 const require_url = require("./url-vZTgkIZg.cjs");
 let node_zlib = require("node:zlib");
 let _logtape_logtape = require("@logtape/logtape");
@@ -2008,6 +2008,52 @@ const unsupportedUrls = [
 	"file:///collection",
 	`data:application/ld+json,${encodeURIComponent(JSON.stringify({ id: "https://example.com/data" }))}`
 ];
+function isCredentialUrlError(error) {
+	return error instanceof require_url.UrlError && error.reason === "disallowed" && error.message === "URLs with credentials are not allowed";
+}
+(0, _fedify_fixture.test)("getDocumentLoader() rejects URLs with credentials", async (t) => {
+	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 = require_docloader.getDocumentLoader({ allowPrivateAddress });
+		for (const path of [
+			"direct",
+			"redirect",
+			"Link",
+			"HTML"
+		]) await t.step(`${path}, allowPrivateAddress=${allowPrivateAddress}`, async () => {
+			await withFetchStub((url) => {
+				if (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 (0, node_assert.rejects)(loader(path === "direct" ? target : start), isCredentialUrlError);
+				(0, node_assert.deepStrictEqual)(fetched, 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 (0, node_assert.rejects)(loader(url), isCredentialUrlError);
+				(0, node_assert.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) => {
+				(0, node_assert.deepStrictEqual)((await loader(url)).document, { done: true });
+				(0, node_assert.deepStrictEqual)(fetched, [new URL(url).href]);
+			});
+		});
+	}
+});
 function isUnsupportedProtocolError(error, url) {
 	return error instanceof require_url.UrlError && error.message === `Unsupported protocol: ${new URL(url).protocol}` && error.reason === "disallowed";
 }

package/dist/tests/docloader.test.mjs

@@ -1,5 +1,5 @@
-import { t as FetchError } from "./request-B9R4Y9qS.mjs";
-import { i as cid_v1_default, n as getRemoteDocument, r as preloadedContexts, t as getDocumentLoader } from "./docloader-DVamy9FW.mjs";
+import { t as FetchError } from "./request-Bri8X69i.mjs";
+import { i as cid_v1_default, n as getRemoteDocument, r as preloadedContexts, t as getDocumentLoader } from "./docloader-Bsosn1qB.mjs";
 import { t as UrlError } from "./url-3fyJuqC0.mjs";
 import { gzipSync } from "node:zlib";
 import { configure, reset } from "@logtape/logtape";
@@ -2025,6 +2025,52 @@ 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("getDocumentLoader() rejects URLs with credentials", async (t) => {
+	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 = getDocumentLoader({ allowPrivateAddress });
+		for (const path of [
+			"direct",
+			"redirect",
+			"Link",
+			"HTML"
+		]) await t.step(`${path}, allowPrivateAddress=${allowPrivateAddress}`, async () => {
+			await withFetchStub((url) => {
+				if (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, 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, [new URL(url).href]);
+			});
+		});
+	}
+});
 function isUnsupportedProtocolError(error, url) {
 	return error instanceof UrlError && error.message === `Unsupported protocol: ${new URL(url).protocol}` && error.reason === "disallowed";
 }

package/dist/tests/{request-B9R4Y9qS.mjs → request-Bri8X69i.mjs}

@@ -1,7 +1,7 @@
 import process from "node:process";
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.1.29";
+var version = "2.1.30";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/{request-C_PrlGe_.cjs → request-hHQ_KvBF.cjs}

@@ -3,7 +3,7 @@ let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.1.29";
+var version = "2.1.30";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/request.test.cjs

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-C_PrlGe_.cjs");
+const require_request = require("./request-hHQ_KvBF.cjs");
 let node_test = require("node:test");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);

package/dist/tests/request.test.mjs

@@ -1,4 +1,4 @@
-import { o as version, r as getUserAgent } from "./request-B9R4Y9qS.mjs";
+import { o as version, r as getUserAgent } from "./request-Bri8X69i.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.1.29",
+  "version": "2.1.30",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",

package/src/docloader.test.ts

@@ -1101,6 +1101,90 @@ const unsupportedUrls = [
   }`,
 ];
 
+function isCredentialUrlError(error: unknown): boolean {
+  return error instanceof UrlError && error.reason === "disallowed" &&
+    error.message === "URLs with credentials are not allowed";
+}
+
+test("getDocumentLoader() rejects URLs with credentials", async (t) => {
+  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 = getDocumentLoader({ allowPrivateAddress });
+    for (const path of ["direct", "redirect", "Link", "HTML"]) {
+      await t.step(
+        `${path}, allowPrivateAddress=${allowPrivateAddress}`,
+        async () => {
+          await withFetchStub(
+            (url) => {
+              if (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, 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) => {
+              const document = await loader(url);
+              deepStrictEqual(document.document, { done: true });
+              deepStrictEqual(fetched, [new URL(url).href]);
+            },
+          );
+        },
+      );
+    }
+  }
+});
+
 function isUnsupportedProtocolError(error: unknown, url: string): boolean {
   return error instanceof UrlError &&
     error.message === `Unsupported protocol: ${new URL(url).protocol}` &&

package/src/docloader.ts

@@ -307,6 +307,11 @@ export function getDocumentLoader(
     if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") {
       throw new UrlError(`Unsupported protocol: ${parsedUrl.protocol}`);
     }
+    // When merging forward, keep this guard independent of allowPrivateAddress:
+    // private-address opt-in must not permit credentials on any followed URL.
+    if (parsedUrl.username !== "" || parsedUrl.password !== "") {
+      throw new UrlError("URLs with credentials are not allowed");
+    }
     const currentUrl = parsedUrl.href;
     if (!skipPreloadedContexts && currentUrl in preloadedContexts) {
       logger.debug("Using preloaded context: {url}.", { url: currentUrl });