@fedify/fedify 2.3.12-dev.2365 → 2.3.13

package/dist/federation/middleware.test.mjs

@@ -3,23 +3,23 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-vrlUxr60.mjs";
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import { n as assertExists } from "../std__assert-BvGuO4xO.mjs";
-import { r as assertFalse, t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
-import { n as assertInstanceOf, t as assert } from "../assert-jSdZMYam.mjs";
-import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
+import { n as assertExists } from "../std__assert-BjJn2daJ.mjs";
+import { r as assertFalse, t as assertThrows } from "../assert_throws-BbSMEFKo.mjs";
+import { t as assertRejects } from "../assert_rejects-D1HYAik3.mjs";
+import { n as assertInstanceOf, t as assert } from "../assert-CEO06XCw.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-XEgZAlrj.mjs";
-import { g as recordInboxActivity } from "../metrics-Z0UkrR_1.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-D9h6mQdq.mjs";
+import { g as recordInboxActivity } from "../metrics-62qolVUY.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-BRrpIDS1.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-Ds5k4A6d.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-QDpF5t9M.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-BRqKkOSf.mjs";
-import { t as doesActorOwnKey } from "../owner-B0rmuoQB.mjs";
-import { i as verifyObject, r as signObject } from "../proof-B7mAFVed.mjs";
-import { g as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-RTcKhytV.mjs";
+import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-D6UlzNnG.mjs";
+import { t as doesActorOwnKey } from "../owner-DWnLg-vk.mjs";
+import { i as verifyObject, r as signObject } from "../proof-mf6h7n4_.mjs";
+import { g as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-CfbFdEO-.mjs";
 import { t as CircuitBreaker } from "../circuit-breaker-D1fxthDI.mjs";
-import { t as markCircuitBreakerLegacySweepDone } from "../circuit-breaker-test-utils-Dm5MM6l9.mjs";
+import { t as markCircuitBreakerLegacySweepDone } from "../circuit-breaker-test-utils-CAdwjgMi.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { RouterError } from "@fedify/uri-template";
 import * as vocab from "@fedify/vocab";
@@ -2916,7 +2916,7 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 			activity: {
 				"@context": "https://www.w3.org/ns/activitystreams",
 				type: "Create",
-				id: "https://example.com/activities/queued-processed",
+				id: "https://remote.example/activities/queued-processed",
 				actor: "https://remote.example/users/alice",
 				object: {
 					type: "Note",
@@ -2934,6 +2934,50 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 		assertEquals(inboxLifecycle[0].attributes["activitypub.processing.result"], "processed");
 		assertEquals(inboxLifecycle[0].attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Create");
 	});
+	await t.step("records activitypub.inbox.activity rejected for a queued activity whose ID has another origin than its actor", async () => {
+		const kv = new MemoryKvStore();
+		const [meterProvider, recorder] = createTestMeterProvider();
+		const federation = new FederationImpl({
+			kv,
+			meterProvider,
+			queue: {
+				enqueue(_message, _options) {
+					return Promise.resolve();
+				},
+				listen(_handler, _options) {
+					return Promise.resolve();
+				}
+			}
+		});
+		let dispatched = false;
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, () => {
+			dispatched = true;
+		});
+		await federation.processQueuedTask(void 0, {
+			type: "inbox",
+			id: crypto.randomUUID(),
+			baseUrl: "https://example.com",
+			activity: {
+				"@context": "https://www.w3.org/ns/activitystreams",
+				type: "Create",
+				id: "https://victim.example/activities/queued-forged",
+				actor: "https://remote.example/users/alice",
+				object: {
+					type: "Note",
+					content: "Hello world"
+				}
+			},
+			started: (/* @__PURE__ */ new Date()).toISOString(),
+			attempt: 0,
+			identifier: null,
+			traceContext: {}
+		});
+		assertFalse(dispatched);
+		const inboxLifecycle = recorder.getMeasurements("activitypub.inbox.activity");
+		assertEquals(inboxLifecycle.length, 1);
+		assertEquals(inboxLifecycle[0].attributes["activitypub.processing.result"], "rejected");
+		assertEquals(inboxLifecycle[0].attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Create");
+	});
 	await t.step("records activitypub.inbox.activity retried on transient listener failure", async () => {
 		const kv = new MemoryKvStore();
 		const [meterProvider, recorder] = createTestMeterProvider();
@@ -2959,7 +3003,7 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 			activity: {
 				"@context": "https://www.w3.org/ns/activitystreams",
 				type: "Create",
-				id: "https://example.com/activities/queued-retried",
+				id: "https://remote.example/activities/queued-retried",
 				actor: "https://remote.example/users/alice",
 				object: {
 					type: "Note",
@@ -3002,7 +3046,7 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 			activity: {
 				"@context": "https://www.w3.org/ns/activitystreams",
 				type: "Create",
-				id: "https://example.com/activities/queued-abandoned",
+				id: "https://remote.example/activities/queued-abandoned",
 				actor: "https://remote.example/users/alice",
 				object: {
 					type: "Note",
@@ -6938,6 +6982,124 @@ test("ContextImpl.routeActivity() marks queued signed activities as non-LDS", as
 	assertEquals(inboxMessage.ldSignatureVerified, false);
 	assertEquals(inboxMessage.normalizedActivity, void 0);
 });
+for (const queued of [false, true]) test(`ContextImpl.routeActivity() rejects a proof-signed cross-origin ID (queued: ${queued})`, async () => {
+	const messages = [];
+	const queue = {
+		enqueue(message) {
+			messages.push(message);
+			return Promise.resolve();
+		},
+		async listen() {}
+	};
+	const federation = createFederation({
+		kv: new MemoryKvStore(),
+		documentLoaderFactory: () => mockDocumentLoader,
+		contextLoaderFactory: () => mockDocumentLoader,
+		queue: queued ? {
+			inbox: queue,
+			outbox: queue
+		} : void 0,
+		manuallyStartQueue: true
+	});
+	let listenerCalls = 0;
+	federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+		listenerCalls++;
+	});
+	const signed = await signObject(new Create({
+		id: new URL("https://victim.example/activities/1"),
+		actor: ed25519Multikey.controllerId
+	}), ed25519PrivateKey, ed25519Multikey.id, {
+		contextLoader: mockDocumentLoader,
+		documentLoader: mockDocumentLoader
+	});
+	assertFalse(await federation.createContext(new URL("https://local.example/")).routeActivity(null, signed));
+	assertEquals(listenerCalls, 0);
+	assertEquals(messages, []);
+});
+test("ContextImpl.routeActivity() rejects a missing actor before routing", async () => {
+	const federation = createFederation({
+		kv: new MemoryKvStore(),
+		documentLoaderFactory: () => mockDocumentLoader,
+		contextLoaderFactory: () => mockDocumentLoader
+	});
+	let listenerCalls = 0;
+	federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+		listenerCalls++;
+	});
+	assertFalse(await federation.createContext(new URL("https://local.example/")).routeActivity(null, new Create({ id: new URL("https://remote.example/activities/1") })));
+	assertEquals(listenerCalls, 0);
+});
+test("FederationImpl.processQueuedTask() rejects untrusted activity origins before KV access", async () => {
+	class TrackingKvStore extends MemoryKvStore {
+		reads = 0;
+		writes = 0;
+		get(key) {
+			this.reads++;
+			return super.get(key);
+		}
+		set(key, value, options) {
+			this.writes++;
+			return super.set(key, value, options);
+		}
+	}
+	for (const activity of [{
+		"@context": "https://www.w3.org/ns/activitystreams",
+		id: "https://victim.example/activities/1",
+		type: "Create",
+		actor: "https://attacker.example/actor"
+	}, {
+		"@context": "https://www.w3.org/ns/activitystreams",
+		id: "https://victim.example/activities/2",
+		type: "Create"
+	}]) {
+		const kv = new TrackingKvStore();
+		const federation = new FederationImpl({ kv });
+		let listenerCalls = 0;
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+			listenerCalls++;
+		});
+		await federation.processQueuedTask(void 0, {
+			type: "inbox",
+			id: crypto.randomUUID(),
+			baseUrl: "https://local.example",
+			activity,
+			started: (/* @__PURE__ */ new Date()).toISOString(),
+			attempt: 0,
+			identifier: null,
+			traceContext: {}
+		});
+		assertEquals(listenerCalls, 0);
+		assertEquals(kv.reads, 0);
+		assertEquals(kv.writes, 0);
+	}
+	const kv = new TrackingKvStore();
+	const federation = new FederationImpl({
+		kv,
+		skipSignatureVerification: true
+	});
+	let listenerCalls = 0;
+	federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+		listenerCalls++;
+	});
+	await federation.processQueuedTask(void 0, {
+		type: "inbox",
+		id: crypto.randomUUID(),
+		baseUrl: "https://local.example",
+		activity: {
+			"@context": "https://www.w3.org/ns/activitystreams",
+			id: "https://victim.example/activities/opt-out",
+			type: "Create",
+			actor: "https://attacker.example/actor"
+		},
+		started: (/* @__PURE__ */ new Date()).toISOString(),
+		attempt: 0,
+		identifier: null,
+		traceContext: {}
+	});
+	assertEquals(listenerCalls, 1);
+	assertEquals(kv.reads, 1);
+	assertEquals(kv.writes, 1);
+});
 test("ContextImpl.getCollectionUri()", () => {
 	const federation = new FederationImpl({ kv: new MemoryKvStore() });
 	const base = "https://example.com";

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-DanzltB1.cjs");
+const require_middleware = require("../middleware-DkrXqZO_.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.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-B-CIN962.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-xw9fBZoB.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

@@ -2,9 +2,10 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BvGuO4xO.mjs";
-import { n as assertGreaterOrEqual, r as assertFalse } from "../assert_rejects-DN60FHPX.mjs";
-import { t as assert } from "../assert-jSdZMYam.mjs";
+import "../std__assert-BjJn2daJ.mjs";
+import { r as assertFalse } from "../assert_throws-BbSMEFKo.mjs";
+import { n as assertGreaterOrEqual } from "../assert_rejects-D1HYAik3.mjs";
+import { t as assert } from "../assert-CEO06XCw.mjs";
 import { test } from "@fedify/fixture";
 import { delay } from "es-toolkit";
 //#region src/federation/mq.ts

package/dist/federation/negotiation.test.mjs

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import "../std__assert-BvGuO4xO.mjs";
-import { r as assertFalse } from "../assert_rejects-DN60FHPX.mjs";
-import { t as assert } from "../assert-jSdZMYam.mjs";
-import { t as acceptsJsonLd } from "../negotiation-CDW-_gUU.mjs";
+import "../std__assert-BjJn2daJ.mjs";
+import { r as assertFalse } from "../assert_throws-BbSMEFKo.mjs";
+import { t as assert } from "../assert-CEO06XCw.mjs";
+import { t as acceptsJsonLd } from "../negotiation-DDstyBvc.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-_VvV0h9f.mjs";
+import { t as createExponentialBackoffPolicy } from "../retry-CXg_MBI-.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/retry.test.ts
 test("createExponentialBackoffPolicy()", () => {

package/dist/federation/router.test.mjs

@@ -2,10 +2,9 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BvGuO4xO.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 "../std__assert-BjJn2daJ.mjs";
+import { r as assertFalse, t as assertThrows } from "../assert_throws-BbSMEFKo.mjs";
+import { t as assert } from "../assert-CEO06XCw.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

@@ -3,14 +3,15 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-vrlUxr60.mjs";
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BvGuO4xO.mjs";
-import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
-import { n as assertInstanceOf, t as assert } from "../assert-jSdZMYam.mjs";
+import "../std__assert-BjJn2daJ.mjs";
+import { r as assertFalse } from "../assert_throws-BbSMEFKo.mjs";
+import { n as assertGreaterOrEqual, t as assertRejects } from "../assert_rejects-D1HYAik3.mjs";
+import { n as assertInstanceOf, t as assert } from "../assert-CEO06XCw.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
-import { l as verifyRequest } from "../http-D9h6mQdq.mjs";
+import { l as verifyRequest } from "../http-BRrpIDS1.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-B0rmuoQB.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-BFukz_kE.mjs";
+import { t as doesActorOwnKey } from "../owner-DWnLg-vk.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-LJUzNpVF.mjs";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";

package/dist/federation/temporal.test.mjs

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import "../std__assert-BvGuO4xO.mjs";
-import { r as assertFalse } from "../assert_rejects-DN60FHPX.mjs";
-import { t as assert } from "../assert-jSdZMYam.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-n6j0MNF9.mjs";
+import "../std__assert-BjJn2daJ.mjs";
+import { r as assertFalse } from "../assert_throws-BbSMEFKo.mjs";
+import { t as assert } from "../assert-CEO06XCw.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-_3yIqdvy.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

@@ -3,10 +3,10 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { r as createRequestContext } from "../context-CxbCIptr.mjs";
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BvGuO4xO.mjs";
+import "../std__assert-BjJn2daJ.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-RTcKhytV.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-CfbFdEO-.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 //#region src/federation/webfinger.test.ts

package/dist/{http-D9h6mQdq.mjs → http-BRrpIDS1.mjs}

@@ -1,10 +1,10 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-DSS6EkPl.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-Z0UkrR_1.mjs";
+import { n as version, t as name } from "./deno-XpcjbHwj.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-62qolVUY.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-Dd__NiUL.mjs";
-import { i as fetchKeyDetailed, s as validateCryptoKey } from "./key-vnmAGZ3_.mjs";
+import { i as fetchKeyDetailed, s as validateCryptoKey } from "./key-PdEu1lDF.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{http-DdaLQHim.cjs → http-DwPnG87d.cjs}

@@ -11,7 +11,7 @@ let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conve
 let byte_encodings_base64 = require("byte-encodings/base64");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.12-dev.2365+89254121";
+var version = "2.3.13";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -961,6 +961,65 @@ function getDurationMs(start) {
 }
 //#endregion
 //#region src/sig/key.ts
+/** Classifies decoding failures without hiding unexpected loader errors. */
+function classifyKeyJsonLdError(error, seen = /* @__PURE__ */ new Set()) {
+	if (!(error instanceof Error) || !error.name.startsWith("jsonld.")) return null;
+	if (seen.has(error)) throw error;
+	seen.add(error);
+	const details = error.details;
+	if (typeof details?.code !== "string") return null;
+	if (details.code !== "loading remote context failed" || !("cause" in details) && !("cause" in error)) return "invalid";
+	const cause = "cause" in details ? details.cause : error.cause;
+	const nestedFailure = classifyKeyJsonLdError(cause, seen);
+	if (nestedFailure != null) return nestedFailure;
+	if (cause instanceof SyntaxError) return "invalid";
+	if (cause instanceof _fedify_vocab_runtime.FetchError || cause instanceof _fedify_vocab_runtime.UrlError) return "fetch";
+	if (cause instanceof Error && [
+		"AbortError",
+		"TimeoutError",
+		"NetworkError"
+	].includes(cause.name)) return "fetch";
+	if (cause instanceof TypeError) {
+		const urlCode = cause.code;
+		if (cause.name === "InvalidContextReferenceError") return "invalid";
+		if (urlCode === "ERR_INVALID_URL" || cause.message === "Invalid URL string." || /^Invalid URL(?::|$)/.test(cause.message) || / cannot be parsed as a URL\.?$/.test(cause.message)) return typeof details.url === "string" && /^[A-Za-z][A-Za-z0-9+.-]*:/.test(details.url) && !URL.canParse(details.url) ? "invalid" : "fetch";
+		const networkCause = cause.cause;
+		const code = cause.code ?? networkCause?.code;
+		if (typeof code === "string" && [
+			"ECONNREFUSED",
+			"ECONNRESET",
+			"ECONNABORTED",
+			"ETIMEDOUT",
+			"EHOSTUNREACH",
+			"ENETUNREACH",
+			"ENOTFOUND",
+			"EAI_AGAIN",
+			"UND_ERR_CONNECT_TIMEOUT",
+			"UND_ERR_HEADERS_TIMEOUT",
+			"UND_ERR_BODY_TIMEOUT",
+			"UND_ERR_SOCKET"
+		].includes(code) || /^(fetch failed|Failed to fetch|error sending request|error reading a body from connection|Unable to connect|ConnectionRefused|Network connection lost|The socket connection was closed unexpectedly)/.test(cause.message)) return "fetch";
+	}
+	throw cause;
+}
+/** Carries a context transport failure through the key decoding boundary. */
+var KeyContextFetchError = class extends Error {
+	error;
+	constructor(error) {
+		super("Failed to fetch a key's JSON-LD context.", { cause: error });
+		this.error = error;
+	}
+};
+function contextFetchError(error) {
+	const seen = /* @__PURE__ */ new Set();
+	while (error instanceof Error && !seen.has(error)) {
+		seen.add(error);
+		const details = error.details;
+		if (!error.name.startsWith("jsonld.") || details?.code !== "loading remote context failed") break;
+		error = "cause" in details ? details.cause : error.cause;
+	}
+	return new KeyContextFetchError(error);
+}
 /**
 * Checks if the given key is valid and supported.  No-op if the key is valid,
 * otherwise throws an error.
@@ -1055,6 +1114,9 @@ async function importJwk(jwk, type) {
 * @internal
 */
 async function fetchActorDocument(actorId, options = {}) {
+	return await fetchActorDocumentInternal(actorId, options, false);
+}
+async function fetchActorDocumentInternal(actorId, options, propagateContextFetchErrors) {
 	const logger = (0, _logtape_logtape.getLogger)([
 		"fedify",
 		"sig",
@@ -1085,9 +1147,12 @@ async function fetchActorDocument(actorId, options = {}) {
 			baseUrl: documentUrl
 		});
 	} catch (error) {
-		if (!(error instanceof TypeError)) throw error;
-		logger.debug("The document served at {documentUrl} is not a valid object: {error}", {
+		const failure = classifyKeyJsonLdError(error);
+		if (failure === "fetch" && propagateContextFetchErrors) throw contextFetchError(error);
+		if (failure == null && !(error instanceof TypeError)) throw error;
+		logger.debug("Failed to decode the actor document at {documentUrl}: {error}", {
 			documentUrl: documentUrl.href,
+			failure: failure ?? "invalid",
 			error
 		});
 		return null;
@@ -1126,6 +1191,9 @@ async function fetchActorDocument(actorId, options = {}) {
 * @internal
 */
 async function verifyKeyOwnership(key, options = {}) {
+	return await verifyKeyOwnershipInternal(key, options, false);
+}
+async function verifyKeyOwnershipInternal(key, options, propagateContextFetchErrors) {
 	const logger = (0, _logtape_logtape.getLogger)([
 		"fedify",
 		"sig",
@@ -1135,7 +1203,7 @@ async function verifyKeyOwnership(key, options = {}) {
 	if (keyId == null) return null;
 	const claimedOwnerId = key instanceof _fedify_vocab.CryptographicKey ? key.ownerId : key.controllerId;
 	if (claimedOwnerId == null) return null;
-	const owner = await fetchActorDocument(claimedOwnerId, options);
+	const owner = await fetchActorDocumentInternal(claimedOwnerId, options, propagateContextFetchErrors);
 	if (owner == null) {
 		logger.debug("The owner ({claimedOwnerId}) that key {keyId} claims could not be resolved.", {
 			keyId: keyId.href,
@@ -1287,6 +1355,21 @@ async function resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, {
 			tracerProvider
 		});
 	} catch (e) {
+		const failure = classifyKeyJsonLdError(e);
+		if (failure === "fetch") throw contextFetchError(e);
+		if (failure != null) {
+			logger.debug("Failed to decode key {keyId}: {error}", {
+				keyId,
+				failure,
+				error: e
+			});
+			await keyCache?.set(cacheKey, null);
+			await clearFetchErrorMetadata(cacheKey, keyCache);
+			return {
+				key: null,
+				cached: false
+			};
+		}
 		if (!(e instanceof TypeError)) throw e;
 		try {
 			object = await cls.fromJsonLd(document, {
@@ -1295,8 +1378,14 @@ async function resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, {
 				tracerProvider
 			});
 		} catch (e) {
-			if (e instanceof TypeError) {
-				logger.debug("Failed to verify; key {keyId} returned an invalid object.", { keyId });
+			const failure = classifyKeyJsonLdError(e);
+			if (failure === "fetch") throw contextFetchError(e);
+			if (failure != null || e instanceof TypeError) {
+				logger.debug("Failed to decode key {keyId}: {error}", {
+					keyId,
+					failure: failure ?? "invalid",
+					error: e
+				});
 				await keyCache?.set(cacheKey, null);
 				await clearFetchErrorMetadata(cacheKey, keyCache);
 				return {
@@ -1388,16 +1477,17 @@ async function resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, {
 	const claimedOwnerId = key instanceof _fedify_vocab.CryptographicKey ? key.ownerId : key.controllerId;
 	if (ownerDocument != null && claimedOwnerId == null) key = key instanceof _fedify_vocab.CryptographicKey ? key.clone({ owner: ownerDocument.id }) : key.clone({ controller: ownerDocument.id });
 	else if (claimedOwnerId != null && claimedOwnerId.href !== ownerDocument?.id?.href) {
-		if (await verifyKeyOwnership(key, {
+		if (await verifyKeyOwnershipInternal(key, {
 			documentLoader,
 			contextLoader,
 			tracerProvider
-		}) == null) {
+		}, true) == null) {
 			logger.debug("Failed to verify; the owner {claimedOwnerId} that key {keyId} claims does not list the key as its own.", {
 				keyId,
 				claimedOwnerId: claimedOwnerId.href
 			});
 			await keyCache?.set(cacheKey, null);
+			await clearFetchErrorMetadata(cacheKey, keyCache);
 			return {
 				key: null,
 				cached: false
@@ -1448,9 +1538,17 @@ async function fetchKeyWithResult(cacheKey, cls, options, onCachedUnavailable, o
 			outcome = classified;
 			return errored;
 		}
-		const resolved = await resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, options, logger);
-		outcome = { result: resolved.key != null ? "fetched" : "invalid" };
-		return resolved;
+		try {
+			const resolved = await resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, options, logger);
+			outcome = { result: resolved.key != null ? "fetched" : "invalid" };
+			return resolved;
+		} catch (error) {
+			if (!(error instanceof KeyContextFetchError)) throw error;
+			const classified = classifyFetchError(error.error);
+			const errored = await onFetchError(error.error, cacheKey, keyId, keyCache, logger);
+			outcome = classified;
+			return errored;
+		}
 	} finally {
 		recordKeyLookup(options.meterProvider, {
 			durationMs: getDurationMs(start),