@fedify/fedify 1.10.10 → 1.10.12

package/dist/{types-DPWiFqle.cjs → types-DU73__Ms.cjs}

@@ -1,6 +1,6 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_docloader = require("./docloader-DR98w4wL.cjs");
+const require_docloader = require("./docloader-VJ0pkUIi.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 //#region src/nodeinfo/semver.ts
 const MAX_LENGTH = 256;
@@ -138,15 +138,72 @@ const logger = (0, _logtape_logtape.getLogger)([
 	"nodeinfo",
 	"client"
 ]);
+const DEFAULT_MAX_REDIRECTION = 5;
+/**
+* Fetches a URL while guarding against SSRF.  Before every request—including
+* each redirect hop—the destination is validated with
+* {@link validatePublicUrl}, so that loopback, link-local, and private
+* addresses, as well as non-HTTP(S) schemes such as `data:`, are rejected.
+* Redirects are followed manually with a cap, so that a public URL cannot
+* bounce the request to an internal address.
+* @param url The URL to fetch.
+* @param headers The request headers.
+* @returns The final response, or `null` if the URL is disallowed or there
+*          are too many redirects.
+*/
+async function fetchPublicUrl(url, headers) {
+	let current = url instanceof URL ? url : new URL(url);
+	let redirected = 0;
+	while (true) {
+		try {
+			await require_docloader.validatePublicUrl(current.href);
+		} catch (e) {
+			if (e instanceof require_docloader.UrlError) {
+				logger.error("Refused to fetch a private or invalid URL {url}: {error}", {
+					url: current.href,
+					error: e
+				});
+				return null;
+			}
+			throw e;
+		}
+		const response = await fetch(current, {
+			headers,
+			redirect: "manual"
+		});
+		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
+			redirected++;
+			if (redirected >= DEFAULT_MAX_REDIRECTION) {
+				logger.error("Too many redirections ({redirections}) while fetching {url}.", {
+					redirections: redirected,
+					url: current.href
+				});
+				return null;
+			}
+			const next = new URL(response.headers.get("Location"), response.url == null || response.url === "" ? current : response.url);
+			if (next.protocol !== current.protocol) {
+				logger.error("Refused a redirect to a different protocol ({protocol} to {redirectedProtocol}) while fetching NodeInfo.", {
+					protocol: current.protocol,
+					redirectedProtocol: next.protocol
+				});
+				return null;
+			}
+			current = next;
+			continue;
+		}
+		return response;
+	}
+}
 async function getNodeInfo(url, options = {}) {
 	try {
 		let nodeInfoUrl = url;
 		if (!options.direct) {
 			const wellKnownUrl = new URL("/.well-known/nodeinfo", url);
-			const wellKnownResponse = await fetch(wellKnownUrl, { headers: {
+			const wellKnownResponse = await fetchPublicUrl(wellKnownUrl, {
 				Accept: "application/json",
 				"User-Agent": typeof options.userAgent === "string" ? options.userAgent : require_docloader.getUserAgent(options.userAgent)
-			} });
+			});
+			if (wellKnownResponse == null) return void 0;
 			if (!wellKnownResponse.ok) {
 				logger.error("Failed to fetch {url}: {status} {statusText}", {
 					url: wellKnownUrl.href,
@@ -166,10 +223,11 @@ async function getNodeInfo(url, options = {}) {
 			}
 			nodeInfoUrl = link.href;
 		}
-		const response = await fetch(nodeInfoUrl, { headers: {
+		const response = await fetchPublicUrl(nodeInfoUrl, {
 			Accept: "application/json",
 			"User-Agent": typeof options.userAgent === "string" ? options.userAgent : require_docloader.getUserAgent(options.userAgent)
-		} });
+		});
+		if (response == null) return void 0;
 		if (!response.ok) {
 			logger.error("Failed to fetch NodeInfo document from {url}: {status} {statusText}", {
 				url: nodeInfoUrl.toString(),

package/dist/vocab/actor.test.mjs

@@ -1,15 +1,15 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { C as Person, E as Service, S as Organization, d as Group, lt as __exportAll, r as Application } from "../vocab-DP9A9TjH.mjs";
-import { t as test } from "../testing-B9FmxxlI.mjs";
+import { C as Person, E as Service, S as Organization, d as Group, lt as __exportAll, r as Application } from "../vocab-C5EUmVTj.mjs";
+import { t as test } from "../testing-BQeTO4ss.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { n as assertStrictEquals } from "../std__assert-2v7gYiZp.mjs";
 import { n as assertFalse, t as assertRejects } from "../assert_rejects-CJC9ThS-.mjs";
 import { t as assertThrows } from "../assert_throws-BIL7gChy.mjs";
 import { t as assert$1 } from "../assert-DikXweDx.mjs";
-import { a as normalizeActorHandle, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "../actor-DZtfiGD5.mjs";
-import { t as esm_default } from "../esm-onODA711.mjs";
+import { a as normalizeActorHandle, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "../actor-C9uF9rDY.mjs";
+import { t as esm_default } from "../esm-D-9VAGKG.mjs";
 //#region ../../node_modules/.pnpm/fast-check@3.23.2/node_modules/fast-check/lib/esm/check/precondition/PreconditionFailure.js
 var PreconditionFailure = class PreconditionFailure extends Error {
 	constructor(interruptExecution = false) {

package/dist/vocab/cjs.test.mjs

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as test } from "../testing-B9FmxxlI.mjs";
+import { t as test } from "../testing-BQeTO4ss.mjs";
 import { createRequire } from "node:module";
 import { strictEqual } from "node:assert";
 //#region src/vocab/cjs.test.ts

package/dist/vocab/lookup.test.mjs

@@ -1,15 +1,15 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { C as Person, _ as Note, i as Collection, v as Object$1 } from "../vocab-DP9A9TjH.mjs";
-import { n as traverseCollection, t as lookupObject } from "../lookup-CX2yfN-X.mjs";
-import { a as mockDocumentLoader, t as test } from "../testing-B9FmxxlI.mjs";
+import { C as Person, _ as Note, i as Collection, v as Object$1 } from "../vocab-C5EUmVTj.mjs";
+import { n as traverseCollection, t as lookupObject } from "../lookup-D1kdVIs5.mjs";
+import { a as mockDocumentLoader, t as test } from "../testing-BQeTO4ss.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-2v7gYiZp.mjs";
 import { t as assertRejects } from "../assert_rejects-CJC9ThS-.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { t as esm_default } from "../esm-onODA711.mjs";
+import { t as esm_default } from "../esm-D-9VAGKG.mjs";
 import { t as createTestTracerProvider } from "../otel-D00WjYJ1.mjs";
 import { deepStrictEqual } from "node:assert";
 //#region src/vocab/lookup.test.ts

package/dist/vocab/mod.cjs

@@ -1,9 +1,9 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_docloader = require("../docloader-DR98w4wL.cjs");
-const require_actor = require("../actor-yCME0Muf.cjs");
-const require_lookup = require("../lookup-B7TLaXFf.cjs");
+const require_docloader = require("../docloader-VJ0pkUIi.cjs");
+const require_actor = require("../actor-U7L0GWq5.cjs");
+const require_lookup = require("../lookup-PjDK1BMX.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _opentelemetry_api = require("@opentelemetry/api");
 let es_toolkit = require("es-toolkit");

package/dist/vocab/mod.js

@@ -1,8 +1,8 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
-import { d as name, f as version, i as getDocumentLoader } from "../docloader-D8qb26Gj.js";
-import { $ as Person, A as Flag, B as Like, C as Dislike, D as Endpoints, E as EmojiReact, F as Image, G as Multikey, H as Listen, I as IntransitiveActivity, J as Offer, K as Note, L as Invite, M as Group, N as Hashtag, O as Event, P as Ignore, Q as Page, R as Join, S as DidService, T as Emoji, Tt as getTypeId, U as Mention, V as Link, W as Move, X as OrderedCollectionPage, Y as OrderedCollection, Z as Organization, _ as CollectionPage, _t as View, a as normalizeActorHandle, at as Reject, b as DataIntegrityProof, c as Add, ct as Service, d as Arrive, dt as TentativeReject, et as Place, f as Article, ft as Tombstone, g as Collection, gt as Video, h as ChatMessage, ht as Update, i as isActor, it as Read, j as Follow, k as Export, l as Announce, lt as Source, m as Block, mt as Undo, n as getActorHandle, nt as PropertyValue, o as Accept, ot as Relationship, p as Audio, pt as Travel, q as Object$1, r as getActorTypeName, rt as Question, s as Activity, st as Remove, t as getActorClassByTypeName, tt as Profile, u as Application, ut as TentativeAccept, v as Create, w as Document, x as Delete, y as CryptographicKey, z as Leave } from "../actor-q2gTvEOg.js";
-import { t as lookupWebFinger } from "../lookup-C6wM-gq1.js";
+import { d as name, f as version, i as getDocumentLoader } from "../docloader-C7Hk8BRD.js";
+import { $ as Person, A as Flag, B as Like, C as Dislike, D as Endpoints, E as EmojiReact, F as Image, G as Multikey, H as Listen, I as IntransitiveActivity, J as Offer, K as Note, L as Invite, M as Group, N as Hashtag, O as Event, P as Ignore, Q as Page, R as Join, S as DidService, T as Emoji, Tt as getTypeId, U as Mention, V as Link, W as Move, X as OrderedCollectionPage, Y as OrderedCollection, Z as Organization, _ as CollectionPage, _t as View, a as normalizeActorHandle, at as Reject, b as DataIntegrityProof, c as Add, ct as Service, d as Arrive, dt as TentativeReject, et as Place, f as Article, ft as Tombstone, g as Collection, gt as Video, h as ChatMessage, ht as Update, i as isActor, it as Read, j as Follow, k as Export, l as Announce, lt as Source, m as Block, mt as Undo, n as getActorHandle, nt as PropertyValue, o as Accept, ot as Relationship, p as Audio, pt as Travel, q as Object$1, r as getActorTypeName, rt as Question, s as Activity, st as Remove, t as getActorClassByTypeName, tt as Profile, u as Application, ut as TentativeAccept, v as Create, w as Document, x as Delete, y as CryptographicKey, z as Leave } from "../actor-BojFQubG.js";
+import { t as lookupWebFinger } from "../lookup-BRKVwJc1.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { delay } from "es-toolkit";

package/dist/vocab/type.test.mjs

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { C as Person, U as getTypeId } from "../vocab-DP9A9TjH.mjs";
-import { t as test } from "../testing-B9FmxxlI.mjs";
+import { C as Person, U as getTypeId } from "../vocab-C5EUmVTj.mjs";
+import { t as test } from "../testing-BQeTO4ss.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 //#region src/vocab/type.test.ts
 test("getTypeId()", () => {

package/dist/vocab/vocab.test.mjs

@@ -1,8 +1,8 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { A as LanguageString, C as Person, D as Source, L as decode, T as Question, _ as Note, f as Hashtag, h as Link, i as Collection, k as vocab_exports, n as Announce, o as Create, s as CryptographicKey, t as Activity, u as Follow, v as Object$1, w as Place, x as OrderedCollectionPage } from "../vocab-DP9A9TjH.mjs";
-import { a as mockDocumentLoader, t as test } from "../testing-B9FmxxlI.mjs";
+import { A as LanguageString, C as Person, D as Source, L as decode, T as Question, _ as Note, f as Hashtag, h as Link, i as Collection, k as vocab_exports, n as Announce, o as Create, s as CryptographicKey, t as Activity, u as Follow, v as Object$1, w as Place, x as OrderedCollectionPage } from "../vocab-C5EUmVTj.mjs";
+import { a as mockDocumentLoader, t as test } from "../testing-BQeTO4ss.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-2v7gYiZp.mjs";
 import { n as assertFalse, t as assertRejects } from "../assert_rejects-CJC9ThS-.mjs";
@@ -10,7 +10,7 @@ import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
 import { t as assertThrows } from "../assert_throws-BIL7gChy.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { o as rsaPublicKey1, r as ed25519PublicKey } from "../keys-8FIoKqmB.mjs";
+import { o as rsaPublicKey1, r as ed25519PublicKey } from "../keys-BkXWqCAE.mjs";
 import { pascalCase } from "es-toolkit";
 import { parseLanguageTag } from "@phensley/language-tag";
 import { Validator } from "@cfworker/json-schema";