@fedify/fedify 2.4.0-dev.1668 → 2.4.0-dev.1740

package/dist/std__assert-CxFT0MNt.mjs

@@ -0,0 +1,8 @@
+import "temporal-polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import "./assert_equals-CBlRfA-_.mjs";
+import "./assert_throws-BJ5wuvR2.mjs";
+import "./assert_rejects-wFbSPn1O.mjs";
+import "./assert_strict_equals-Bpjl4Psw.mjs";
+export {};

package/dist/{temporal-Bpxpsl2k.mjs → temporal-DLQIjuTn.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { c as getNormalizationContextLoader } from "./ld-BttH_-8K.mjs";
+import { c as getNormalizationContextLoader } from "./ld-DnT9sCWa.mjs";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/federation/temporal.ts
 function isPlainObject(value) {
@@ -28,7 +28,7 @@ function isMalformedDurationLiteral(value) {
 		return true;
 	}
 }
-const TEMPORAL_DATE_TIME_IRIS = new Set([
+const TEMPORAL_DATE_TIME_IRIS = /* @__PURE__ */ new Set([
 	"https://www.w3.org/ns/activitystreams#deleted",
 	"https://www.w3.org/ns/activitystreams#endTime",
 	"https://www.w3.org/ns/activitystreams#published",
@@ -37,7 +37,7 @@ const TEMPORAL_DATE_TIME_IRIS = new Set([
 	"http://purl.org/dc/terms/created",
 	"https://w3id.org/security#created"
 ]);
-const TEMPORAL_DURATION_IRIS = new Set(["https://www.w3.org/ns/activitystreams#duration"]);
+const TEMPORAL_DURATION_IRIS = /* @__PURE__ */ new Set(["https://www.w3.org/ns/activitystreams#duration"]);
 const QUESTION_CLOSED_IRI = "https://www.w3.org/ns/activitystreams#closed";
 const XSD_DATE_TIME_IRI = "http://www.w3.org/2001/XMLSchema#dateTime";
 function hasMalformedExpandedDateTimeLiteral(value) {

package/dist/testing/mod.d.mts

@@ -782,6 +782,16 @@ type CircuitBreakerOptions = CircuitBreakerFailurePolicy & {
    * @default `{ seconds: 1 }`
    */
   readonly releaseInterval?: Temporal.Duration | Temporal.DurationLike;
+  /**
+   * How long Fedify keeps circuit breaker state in the configured key-value
+   * store.
+   *
+   * When omitted, Fedify derives this from `failureWindow`, `recoveryDelay`, and
+   * `heldActivityTtl` for the default numeric failure policy.  Custom `failure`
+   * callbacks do not have an inspectable time window, so custom policies do not
+   * expire their stored state unless this option is provided.
+   */
+  readonly stateTtl?: Temporal.Duration | Temporal.DurationLike;
   /**
    * Called whenever the circuit state changes.
    */

package/dist/testing/mod.mjs

@@ -1,6 +1,6 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { a as testDefinitions, n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-BJXxPElm.mjs";
-import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, r as envelopeSchema, t as MockQueue } from "../testing-CO7ftO8A.mjs";
+import { a as testDefinitions, n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-Dt36KFEJ.mjs";
+import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, r as envelopeSchema, t as MockQueue } from "../testing-BX0Nicyq.mjs";
 export { MockQueue, baseOptions, createInboxContext, createOutboxContext, createRequestContext, envelopeSchema, makeSchema, numberSchema, stringSchema, testDefinitions };

package/dist/{testing-CO7ftO8A.mjs → testing-BX0Nicyq.mjs}

@@ -1,8 +1,8 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { i as mockDocumentLoader } from "./context-BJXxPElm.mjs";
-import { t as MemoryKvStore } from "./kv-CXBAok3k.mjs";
+import { i as mockDocumentLoader } from "./context-Dt36KFEJ.mjs";
+import { t as MemoryKvStore } from "./kv-DCHkaJ9-.mjs";
 import { Note } from "@fedify/vocab";
 //#region src/testing/tasks.ts
 /**

package/dist/{transformers-DGwl-hD1.cjs → transformers-BalCrSsr.cjs}

@@ -1,5 +1,4 @@
 const { URLPattern } = require("urlpattern-polyfill");
-require("./chunk-Czpeue4M.cjs");
 //#region src/compat/transformers.ts
 const logger = (0, require("@logtape/logtape").getLogger)([
 	"fedify",

package/dist/{types-DC1pNgJA.js → types-Dtyf8lVj.js}

@@ -1,22 +1,79 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { getLogger } from "@logtape/logtape";
-import { getUserAgent } from "@fedify/vocab-runtime";
+import { UrlError, getUserAgent, validatePublicUrl } from "@fedify/vocab-runtime";
 //#region src/nodeinfo/client.ts
 const logger = getLogger([
 	"fedify",
 	"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 validatePublicUrl(current.href);
+		} catch (e) {
+			if (e instanceof 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 : getUserAgent(options.userAgent)
-			} });
+			});
+			if (wellKnownResponse == null) return void 0;
 			if (!wellKnownResponse.ok) {
 				logger.error("Failed to fetch {url}: {status} {statusText}", {
 					url: wellKnownUrl.href,
@@ -36,10 +93,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 : 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/{types-CPym83zc.cjs → types-RXm5YxpC.cjs}

@@ -1,5 +1,4 @@
 const { URLPattern } = require("urlpattern-polyfill");
-require("./chunk-Czpeue4M.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
 //#region src/nodeinfo/client.ts
@@ -8,15 +7,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 (0, _fedify_vocab_runtime.validatePublicUrl)(current.href);
+		} catch (e) {
+			if (e instanceof _fedify_vocab_runtime.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 : (0, _fedify_vocab_runtime.getUserAgent)(options.userAgent)
-			} });
+			});
+			if (wellKnownResponse == null) return void 0;
 			if (!wellKnownResponse.ok) {
 				logger.error("Failed to fetch {url}: {status} {statusText}", {
 					url: wellKnownUrl.href,
@@ -36,10 +92,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 : (0, _fedify_vocab_runtime.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/utils/docloader.test.mjs

@@ -1,13 +1,13 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as esm_default } from "../esm-yYQfPhIY.mjs";
-import { t as assertEquals } from "../assert_equals-BV7oLMxm.mjs";
-import "../std__assert-B2NnY9bq.mjs";
-import { t as assertRejects } from "../assert_rejects-EgstcQy5.mjs";
-import { l as verifyRequest } from "../http-DUmWq5Pw.mjs";
-import { i as rsaPrivateKey2 } from "../keys-Dbyd7bhl.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-0vAfF6XW.mjs";
+import { t as esm_default } from "../esm-BHXXx4Wx.mjs";
+import { t as assertEquals } from "../assert_equals-CBlRfA-_.mjs";
+import "../std__assert-CxFT0MNt.mjs";
+import { t as assertRejects } from "../assert_rejects-wFbSPn1O.mjs";
+import { l as verifyRequest } from "../http-Day1kcpT.mjs";
+import { i as rsaPrivateKey2 } from "../keys-DIJNHW-Y.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-Dg_7gMC7.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { UrlError } from "@fedify/vocab-runtime";
 //#region src/utils/docloader.test.ts

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

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as kvCache, t as MockKvStore } from "../kv-cache-DEXKemJ9.mjs";
+import { n as kvCache, t as MockKvStore } from "../kv-cache-Bz6aQOOX.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,5 +1,5 @@
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_kv_cache = require("../kv-cache-zmgG1HUp.cjs");
+const require_kv_cache = require("../kv-cache-C4U_uBqD.cjs");
 exports.getAuthenticatedDocumentLoader = require_kv_cache.getAuthenticatedDocumentLoader;
 exports.kvCache = require_kv_cache.kvCache;

package/dist/utils/mod.d.cts

@@ -1,3 +1,3 @@
 /// <reference lib="esnext.temporal" />
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-BrpVsSfY.cjs";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-CLHkCwLm.cjs";
 export { getAuthenticatedDocumentLoader, kvCache };

package/dist/utils/mod.d.ts

@@ -1,3 +1,3 @@
 /// <reference lib="esnext.temporal" />
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-CNef4in0.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-DypxPS9H.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/dist/utils/mod.js

@@ -1,4 +1,4 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-ZQ22hm44.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-BIAB0HKx.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.4.0-dev.1668+90797b01",
+  "version": "2.4.0-dev.1740+32e9952c",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -151,10 +151,10 @@
     "structured-field-values": "^2.0.4",
     "temporal-polyfill": "^1.0.1",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/uri-template": "2.4.0-dev.1668+90797b01",
-    "@fedify/vocab-runtime": "2.4.0-dev.1668+90797b01",
-    "@fedify/webfinger": "2.4.0-dev.1668+90797b01",
-    "@fedify/vocab": "2.4.0-dev.1668+90797b01"
+    "@fedify/uri-template": "2.4.0-dev.1740+32e9952c",
+    "@fedify/vocab": "2.4.0-dev.1740+32e9952c",
+    "@fedify/vocab-runtime": "2.4.0-dev.1740+32e9952c",
+    "@fedify/webfinger": "2.4.0-dev.1740+32e9952c"
   },
   "devDependencies": {
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
@@ -166,8 +166,8 @@
     "tsx": "^4.21.0",
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
-    "@fedify/vocab-tools": "^2.4.0-dev.1668+90797b01",
-    "@fedify/fixture": "2.0.0"
+    "@fedify/fixture": "2.0.0",
+    "@fedify/vocab-tools": "^2.4.0-dev.1740+32e9952c"
   },
   "scripts": {
     "build:self": "tsdown",