@fedify/fedify 2.3.13 → 2.3.15-dev.2482

package/dist/{middleware-CfbFdEO-.mjs → middleware-B1RRLN7m.mjs}

@@ -1,27 +1,27 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-XpcjbHwj.mjs";
-import { a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, n as getDurationMs, o as isAbortError, r as getFederationMetrics, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "./metrics-62qolVUY.mjs";
+import { n as version, t as name } from "./deno-po8iekMB.mjs";
+import { a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, n as getDurationMs, o as isAbortError, r as getFederationMetrics, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "./metrics-BS7YzLVA.mjs";
 import { t as formatAcceptSignature } from "./accept-Dd__NiUL.mjs";
-import { o as importJwk, s as validateCryptoKey, t as exportJwk } from "./key-PdEu1lDF.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-BRrpIDS1.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-QDpF5t9M.mjs";
-import { n as kvCache } from "./kv-cache-Clx3SwMp.mjs";
-import { t as KvKeyCache } from "./keycache-Dkc_sflV.mjs";
-import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-D6UlzNnG.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-DWnLg-vk.mjs";
+import { o as importJwk, s as validateCryptoKey, t as exportJwk } from "./key-BR2TRTXR.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-BNCLeQJ-.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-BVj35vgR.mjs";
+import { n as kvCache } from "./kv-cache-8SigUtvX.mjs";
+import { t as KvKeyCache } from "./keycache-BimEQucx.mjs";
+import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-CSNsWdYE.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-DeggvxcG.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-D4iTv7uM.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-mf6h7n4_.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-DMcUrrp8.mjs";
 import { d as readBoundedText, l as BodyTooLargeError, t as getNodeInfo, u as MAX_BODY_SIZE } from "./client-1He2YuBF.mjs";
 import { t as nodeInfoToJson } from "./types-J53Kw7so.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-LJUzNpVF.mjs";
-import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-BagNDcQw.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-BsthcvPG.mjs";
+import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-CocMrVkL.mjs";
 import { t as CircuitBreaker } from "./circuit-breaker-D1fxthDI.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-Cc3DVAhE.mjs";
-import { n as routeActivity, t as actorsHaveSameOrigin } from "./inbox-BzOuCPLY.mjs";
+import { n as routeActivity, t as actorsHaveSameOrigin } from "./inbox-g1sd_Vjn.mjs";
 import { t as acceptsJsonLd } from "./negotiation-DDstyBvc.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "./temporal-_3yIqdvy.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "./temporal-Cji8Y8eQ.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-CXg_MBI-.mjs";
 import { getLogger, withContext } from "@logtape/logtape";
 import { RouterError } from "@fedify/uri-template";
@@ -3556,7 +3556,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		onNotAcceptable ??= notAcceptable;
 		onUnauthorized ??= unauthorized;
 		const url = new URL(request.url);
-		const route = this.router.route(url.pathname);
+		const route = this.router.route(url.pathname, { allowUnencodedColon: true });
 		if (route == null) {
 			metricState.endpoint = "not_found";
 			return await onNotFound(request);

package/dist/{middleware-DkrXqZO_.cjs → middleware-D-SL8Bkj.cjs}

@@ -2,10 +2,10 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
-const require_http = require("./http-DwPnG87d.cjs");
+const require_http = require("./http-WcSdFbt1.cjs");
 const require_types = require("./types-DRPjmHVV.cjs");
-const require_proof = require("./proof-DF6CU-SU.cjs");
-const require_kv_cache = require("./kv-cache-poF6Tqnz.cjs");
+const require_proof = require("./proof-teNNYmFh.cjs");
+const require_kv_cache = require("./kv-cache-Bw_gduSm.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_uri_template = require("@fedify/uri-template");
 let _fedify_vocab = require("@fedify/vocab");
@@ -1435,7 +1435,7 @@ async function routeActivity({ context: ctx, json, originalJson, normalizedActiv
 }
 //#endregion
 //#region src/federation/keycache.ts
-const KEY_CACHE_GENERATION = "2";
+const KEY_CACHE_GENERATION = "3";
 var KvKeyCache = class {
 	kv;
 	prefix;
@@ -5506,7 +5506,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		onNotAcceptable ??= notAcceptable;
 		onUnauthorized ??= unauthorized;
 		const url = new URL(request.url);
-		const route = this.router.route(url.pathname);
+		const route = this.router.route(url.pathname, { allowUnencodedColon: true });
 		if (route == null) {
 			metricState.endpoint = "not_found";
 			return await onNotFound(request);

package/dist/{middleware-C3Q3CoR8.mjs → middleware-Dlo7NnZl.mjs}

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as FederationImpl } from "./middleware-CfbFdEO-.mjs";
+import { n as FederationImpl } from "./middleware-B1RRLN7m.mjs";
 export { FederationImpl };

package/dist/{middleware-xw9fBZoB.js → middleware-WL-JfDiK.js}

@@ -2,10 +2,10 @@ import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { t as __exportAll } from "./chunk-CRNNMoPX.js";
 import { r as getDefaultActivityTransformers } from "./transformers-BGMIq1cs.js";
-import { A as recordWebFingerHandle, C as recordCollectionRequest, D as recordInboxActivity, E as recordFanoutRecipients, I as name, L as version, M as formatAcceptSignature, O as recordOutboxActivity, S as recordCollectionPageItems, _ as instrumentDocumentLoader, a as verifyRequestDetailed, b as recordCircuitBreakerStateChange, d as importJwk, f as validateCryptoKey, g as getRemoteHost, h as getFederationMetrics, i as verifyRequest, j as registerQueueDepthGauge, k as recordOutboxEnqueue, m as getDurationMs, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, v as isAbortError, w as recordCollectionTotalItems, x as recordCollectionDispatchDuration } from "./http-GHVGCeb5.js";
+import { A as recordWebFingerHandle, C as recordCollectionRequest, D as recordInboxActivity, E as recordFanoutRecipients, I as name, L as version, M as formatAcceptSignature, O as recordOutboxActivity, S as recordCollectionPageItems, _ as instrumentDocumentLoader, a as verifyRequestDetailed, b as recordCircuitBreakerStateChange, d as importJwk, f as validateCryptoKey, g as getRemoteHost, h as getFederationMetrics, i as verifyRequest, j as registerQueueDepthGauge, k as recordOutboxEnqueue, m as getDurationMs, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, v as isAbortError, w as recordCollectionTotalItems, x as recordCollectionDispatchDuration } from "./http-Cdu8BGtv.js";
 import { a as MAX_BODY_SIZE, i as BodyTooLargeError, n as getNodeInfo, o as readBoundedText, t as nodeInfoToJson } from "./types-miAYfiGO.js";
-import { _ as hasSignatureLike, b as signJsonLd, c as getKeyOwner, f as compactJsonLd, g as hasSignature, h as getNormalizationContextLoader, i as verifyObject, l as InvalidContextReferenceError, m as detachSignature, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, r as signObject, s as doesActorOwnKey, u as assertSafeJsonLd, v as isClearlyMalformedContextReference, w as wrapContextLoaderForJsonLd, x as verifyCompactJsonLd, y as isInvalidUrlTypeError } from "./proof-CUSzBztF.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-BmqdF048.js";
+import { _ as hasSignatureLike, b as signJsonLd, c as getKeyOwner, f as compactJsonLd, g as hasSignature, h as getNormalizationContextLoader, i as verifyObject, l as InvalidContextReferenceError, m as detachSignature, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, r as signObject, s as doesActorOwnKey, u as assertSafeJsonLd, v as isClearlyMalformedContextReference, w as wrapContextLoaderForJsonLd, x as verifyCompactJsonLd, y as isInvalidUrlTypeError } from "./proof-v-IzWx7x.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-C0AqpjoS.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Router, RouterError, assertPath } from "@fedify/uri-template";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
@@ -1434,7 +1434,7 @@ async function routeActivity({ context: ctx, json, originalJson, normalizedActiv
 }
 //#endregion
 //#region src/federation/keycache.ts
-const KEY_CACHE_GENERATION = "2";
+const KEY_CACHE_GENERATION = "3";
 var KvKeyCache = class {
 	kv;
 	prefix;
@@ -5505,7 +5505,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		onNotAcceptable ??= notAcceptable;
 		onUnauthorized ??= unauthorized;
 		const url = new URL(request.url);
-		const route = this.router.route(url.pathname);
+		const route = this.router.route(url.pathname, { allowUnencodedColon: true });
 		if (route == null) {
 			metricState.endpoint = "not_found";
 			return await onNotFound(request);

package/dist/mod.cjs

@@ -4,11 +4,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
 require("./compat/mod.cjs");
-const require_http = require("./http-DwPnG87d.cjs");
-const require_middleware = require("./middleware-DkrXqZO_.cjs");
+const require_http = require("./http-WcSdFbt1.cjs");
+const require_middleware = require("./middleware-D-SL8Bkj.cjs");
 const require_types = require("./types-DRPjmHVV.cjs");
-const require_proof = require("./proof-DF6CU-SU.cjs");
-const require_kv_cache = require("./kv-cache-poF6Tqnz.cjs");
+const require_proof = require("./proof-teNNYmFh.cjs");
+const require_kv_cache = require("./kv-cache-Bw_gduSm.cjs");
 const require_federation_mod = require("./federation/mod.cjs");
 require("./nodeinfo/mod.cjs");
 require("./runtime/mod.cjs");

package/dist/mod.js

@@ -3,11 +3,11 @@ import { URLPattern } from "urlpattern-polyfill";
 import "./chunk-CRNNMoPX.js";
 import { n as autoIdAssigner, r as getDefaultActivityTransformers, t as actorDehydrator } from "./transformers-BGMIq1cs.js";
 import "./compat/mod.js";
-import { F as validateAcceptSignature, M as formatAcceptSignature, N as fulfillAcceptSignature, P as parseAcceptSignature, a as verifyRequestDetailed, c as fetchKey, d as importJwk, i as verifyRequest, l as fetchKeyDetailed, o as exportJwk, r as signRequest, u as generateCryptoKeyPair } from "./http-GHVGCeb5.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 { F as validateAcceptSignature, M as formatAcceptSignature, N as fulfillAcceptSignature, P as parseAcceptSignature, a as verifyRequestDetailed, c as fetchKey, d as importJwk, i as verifyRequest, l as fetchKeyDetailed, o as exportJwk, r as signRequest, u as generateCryptoKeyPair } from "./http-Cdu8BGtv.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-WL-JfDiK.js";
 import { n as getNodeInfo, r as parseNodeInfo, t as nodeInfoToJson } from "./types-miAYfiGO.js";
-import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "./proof-CUSzBztF.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-BmqdF048.js";
+import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "./proof-v-IzWx7x.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-C0AqpjoS.js";
 import { InProcessMessageQueue, MemoryKvStore, ParallelMessageQueue, Router, RouterError } from "./federation/mod.js";
 import "./nodeinfo/mod.js";
 import "./runtime/mod.js";

package/dist/nodeinfo/handler.test.mjs

@@ -5,7 +5,7 @@ import { r as createRequestContext } from "../context-CxbCIptr.mjs";
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BjJn2daJ.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { _ as handleNodeInfo, o as createFederation, v as handleNodeInfoJrd } from "../middleware-CfbFdEO-.mjs";
+import { _ as handleNodeInfo, o as createFederation, v as handleNodeInfoJrd } from "../middleware-B1RRLN7m.mjs";
 import { test } from "@fedify/fixture";
 //#region src/nodeinfo/handler.test.ts
 test("handleNodeInfo()", async () => {

package/dist/{owner-DWnLg-vk.mjs → owner-DeggvxcG.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-XpcjbHwj.mjs";
-import { c as verifyKeyOwnership, n as fetchActorDocument, t as exportJwk } from "./key-PdEu1lDF.mjs";
+import { n as version, t as name } from "./deno-po8iekMB.mjs";
+import { c as verifyKeyOwnership, n as fetchActorDocument, t as exportJwk } from "./key-BR2TRTXR.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{proof-mf6h7n4_.mjs → proof-DMcUrrp8.mjs}

@@ -1,9 +1,9 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-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 { r as fetchKey, s as validateCryptoKey } from "./key-PdEu1lDF.mjs";
+import { n as version, t as name } from "./deno-po8iekMB.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-BS7YzLVA.mjs";
+import { r as fetchKey, s as validateCryptoKey } from "./key-BR2TRTXR.mjs";
 import { n as preloadedOnlyDocumentLoader } from "./public-audience-Dp4ZScSr.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-D4iTv7uM.mjs";
 import { getLogger } from "@logtape/logtape";

package/dist/{proof-DF6CU-SU.cjs → proof-teNNYmFh.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-DwPnG87d.cjs");
+const require_http = require("./http-WcSdFbt1.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");

package/dist/{proof-CUSzBztF.js → proof-v-IzWx7x.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { I as name, L as version, c as fetchKey, f as validateCryptoKey, h as getFederationMetrics, m as getDurationMs, o as exportJwk, p as verifyKeyOwnership, s as fetchActorDocument, y as measureSignatureKeyFetch } from "./http-GHVGCeb5.js";
+import { I as name, L as version, c as fetchKey, f as validateCryptoKey, h as getFederationMetrics, m as getDurationMs, o as exportJwk, p as verifyKeyOwnership, s as fetchActorDocument, y as measureSignatureKeyFetch } from "./http-Cdu8BGtv.js";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1, PUBLIC_COLLECTION, getTypeId, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{send-LJUzNpVF.mjs → send-BsthcvPG.mjs}

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-XpcjbHwj.mjs";
-import { n as getDurationMs, r as getFederationMetrics } from "./metrics-62qolVUY.mjs";
-import { n as doubleKnock } from "./http-BRrpIDS1.mjs";
+import { n as version, t as name } from "./deno-po8iekMB.mjs";
+import { n as getDurationMs, r as getFederationMetrics } from "./metrics-BS7YzLVA.mjs";
+import { n as doubleKnock } from "./http-BNCLeQJ-.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError, UrlError, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/sig/http.test.mjs

@@ -7,10 +7,10 @@ import { n as assertExists, t as assertStringIncludes } from "../std__assert-BjJ
 import { r as assertFalse, t as assertThrows } from "../assert_throws-BbSMEFKo.mjs";
 import { n as assertGreaterOrEqual, t as assertRejects } from "../assert_rejects-D1HYAik3.mjs";
 import { t as assert } from "../assert-CEO06XCw.mjs";
-import { t as exportJwk } from "../key-PdEu1lDF.mjs";
-import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-BRrpIDS1.mjs";
+import { t as exportJwk } from "../key-BR2TRTXR.mjs";
+import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-BNCLeQJ-.mjs";
 import { i as rsaPrivateKey2, l as rsaPublicKey5, o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-BAK-tUlf.mjs";
-import { t as KvKeyCache } from "../keycache-Dkc_sflV.mjs";
+import { t as KvKeyCache } from "../keycache-BimEQucx.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError, exportSpki } from "@fedify/vocab-runtime";

package/dist/sig/key.test.mjs

@@ -3,13 +3,13 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BjJn2daJ.mjs";
-import { t as assertThrows } from "../assert_throws-BbSMEFKo.mjs";
+import { r as assertFalse, t as assertThrows } from "../assert_throws-BbSMEFKo.mjs";
 import { t as assertRejects } from "../assert_rejects-D1HYAik3.mjs";
 import { t as assert } from "../assert-CEO06XCw.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-XEgZAlrj.mjs";
-import { a as generateCryptoKeyPair, i as fetchKeyDetailed, o as importJwk, r as fetchKey, s as validateCryptoKey, t as exportJwk } from "../key-PdEu1lDF.mjs";
+import { a as generateCryptoKeyPair, i as fetchKeyDetailed, o as importJwk, r as fetchKey, s as validateCryptoKey, t as exportJwk } from "../key-BR2TRTXR.mjs";
 import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { _ as wrapContextLoaderForJsonLd } from "../ld-D6UlzNnG.mjs";
+import { _ as wrapContextLoaderForJsonLd } from "../ld-CSNsWdYE.mjs";
 import { CryptographicKey, Multikey, Person } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError, getDocumentLoader } from "@fedify/vocab-runtime";
@@ -868,5 +868,199 @@ test("fetchKey() records the controller an actor document establishes", async ()
 	assertEquals(key?.controllerId, new URL(actorId));
 	assert(key?.publicKey != null);
 });
+test("fetchKey() rejects a key whose owner redirects to another actor", async () => {
+	const keyId = "https://evil.example/keys/1";
+	const victim = "https://victim.example/users/alice";
+	const mallory = "https://evil.example/users/mallory";
+	const { publicKeyPem } = await rsaPublicKey3.toJsonLd({ contextLoader: mockDocumentLoader });
+	const cache = {};
+	assertEquals(await fetchKey(keyId, CryptographicKey, {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": "https://w3id.org/security/v1",
+					id: keyId,
+					type: "CryptographicKey",
+					owner: victim,
+					publicKeyPem
+				}
+			});
+			if (resource === victim || resource === mallory) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: mallory,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: mallory,
+					type: "Person",
+					publicKey: keyId
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader,
+		keyCache: {
+			get(keyId) {
+				return Promise.resolve(cache[keyId.href]);
+			},
+			set(keyId, key) {
+				cache[keyId.href] = key;
+				return Promise.resolve();
+			}
+		}
+	}), {
+		key: null,
+		cached: false
+	});
+	assertEquals(cache, { [keyId]: null });
+});
+test("fetchKey() rejects a key whose owner resolves to another actor on the same origin", async () => {
+	const keyId = "https://victim.example/keys/bob";
+	const victim = "https://victim.example/users/alice";
+	const bob = "https://victim.example/users/bob";
+	const { publicKeyPem } = await rsaPublicKey3.toJsonLd({ contextLoader: mockDocumentLoader });
+	assertEquals(await fetchKey(keyId, CryptographicKey, {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": "https://w3id.org/security/v1",
+					id: keyId,
+					type: "CryptographicKey",
+					owner: victim,
+					publicKeyPem
+				}
+			});
+			if (resource === victim || resource === bob) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: bob,
+					type: "Person",
+					publicKey: keyId
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	}), {
+		key: null,
+		cached: false
+	});
+});
+test("fetchKey() rejects a Multikey whose controller redirects to another actor", async () => {
+	const keyId = "https://evil.example/keys/ed25519";
+	const victim = "https://victim.example/users/alice";
+	const mallory = "https://evil.example/users/mallory";
+	const multikeyDocument = await ed25519Multikey.toJsonLd({ contextLoader: mockDocumentLoader });
+	assertEquals(await fetchKey(keyId, Multikey, {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					...multikeyDocument,
+					id: keyId,
+					controller: victim
+				}
+			});
+			if (resource === victim || resource === mallory) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: mallory,
+				document: {
+					"@context": [
+						"https://www.w3.org/ns/activitystreams",
+						"https://w3id.org/security/v1",
+						"https://w3id.org/security/multikey/v1",
+						"https://w3id.org/security/data-integrity/v1",
+						"https://www.w3.org/ns/did/v1"
+					],
+					id: mallory,
+					type: "Person",
+					assertionMethod: [keyId]
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	}), {
+		key: null,
+		cached: false
+	});
+});
+test("fetchKey() accepts an owner whose document URL differs from its id", async () => {
+	const keyId = "https://victim.example/keys/alice";
+	const alice = "https://victim.example/users/alice";
+	const { publicKeyPem } = await rsaPublicKey3.toJsonLd({ contextLoader: mockDocumentLoader });
+	const { key, cached } = await fetchKey(keyId, CryptographicKey, {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": "https://w3id.org/security/v1",
+					id: keyId,
+					type: "CryptographicKey",
+					owner: alice,
+					publicKeyPem
+				}
+			});
+			if (resource === alice) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: `${alice}.json`,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: alice,
+					type: "Person",
+					publicKey: keyId
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	});
+	assertFalse(cached);
+	assertEquals(key?.id, new URL(keyId));
+	assertEquals(key?.ownerId, new URL(alice));
+});
+test("fetchKey() rejects an owner reached through a normalization redirect", async () => {
+	const keyId = "https://victim.example/keys/alice";
+	const canonical = "https://victim.example/users/alice";
+	const nonCanonical = "https://victim.example/users/Alice";
+	const { publicKeyPem } = await rsaPublicKey3.toJsonLd({ contextLoader: mockDocumentLoader });
+	assertEquals(await fetchKey(keyId, CryptographicKey, {
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": "https://w3id.org/security/v1",
+					id: keyId,
+					type: "CryptographicKey",
+					owner: nonCanonical,
+					publicKeyPem
+				}
+			});
+			if (resource === canonical || resource === nonCanonical) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: canonical,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: canonical,
+					type: "Person",
+					publicKey: keyId
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	}), {
+		key: null,
+		cached: false
+	});
+});
 //#endregion
 export {};

package/dist/sig/ld.test.mjs

@@ -5,9 +5,9 @@ import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import { r as assertFalse, t as assertThrows } 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 { a as generateCryptoKeyPair } from "../key-PdEu1lDF.mjs";
+import { a as generateCryptoKeyPair } from "../key-BR2TRTXR.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { a as compactJsonLd, f as isInvalidUrlTypeError, g as verifySignature, h as verifyJsonLd, i as attachSignature, n as UnsafeJsonLdError, o as createSignature, p as signJsonLd, s as detachSignature, u as hasSignatureLike } from "../ld-D6UlzNnG.mjs";
+import { a as compactJsonLd, f as isInvalidUrlTypeError, g as verifySignature, h as verifyJsonLd, i as attachSignature, n as UnsafeJsonLdError, o as createSignature, p as signJsonLd, s as detachSignature, u as hasSignatureLike } from "../ld-CSNsWdYE.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { encodeBase64 } from "byte-encodings/base64";
@@ -993,5 +993,50 @@ test("verifyJsonLd() rejects a key that claims a forged owner", async () => {
 		contextLoader: mockDocumentLoader
 	}));
 });
+test("verifyJsonLd() rejects a key whose owner redirects to another actor", async () => {
+	const keyId = new URL("https://evil.example/keys/1");
+	const victim = "https://victim.example/users/alice";
+	const mallory = "https://evil.example/users/mallory";
+	const { publicKeyPem } = await rsaPublicKey3.toJsonLd({ contextLoader: mockDocumentLoader });
+	const signed = await signJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		id: "https://victim.example/activities/forged",
+		type: "Create",
+		actor: victim,
+		object: {
+			type: "Note",
+			content: "forged"
+		}
+	}, rsaPrivateKey3, keyId, { contextLoader: mockDocumentLoader });
+	const options = {
+		documentLoader(resource) {
+			if (resource === keyId.href) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": "https://w3id.org/security/v1",
+					id: keyId.href,
+					type: "CryptographicKey",
+					owner: victim,
+					publicKeyPem
+				}
+			});
+			if (resource === victim || resource === mallory) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: mallory,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: mallory,
+					type: "Person",
+					publicKey: keyId.href
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	};
+	assertEquals(await verifySignature(signed, options), null);
+	assertFalse(await verifyJsonLd(signed, options));
+});
 //#endregion
 export {};

package/dist/sig/mod.cjs

@@ -1,8 +1,8 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_http = require("../http-DwPnG87d.cjs");
-const require_proof = require("../proof-DF6CU-SU.cjs");
+const require_http = require("../http-WcSdFbt1.cjs");
+const require_proof = require("../proof-teNNYmFh.cjs");
 exports.attachSignature = require_proof.attachSignature;
 exports.createProof = require_proof.createProof;
 exports.createSignature = require_proof.createSignature;

package/dist/sig/mod.js

@@ -1,5 +1,5 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { F as validateAcceptSignature, M as formatAcceptSignature, N as fulfillAcceptSignature, P as parseAcceptSignature, a as verifyRequestDetailed, c as fetchKey, d as importJwk, i as verifyRequest, l as fetchKeyDetailed, o as exportJwk, r as signRequest, u as generateCryptoKeyPair } from "../http-GHVGCeb5.js";
-import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "../proof-CUSzBztF.js";
+import { F as validateAcceptSignature, M as formatAcceptSignature, N as fulfillAcceptSignature, P as parseAcceptSignature, a as verifyRequestDetailed, c as fetchKey, d as importJwk, i as verifyRequest, l as fetchKeyDetailed, o as exportJwk, r as signRequest, u as generateCryptoKeyPair } from "../http-Cdu8BGtv.js";
+import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "../proof-v-IzWx7x.js";
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, hasProofLike, hasSignatureLike, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/owner.test.mjs

@@ -6,7 +6,7 @@ import "../std__assert-BjJn2daJ.mjs";
 import { r as assertFalse } from "../assert_throws-BbSMEFKo.mjs";
 import { t as assert } from "../assert-CEO06XCw.mjs";
 import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-BAK-tUlf.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-DWnLg-vk.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-DeggvxcG.mjs";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/sig/owner.test.ts
@@ -153,5 +153,50 @@ test("doesActorOwnKey() matches a key that leaves its id implicit", async () =>
 		publicKey: rsaPublicKey2.publicKey
 	}), options));
 });
+test("doesActorOwnKey() rejects an actor ID that redirects to the key's owner", async () => {
+	const keyId = "https://evil.example/keys/1";
+	const victim = "https://victim.example/users/alice";
+	const mallory = "https://evil.example/users/mallory";
+	const { publicKeyPem } = await rsaPublicKey1.toJsonLd({ contextLoader: mockDocumentLoader });
+	const serveKeyOwnedBy = (owner) => ({
+		documentLoader(resource) {
+			if (resource === keyId) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: resource,
+				document: {
+					"@context": "https://w3id.org/security/v1",
+					id: keyId,
+					type: "CryptographicKey",
+					owner,
+					publicKeyPem
+				}
+			});
+			if (resource === victim || resource === mallory) return Promise.resolve({
+				contextUrl: null,
+				documentUrl: mallory,
+				document: {
+					"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+					id: mallory,
+					type: "Person",
+					publicKey: keyId
+				}
+			});
+			return mockDocumentLoader(resource);
+		},
+		contextLoader: mockDocumentLoader
+	});
+	const activity = new Create({ actor: new URL(victim) });
+	assertFalse(await doesActorOwnKey(activity, new CryptographicKey({
+		id: new URL(keyId),
+		owner: new URL(mallory),
+		publicKey: rsaPublicKey1.publicKey
+	}), serveKeyOwnedBy(mallory)));
+	assertFalse(await doesActorOwnKey(activity, new CryptographicKey({
+		id: new URL(keyId),
+		owner: new URL(victim),
+		publicKey: rsaPublicKey1.publicKey
+	}), serveKeyOwnedBy(victim)));
+	assertEquals(await getKeyOwner(new URL(keyId), serveKeyOwnedBy(victim)), null);
+});
 //#endregion
 export {};