@fedify/fedify 2.3.6 → 2.3.8

package/dist/federation/middleware.test.mjs

@@ -5,29 +5,28 @@ import { t as esm_default } from "../esm-vrlUxr60.mjs";
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import { r as assertExists } from "../std__assert-BBjXFNOb.mjs";
 import { r as assertFalse, t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
-import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
+import { n as assertInstanceOf, t as assert } from "../assert-jSdZMYam.mjs";
 import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-XEgZAlrj.mjs";
-import { t as assert } from "../assert-OguE97r2.mjs";
-import { g as recordInboxActivity } from "../metrics-D8s1eKfJ.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-BcbYkefs.mjs";
-import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-BHS1yt22.mjs";
-import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-c-9mCB36.mjs";
-import { t as doesActorOwnKey } from "../owner-CjkdUXE3.mjs";
-import { i as verifyObject, r as signObject } from "../proof-D_6qtBdQ.mjs";
-import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { g as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-3L9f9ZTw.mjs";
-import { t as CircuitBreaker } from "../circuit-breaker-D1fxthDI.mjs";
-import { t as markCircuitBreakerLegacySweepDone } from "../circuit-breaker-test-utils-CAdwjgMi.mjs";
+import { g as recordInboxActivity } from "../metrics-FDcYXRP5.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-ClEDLGpr.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-BAdp-ZeK.mjs";
+import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-CtFHB6rU.mjs";
+import { t as doesActorOwnKey } from "../owner-CGuS9lE7.mjs";
+import { i as verifyObject, r as signObject } from "../proof--56drUyt.mjs";
+import { t as MemoryKvStore } from "../kv-CX8qfaad.mjs";
+import { g as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-COzI8bCL.mjs";
+import { t as CircuitBreaker } from "../circuit-breaker-CDABzqVf.mjs";
+import { t as markCircuitBreakerLegacySweepDone } from "../circuit-breaker-test-utils-Dm5MM6l9.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { RouterError } from "@fedify/uri-template";
 import * as vocab from "@fedify/vocab";
 import { Create, Offer, Person, getTypeId, lookupObject } from "@fedify/vocab";
 import { SpanStatusCode, metrics } from "@opentelemetry/api";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
-import { FetchError, getDocumentLoader } from "@fedify/vocab-runtime";
+import { FetchError, UrlError, getDocumentLoader } from "@fedify/vocab-runtime";
 import serialize from "json-canon";
 import { DataPointType, MeterProvider as MeterProvider$1, MetricReader } from "@opentelemetry/sdk-metrics";
 //#region ../fixture/src/fixtures/example.com/create.json
@@ -2159,7 +2158,7 @@ test("Federation.setOutboxListeners()", async (t) => {
 			const records = [];
 			await reset();
 			esm_default.spyGlobal();
-			esm_default.post("https://remote.example/inbox", {
+			esm_default.post("https://example.com/inbox", {
 				status: 202,
 				body: "Accepted"
 			});
@@ -2185,7 +2184,7 @@ test("Federation.setOutboxListeners()", async (t) => {
 				federation.setOutboxListeners("/users/{identifier}/outbox").on(vocab.Activity, async (ctx, activity) => {
 					await ctx.sendActivity({ identifier: ctx.identifier }, new vocab.Person({
 						id: new URL("https://remote.example/users/alice"),
-						inbox: new URL("https://remote.example/inbox")
+						inbox: new URL("https://example.com/inbox")
 					}), activity);
 				}).authorize((ctx, identifier) => {
 					return identifier === "john" && ctx.request.headers.get("authorization") === "Bearer token";
@@ -2261,7 +2260,7 @@ test("Federation.setOutboxListeners()", async (t) => {
 			let ldsVerified = false;
 			await reset();
 			esm_default.spyGlobal();
-			esm_default.post("https://remote.example/inbox", async (cl) => {
+			esm_default.post("https://example.com/inbox", async (cl) => {
 				const verifyOptions = {
 					documentLoader: mockDocumentLoader,
 					contextLoader: mockDocumentLoader
@@ -2294,7 +2293,7 @@ test("Federation.setOutboxListeners()", async (t) => {
 						keyId: rsaPublicKey2.id
 					}], {
 						id: new URL("https://remote.example/users/alice"),
-						inboxId: new URL("https://remote.example/inbox")
+						inboxId: new URL("https://example.com/inbox")
 					}, { skipIfUnsigned: true });
 				}).authorize((ctx, identifier) => {
 					return identifier === "person2" && ctx.request.headers.get("authorization") === "Bearer token";
@@ -4518,6 +4517,7 @@ test("FederationImpl.processQueuedTask() permanent failure", async (t) => {
 					return Promise.resolve();
 				}
 			},
+			allowPrivateAddress: true,
 			...options.permanentFailureStatusCodes ? { permanentFailureStatusCodes: options.permanentFailureStatusCodes } : {},
 			...options.meterProvider ? { meterProvider: options.meterProvider } : {},
 			...options.tracerProvider ? { tracerProvider: options.tracerProvider } : {}
@@ -4716,6 +4716,7 @@ test("FederationImpl.processQueuedTask() circuit breaker", async (t) => {
 					return Promise.resolve();
 				}
 			},
+			allowPrivateAddress: true,
 			circuitBreaker: options,
 			...federationOptions
 		});
@@ -5729,7 +5730,8 @@ test("FederationImpl.processQueuedTask() queue task metrics", async (t) => {
 				listen(_handler, _options) {
 					return Promise.resolve();
 				}
-			}
+			},
+			allowPrivateAddress: true
 		});
 		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox");
 		esm_default.spyGlobal();
@@ -6965,5 +6967,93 @@ test("createFederation() omits instrumentation when no meterProvider is set", ()
 	assertStrictEquals(ctx.documentLoader, mockDocumentLoader);
 	assertStrictEquals(ctx.contextLoader, mockDocumentLoader);
 });
+test("ContextImpl.sendActivity() honors the private-address policy", async (t) => {
+	for (const allowPrivateAddress of [false, true]) await t.step(`allowPrivateAddress: ${allowPrivateAddress}`, async () => {
+		const inbox = "http://127.0.0.1/inbox";
+		esm_default.mockGlobal().post(inbox, 202);
+		try {
+			const ctx = createFederation({
+				kv: new MemoryKvStore(),
+				allowPrivateAddress
+			}).createContext(new URL("https://example.com/"));
+			const send = () => ctx.sendActivity({
+				privateKey: ed25519PrivateKey,
+				keyId: ed25519Multikey.id
+			}, new Person({
+				id: new URL("https://example.com/recipient"),
+				inbox: new URL(inbox)
+			}), new Create({
+				id: new URL("https://example.com/activity"),
+				actor: new URL("https://example.com/person")
+			}), { immediate: true });
+			if (allowPrivateAddress) {
+				await send();
+				assertEquals(esm_default.callHistory.calls(inbox).length, 1);
+			} else {
+				await assertRejects(send, UrlError);
+				assertEquals(esm_default.callHistory.calls(inbox).length, 0);
+			}
+		} finally {
+			esm_default.hardReset();
+		}
+	});
+});
+test("Federation.fetch() bounds inbox bodies before dispatch", async () => {
+	let dispatched = false;
+	const json = JSON.stringify({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		id: "https://example.com/activities/bounded",
+		type: "Create",
+		actor: "https://example.com/actor"
+	});
+	const size = 16 * 1024 * 1024;
+	const federation = createFederation({
+		kv: new MemoryKvStore(),
+		skipSignatureVerification: true,
+		contextLoaderFactory: () => mockDocumentLoader
+	});
+	federation.setActorDispatcher("/actors/{identifier}", () => new Person({ id: new URL("https://example.com/actor") }));
+	federation.setInboxListeners("/actors/{identifier}/inbox", "/inbox").on(Create, () => {
+		dispatched = true;
+	});
+	for (const contentLength of [
+		void 0,
+		"1",
+		String(size + 1)
+	]) {
+		assertEquals((await federation.fetch(new Request("https://example.com/inbox", {
+			method: "POST",
+			headers: contentLength == null ? {} : { "Content-Length": contentLength },
+			body: json.padEnd(size + 1)
+		}), { contextData: void 0 })).status, 413);
+		assertFalse(dispatched);
+	}
+	let canceled = false;
+	let pulls = 0;
+	const body = new ReadableStream({
+		pull(controller) {
+			pulls++;
+			controller.enqueue(new Uint8Array(64 * 1024));
+		},
+		cancel() {
+			canceled = true;
+		}
+	}, { highWaterMark: 0 });
+	const request = new Request("https://example.com/inbox", {
+		method: "POST",
+		body,
+		duplex: "half"
+	});
+	assertEquals((await federation.fetch(request, { contextData: void 0 })).status, 413);
+	await new Promise((resolve) => setTimeout(resolve, 0));
+	assert(canceled);
+	assert(pulls <= 260);
+	assertFalse(dispatched);
+	assertEquals((await federation.fetch(new Request("https://example.com/inbox", {
+		method: "POST",
+		body: json
+	}), { contextData: void 0 })).status, 202);
+	assert(dispatched);
+});
 //#endregion
 export {};

package/dist/federation/mod.cjs

@@ -2,7 +2,7 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("../chunk-DDcVe30Y.cjs");
-const require_middleware = require("../middleware-B29rR42K.cjs");
+const require_middleware = require("../middleware-BdDtzhXb.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_uri_template = require("@fedify/uri-template");
 let es_toolkit = require("es-toolkit");

package/dist/federation/mod.d.cts

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
-import { $ as CustomCollectionCursor, A as Rfc6570Expression, At as parseCircuitBreakerKvState, B as createFederationBuilder, C as FederationStartQueueOptions, Ct as CircuitBreakerFailurePolicy, D as InboxListenerSetters, Dt as CircuitBreakerStateChange, E as InboxChallengePolicy, Et as CircuitBreakerState, F as CreateExponentialBackoffPolicyOptions, G as ActorDispatcher, H as respondWithObject, I as RetryContext, J as AuthorizePredicate, K as ActorHandleMapper, L as RetryPolicy, M as FederationOrigin, N as FederationQueueOptions, O as ObjectCallbackSetters, Ot as NormalizedCircuitBreakerOptions, P as createFederation, Q as CustomCollectionCounter, R as createExponentialBackoffPolicy, S as FederationOptions, St as CircuitBreakerCreateOptions, T as IdempotencyStrategy, Tt as CircuitBreakerOptions, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as ActorAliasMapper, X as CollectionCursor, Y as CollectionCounter, Z as CollectionDispatcher, _ as Federatable, _t as buildCollectionSynchronizationHeader, a as GetSignedKeyOptions, at as ObjectDispatcher, b as FederationBuilder, bt as CircuitBreakerActivityDrop, c as ParseUriResult, ct as OutboxListenerErrorHandler, d as SendActivityOptions, dt as UnverifiedActivityHandler, et as CustomCollectionDispatcher, f as SendActivityOptionsForCollection, ft as UnverifiedActivityReason, g as CustomCollectionCallbackSetters, gt as PageItems, h as ConstructorWithTypeId, ht as SenderKeyPair, i as GetActorOptions, it as ObjectAuthorizePredicate, j as FederationKvPrefixes, k as OutboxListenerSetters, kt as normalizeCircuitBreakerOptions, l as RequestContext, lt as OutboxPermanentFailureHandler, m as CollectionCallbackSetters, mt as SendActivityError, n as Context, nt as InboxListener, o as InboxContext, ot as OutboxErrorHandler, p as ActorCallbackSetters, pt as WebFingerLinksDispatcher, q as ActorKeyPairsDispatcher, r as ForwardActivityOptions, rt as NodeInfoDispatcher, s as OutboxContext, st as OutboxListener, t as ActorKeyPair, tt as InboxErrorHandler, u as RouteActivityOptions, ut as SharedInboxKeyDispatcher, v as Federation, vt as digest, w as IdempotencyKeyCallback, wt as CircuitBreakerKvState, x as FederationFetchOptions, xt as CircuitBreakerBeforeSendDecision, y as FederationBenchmarkOptions, yt as CircuitBreaker, z as Message } from "../context-BpmLyiPx.cjs";
+import { $ as CustomCollectionCursor, A as Rfc6570Expression, At as parseCircuitBreakerKvState, B as createFederationBuilder, C as FederationStartQueueOptions, Ct as CircuitBreakerFailurePolicy, D as InboxListenerSetters, Dt as CircuitBreakerStateChange, E as InboxChallengePolicy, Et as CircuitBreakerState, F as CreateExponentialBackoffPolicyOptions, G as ActorDispatcher, H as respondWithObject, I as RetryContext, J as AuthorizePredicate, K as ActorHandleMapper, L as RetryPolicy, M as FederationOrigin, N as FederationQueueOptions, O as ObjectCallbackSetters, Ot as NormalizedCircuitBreakerOptions, P as createFederation, Q as CustomCollectionCounter, R as createExponentialBackoffPolicy, S as FederationOptions, St as CircuitBreakerCreateOptions, T as IdempotencyStrategy, Tt as CircuitBreakerOptions, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as ActorAliasMapper, X as CollectionCursor, Y as CollectionCounter, Z as CollectionDispatcher, _ as Federatable, _t as buildCollectionSynchronizationHeader, a as GetSignedKeyOptions, at as ObjectDispatcher, b as FederationBuilder, bt as CircuitBreakerActivityDrop, c as ParseUriResult, ct as OutboxListenerErrorHandler, d as SendActivityOptions, dt as UnverifiedActivityHandler, et as CustomCollectionDispatcher, f as SendActivityOptionsForCollection, ft as UnverifiedActivityReason, g as CustomCollectionCallbackSetters, gt as PageItems, h as ConstructorWithTypeId, ht as SenderKeyPair, i as GetActorOptions, it as ObjectAuthorizePredicate, j as FederationKvPrefixes, k as OutboxListenerSetters, kt as normalizeCircuitBreakerOptions, l as RequestContext, lt as OutboxPermanentFailureHandler, m as CollectionCallbackSetters, mt as SendActivityError, n as Context, nt as InboxListener, o as InboxContext, ot as OutboxErrorHandler, p as ActorCallbackSetters, pt as WebFingerLinksDispatcher, q as ActorKeyPairsDispatcher, r as ForwardActivityOptions, rt as NodeInfoDispatcher, s as OutboxContext, st as OutboxListener, t as ActorKeyPair, tt as InboxErrorHandler, u as RouteActivityOptions, ut as SharedInboxKeyDispatcher, v as Federation, vt as digest, w as IdempotencyKeyCallback, wt as CircuitBreakerKvState, x as FederationFetchOptions, xt as CircuitBreakerBeforeSendDecision, y as FederationBenchmarkOptions, yt as CircuitBreaker, z as Message } from "../context-CSIggG9_.cjs";
 import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "../kv-gJ8LYbxX.cjs";
 import { a as MessageQueueEnqueueOptions, i as MessageQueueDepth, n as InProcessMessageQueueOptions, o as MessageQueueListenOptions, r as MessageQueue, s as ParallelMessageQueue, t as InProcessMessageQueue } from "../mq-D8uSFzxe.cjs";
-import { a as RouterOptions, i as RouterError, n as handleWebFinger, o as RouterRouteResult, r as Router, t as WebFingerHandlerParameters } from "../mod-CjERT09F.cjs";
+import { a as RouterOptions, i as RouterError, n as handleWebFinger, o as RouterRouteResult, r as Router, t as WebFingerHandlerParameters } from "../mod-PVR75MeU.cjs";
 export { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CircuitBreaker, CircuitBreakerActivityDrop, CircuitBreakerBeforeSendDecision, CircuitBreakerCreateOptions, CircuitBreakerFailurePolicy, CircuitBreakerKvState, CircuitBreakerOptions, CircuitBreakerState, CircuitBreakerStateChange, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBenchmarkOptions, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetActorOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxChallengePolicy, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore, Message, MessageQueue, MessageQueueDepth, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, NormalizedCircuitBreakerOptions, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxContext, OutboxErrorHandler, OutboxListener, OutboxListenerErrorHandler, OutboxListenerSetters, OutboxPermanentFailureHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityError, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, UnverifiedActivityHandler, UnverifiedActivityReason, WebFingerHandlerParameters, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, normalizeCircuitBreakerOptions, parseCircuitBreakerKvState, respondWithObject, respondWithObjectIfAcceptable };

package/dist/federation/mod.d.ts

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
-import { $ as CustomCollectionCursor, A as Rfc6570Expression, At as parseCircuitBreakerKvState, B as createFederationBuilder, C as FederationStartQueueOptions, Ct as CircuitBreakerFailurePolicy, D as InboxListenerSetters, Dt as CircuitBreakerStateChange, E as InboxChallengePolicy, Et as CircuitBreakerState, F as CreateExponentialBackoffPolicyOptions, G as ActorDispatcher, H as respondWithObject, I as RetryContext, J as AuthorizePredicate, K as ActorHandleMapper, L as RetryPolicy, M as FederationOrigin, N as FederationQueueOptions, O as ObjectCallbackSetters, Ot as NormalizedCircuitBreakerOptions, P as createFederation, Q as CustomCollectionCounter, R as createExponentialBackoffPolicy, S as FederationOptions, St as CircuitBreakerCreateOptions, T as IdempotencyStrategy, Tt as CircuitBreakerOptions, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as ActorAliasMapper, X as CollectionCursor, Y as CollectionCounter, Z as CollectionDispatcher, _ as Federatable, _t as buildCollectionSynchronizationHeader, a as GetSignedKeyOptions, at as ObjectDispatcher, b as FederationBuilder, bt as CircuitBreakerActivityDrop, c as ParseUriResult, ct as OutboxListenerErrorHandler, d as SendActivityOptions, dt as UnverifiedActivityHandler, et as CustomCollectionDispatcher, f as SendActivityOptionsForCollection, ft as UnverifiedActivityReason, g as CustomCollectionCallbackSetters, gt as PageItems, h as ConstructorWithTypeId, ht as SenderKeyPair, i as GetActorOptions, it as ObjectAuthorizePredicate, j as FederationKvPrefixes, k as OutboxListenerSetters, kt as normalizeCircuitBreakerOptions, l as RequestContext, lt as OutboxPermanentFailureHandler, m as CollectionCallbackSetters, mt as SendActivityError, n as Context, nt as InboxListener, o as InboxContext, ot as OutboxErrorHandler, p as ActorCallbackSetters, pt as WebFingerLinksDispatcher, q as ActorKeyPairsDispatcher, r as ForwardActivityOptions, rt as NodeInfoDispatcher, s as OutboxContext, st as OutboxListener, t as ActorKeyPair, tt as InboxErrorHandler, u as RouteActivityOptions, ut as SharedInboxKeyDispatcher, v as Federation, vt as digest, w as IdempotencyKeyCallback, wt as CircuitBreakerKvState, x as FederationFetchOptions, xt as CircuitBreakerBeforeSendDecision, y as FederationBenchmarkOptions, yt as CircuitBreaker, z as Message } from "../context-BxVVO5Ro.js";
+import { $ as CustomCollectionCursor, A as Rfc6570Expression, At as parseCircuitBreakerKvState, B as createFederationBuilder, C as FederationStartQueueOptions, Ct as CircuitBreakerFailurePolicy, D as InboxListenerSetters, Dt as CircuitBreakerStateChange, E as InboxChallengePolicy, Et as CircuitBreakerState, F as CreateExponentialBackoffPolicyOptions, G as ActorDispatcher, H as respondWithObject, I as RetryContext, J as AuthorizePredicate, K as ActorHandleMapper, L as RetryPolicy, M as FederationOrigin, N as FederationQueueOptions, O as ObjectCallbackSetters, Ot as NormalizedCircuitBreakerOptions, P as createFederation, Q as CustomCollectionCounter, R as createExponentialBackoffPolicy, S as FederationOptions, St as CircuitBreakerCreateOptions, T as IdempotencyStrategy, Tt as CircuitBreakerOptions, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as ActorAliasMapper, X as CollectionCursor, Y as CollectionCounter, Z as CollectionDispatcher, _ as Federatable, _t as buildCollectionSynchronizationHeader, a as GetSignedKeyOptions, at as ObjectDispatcher, b as FederationBuilder, bt as CircuitBreakerActivityDrop, c as ParseUriResult, ct as OutboxListenerErrorHandler, d as SendActivityOptions, dt as UnverifiedActivityHandler, et as CustomCollectionDispatcher, f as SendActivityOptionsForCollection, ft as UnverifiedActivityReason, g as CustomCollectionCallbackSetters, gt as PageItems, h as ConstructorWithTypeId, ht as SenderKeyPair, i as GetActorOptions, it as ObjectAuthorizePredicate, j as FederationKvPrefixes, k as OutboxListenerSetters, kt as normalizeCircuitBreakerOptions, l as RequestContext, lt as OutboxPermanentFailureHandler, m as CollectionCallbackSetters, mt as SendActivityError, n as Context, nt as InboxListener, o as InboxContext, ot as OutboxErrorHandler, p as ActorCallbackSetters, pt as WebFingerLinksDispatcher, q as ActorKeyPairsDispatcher, r as ForwardActivityOptions, rt as NodeInfoDispatcher, s as OutboxContext, st as OutboxListener, t as ActorKeyPair, tt as InboxErrorHandler, u as RouteActivityOptions, ut as SharedInboxKeyDispatcher, v as Federation, vt as digest, w as IdempotencyKeyCallback, wt as CircuitBreakerKvState, x as FederationFetchOptions, xt as CircuitBreakerBeforeSendDecision, y as FederationBenchmarkOptions, yt as CircuitBreaker, z as Message } from "../context-CAKnQy1x.js";
 import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "../kv-D6hNiMTK.js";
 import { a as MessageQueueEnqueueOptions, i as MessageQueueDepth, n as InProcessMessageQueueOptions, o as MessageQueueListenOptions, r as MessageQueue, s as ParallelMessageQueue, t as InProcessMessageQueue } from "../mq-D-nlpY04.js";
-import { a as RouterOptions, i as RouterError, n as handleWebFinger, o as RouterRouteResult, r as Router, t as WebFingerHandlerParameters } from "../mod-Rpy4Uwkk.js";
+import { a as RouterOptions, i as RouterError, n as handleWebFinger, o as RouterRouteResult, r as Router, t as WebFingerHandlerParameters } from "../mod-CFuyfw3c.js";
 export { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CircuitBreaker, CircuitBreakerActivityDrop, CircuitBreakerBeforeSendDecision, CircuitBreakerCreateOptions, CircuitBreakerFailurePolicy, CircuitBreakerKvState, CircuitBreakerOptions, CircuitBreakerState, CircuitBreakerStateChange, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBenchmarkOptions, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetActorOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxChallengePolicy, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore, Message, MessageQueue, MessageQueueDepth, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, NormalizedCircuitBreakerOptions, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxContext, OutboxErrorHandler, OutboxListener, OutboxListenerErrorHandler, OutboxListenerSetters, OutboxPermanentFailureHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityError, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, UnverifiedActivityHandler, UnverifiedActivityReason, WebFingerHandlerParameters, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, normalizeCircuitBreakerOptions, parseCircuitBreakerKvState, respondWithObject, respondWithObjectIfAcceptable };

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as SendActivityError, c as buildCollectionSynchronizationHeader, d as normalizeCircuitBreakerOptions, f as parseCircuitBreakerKvState, i as createExponentialBackoffPolicy, l as digest, o as respondWithObject, p as createFederationBuilder, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as CircuitBreaker } from "../middleware-D_cNQ7Yq.js";
+import { a as SendActivityError, c as buildCollectionSynchronizationHeader, d as normalizeCircuitBreakerOptions, f as parseCircuitBreakerKvState, i as createExponentialBackoffPolicy, l as digest, o as respondWithObject, p as createFederationBuilder, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as CircuitBreaker } from "../middleware-DunPXFJL.js";
 import { getLogger } from "@logtape/logtape";
 import { Router as Router$1, RouterError as RouterError$1, assertPath, isPath } from "@fedify/uri-template";
 import { isEqual } from "es-toolkit";

package/dist/federation/mq.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import { n as assertGreater } from "../std__assert-BBjXFNOb.mjs";
 import { n as assertGreaterOrEqual, r as assertFalse } from "../assert_rejects-DN60FHPX.mjs";
-import { t as assert } from "../assert-OguE97r2.mjs";
+import { t as assert } from "../assert-jSdZMYam.mjs";
 import { test } from "@fedify/fixture";
 import { delay } from "es-toolkit";
 //#region src/federation/mq.ts

package/dist/federation/negotiation.test.mjs

@@ -3,8 +3,8 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import "../std__assert-BBjXFNOb.mjs";
 import { r as assertFalse } from "../assert_rejects-DN60FHPX.mjs";
-import { t as assert } from "../assert-OguE97r2.mjs";
-import { t as acceptsJsonLd } from "../negotiation-DDstyBvc.mjs";
+import { t as assert } from "../assert-jSdZMYam.mjs";
+import { t as acceptsJsonLd } from "../negotiation-CDW-_gUU.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/negotiation.test.ts
 test("acceptsJsonLd()", () => {

package/dist/federation/retry.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { l as AssertionError, t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
-import { t as createExponentialBackoffPolicy } from "../retry-CXg_MBI-.mjs";
+import { t as createExponentialBackoffPolicy } from "../retry-_VvV0h9f.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/retry.test.ts
 test("createExponentialBackoffPolicy()", () => {

package/dist/federation/router.test.mjs

@@ -4,8 +4,8 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BBjXFNOb.mjs";
 import { r as assertFalse } from "../assert_rejects-DN60FHPX.mjs";
+import { t as assert } from "../assert-jSdZMYam.mjs";
 import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
-import { t as assert } from "../assert-OguE97r2.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Router, RouterError, assertPath, isPath } from "@fedify/uri-template";
 import { test } from "@fedify/fixture";

package/dist/federation/send.test.mjs

@@ -5,16 +5,15 @@ import { t as esm_default } from "../esm-vrlUxr60.mjs";
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BBjXFNOb.mjs";
 import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
-import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
+import { n as assertInstanceOf, t as assert } from "../assert-jSdZMYam.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
-import { t as assert } from "../assert-OguE97r2.mjs";
-import { l as verifyRequest } from "../http-BcbYkefs.mjs";
-import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { t as doesActorOwnKey } from "../owner-CjkdUXE3.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-i63Det4Y.mjs";
+import { l as verifyRequest } from "../http-ClEDLGpr.mjs";
+import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
+import { t as doesActorOwnKey } from "../owner-CGuS9lE7.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-CC1A7ATC.mjs";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
-import { FetchError } from "@fedify/vocab-runtime";
+import { FetchError, UrlError } from "@fedify/vocab-runtime";
 import { AggregationTemporality, InMemoryMetricExporter, MeterProvider, PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
 //#region src/federation/send.test.ts
 test("extractInboxes()", () => {
@@ -463,6 +462,7 @@ test("sendActivity() records OpenTelemetry delivery metrics", async (t) => {
 			activityId: "https://example.com/activity",
 			activityType: "https://www.w3.org/ns/activitystreams#Create",
 			keys: [],
+			allowPrivateAddress: true,
 			inbox: new URL("https://metrics.example:8443/inbox/path?x=1"),
 			meterProvider
 		});
@@ -500,6 +500,7 @@ test("sendActivity() records OpenTelemetry delivery metrics", async (t) => {
 			activityId: "https://example.com/follow",
 			activityType: "https://www.w3.org/ns/activitystreams#Follow",
 			keys: [],
+			allowPrivateAddress: true,
 			inbox: new URL("https://metrics.example/inbox"),
 			meterProvider
 		}), SendActivityError);
@@ -537,6 +538,7 @@ test("sendActivity() exports delivery metrics through OpenTelemetry SDK", async
 			activityId: "https://example.com/activity",
 			activityType: "https://www.w3.org/ns/activitystreams#Create",
 			keys: [],
+			allowPrivateAddress: true,
 			inbox: new URL("https://sdk-metrics.example/inbox"),
 			meterProvider
 		});
@@ -553,5 +555,137 @@ test("sendActivity() exports delivery metrics through OpenTelemetry SDK", async
 		}
 	}
 });
+for (const signed of [false, true]) {
+	const keys = [{
+		privateKey: signed ? rsaPrivateKey2 : ed25519PrivateKey,
+		keyId: signed ? rsaPublicKey2.id : ed25519Multikey.id
+	}];
+	test(`sendActivity() validates destinations (signed: ${signed})`, async (t) => {
+		const activity = {
+			type: "Create",
+			id: "https://example.com/activity"
+		};
+		const publicInbox = "https://8.8.8.8/inbox";
+		const privateInbox = "http://127.0.0.1/inbox";
+		for (const target of [
+			privateInbox,
+			"http://169.254.169.254/",
+			"http://[::1]/"
+		]) await t.step(`rejects ${target} before fetching`, async () => {
+			esm_default.mockGlobal().catch(202);
+			try {
+				await assertRejects(() => sendActivity({
+					activity,
+					keys,
+					inbox: new URL(target)
+				}), UrlError);
+				assertEquals(esm_default.callHistory.calls().length, 0);
+			} finally {
+				esm_default.hardReset();
+			}
+		});
+		for (const status of [
+			301,
+			302,
+			303,
+			307,
+			308
+		]) for (const allowPrivateAddress of [false, true]) await t.step(`${status} private redirect, opt-in: ${allowPrivateAddress}`, async () => {
+			esm_default.mockGlobal();
+			esm_default.route(publicInbox, {
+				status,
+				headers: { Location: privateInbox }
+			});
+			esm_default.route(privateInbox, 202);
+			try {
+				const send = () => sendActivity({
+					activity,
+					keys,
+					inbox: new URL(publicInbox),
+					allowPrivateAddress
+				});
+				if (allowPrivateAddress) {
+					await send();
+					const calls = esm_default.callHistory.calls(privateInbox);
+					assertEquals(calls.length, 1);
+					const request = calls[0].request;
+					const preservesBody = signed || status === 307 || status === 308;
+					assertEquals(request.method, preservesBody ? "POST" : "GET");
+					assertEquals(await request.clone().text(), preservesBody ? JSON.stringify(activity) : "");
+				} else {
+					await assertRejects(send, UrlError);
+					assertEquals(esm_default.callHistory.calls(privateInbox).length, 0);
+				}
+			} finally {
+				esm_default.hardReset();
+			}
+		});
+		await t.step("rejects a private destination after a public redirect", async () => {
+			esm_default.mockGlobal().route(publicInbox, {
+				status: 307,
+				headers: { Location: "/next" }
+			}).route("https://8.8.8.8/next", {
+				status: 308,
+				headers: { Location: privateInbox }
+			}).route(privateInbox, 202);
+			try {
+				await assertRejects(() => sendActivity({
+					activity,
+					keys,
+					inbox: new URL(publicInbox)
+				}), UrlError);
+				assertEquals(esm_default.callHistory.calls(privateInbox).length, 0);
+			} finally {
+				esm_default.hardReset();
+			}
+		});
+		await t.step("limits redirect loops", async () => {
+			esm_default.mockGlobal().route(publicInbox, {
+				status: 307,
+				headers: { Location: publicInbox }
+			});
+			try {
+				await assertRejects(() => sendActivity({
+					activity,
+					keys,
+					inbox: new URL(publicInbox)
+				}));
+				assert(esm_default.callHistory.calls().length <= 21);
+			} finally {
+				esm_default.hardReset();
+			}
+		});
+		await t.step("allows a direct private inbox with opt-in", async () => {
+			esm_default.mockGlobal().route(privateInbox, 202);
+			try {
+				await sendActivity({
+					activity,
+					keys,
+					inbox: new URL(privateInbox),
+					allowPrivateAddress: true
+				});
+				assertEquals(esm_default.callHistory.calls(privateInbox).length, 1);
+			} finally {
+				esm_default.hardReset();
+			}
+		});
+		await t.step("allows relative public redirects", async () => {
+			esm_default.mockGlobal().route(publicInbox, {
+				status: 307,
+				headers: { Location: "/next" }
+			}).route("https://8.8.8.8/next", 202);
+			try {
+				await sendActivity({
+					activity,
+					keys,
+					inbox: new URL(publicInbox)
+				});
+				assertEquals(esm_default.callHistory.calls("https://8.8.8.8/next").length, 1);
+			} finally {
+				esm_default.hardReset();
+			}
+		});
+	});
+}
 //#endregion
 export {};

package/dist/federation/temporal.test.mjs

@@ -3,8 +3,8 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import "../std__assert-BBjXFNOb.mjs";
 import { r as assertFalse } from "../assert_rejects-DN60FHPX.mjs";
-import { t as assert } from "../assert-OguE97r2.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-CcVjTX30.mjs";
+import { t as assert } from "../assert-jSdZMYam.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-DvptXZ7V.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/temporal.test.ts
 test("hasMalformedKnownTemporalLiteral() detects expanded proof timestamps", async () => {

package/dist/federation/webfinger.test.mjs

@@ -1,12 +1,12 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { r as createRequestContext } from "../context-DVoTs_wM.mjs";
+import { r as createRequestContext } from "../context-BepjCFHN.mjs";
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BBjXFNOb.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
-import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-3L9f9ZTw.mjs";
+import { t as MemoryKvStore } from "../kv-CX8qfaad.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-COzI8bCL.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 //#region src/federation/webfinger.test.ts