@fedify/fedify 2.0.22-dev.1552 → 2.0.22

package/dist/{builder-BGn4fR4T.mjs → builder-BO_JMtJs.mjs}

@@ -2,8 +2,8 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError, t as Router } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-CzWRdvbm.mjs";
-import { t as InboxListenerSet } from "./inbox-hJL9klR1.mjs";
+import { n as version, t as name } from "./deno-661NE5Kk.mjs";
+import { t as InboxListenerSet } from "./inbox-Bqoa4PJZ.mjs";
 import { getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
@@ -42,7 +42,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-CfGAgFCR.mjs");
+		const { FederationImpl } = await import("./middleware-DPmN82D7.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/{client-A1UrnX6I.mjs → client-HLLGHiTU.mjs}

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

package/dist/compat/transformers.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-ddO5KLpe.mjs";
 import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-DvBRn8oT.mjs";
+import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-DVqurycM.mjs";
 import { test } from "@fedify/fixture";
 import { Follow, Person } from "@fedify/vocab";
 //#region src/compat/transformers.test.ts

package/dist/{deno-CzWRdvbm.mjs → deno-661NE5Kk.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.0.22-dev.1552+ab7f1679";
+var version = "2.0.22";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-DL03Z6Do.mjs → docloader-Doj2y_GK.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { a as validateCryptoKey } from "./key-4XtzJ1-9.mjs";
-import { n as doubleKnock } from "./http-vxO9IEIy.mjs";
+import { a as validateCryptoKey } from "./key-C0qmhoN-.mjs";
+import { n as doubleKnock } from "./http-BQL35dN0.mjs";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
 import { getLogger } from "@logtape/logtape";

package/dist/federation/builder.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { a as assertExists } from "../std__assert-Duiq_YC9.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { n as createFederationBuilder } from "../builder-BGn4fR4T.mjs";
+import { n as createFederationBuilder } from "../builder-BO_JMtJs.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Note, Person } from "@fedify/vocab";
 //#region src/federation/builder.test.ts

package/dist/federation/handler.test.mjs

@@ -6,12 +6,12 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { s as signRequest } from "../http-vxO9IEIy.mjs";
+import { s as signRequest } from "../http-BQL35dN0.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-CtZLJq76.mjs";
-import { a as compactJsonLd, f as signJsonLd } from "../ld-B9yNvtQU.mjs";
+import { a as compactJsonLd, f as signJsonLd } from "../ld-B2MKYZcj.mjs";
 import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { a as createFederation, c as handleCollection, d as handleObject, f as respondWithObject, l as handleCustomCollection, p as respondWithObjectIfAcceptable, s as handleActor, u as handleInbox } from "../middleware-DvBRn8oT.mjs";
-import { t as InboxListenerSet } from "../inbox-hJL9klR1.mjs";
+import { a as createFederation, c as handleCollection, d as handleObject, f as respondWithObject, l as handleCustomCollection, p as respondWithObjectIfAcceptable, s as handleActor, u as handleInbox } from "../middleware-DVqurycM.mjs";
+import { t as InboxListenerSet } from "../inbox-Bqoa4PJZ.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, Note, Person } from "@fedify/vocab";
 //#region src/federation/handler.test.ts

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-CtZLJq76.mjs";
-import { n as signObject } from "../proof-CU4dSRI6.mjs";
+import { n as signObject } from "../proof-pGWMVV0R.mjs";
 import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { a as createFederation } from "../middleware-DvBRn8oT.mjs";
+import { a as createFederation } from "../middleware-DVqurycM.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, Follow, Person } from "@fedify/vocab";
 //#region src/federation/idempotency.test.ts

package/dist/federation/inbox.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as InboxListenerSet } from "../inbox-hJL9klR1.mjs";
+import { t as InboxListenerSet } from "../inbox-Bqoa4PJZ.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
 //#region src/federation/inbox.test.ts

package/dist/federation/middleware.test.mjs

@@ -10,14 +10,14 @@ import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
 import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-vxO9IEIy.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-BQL35dN0.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-CtZLJq76.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-DL03Z6Do.mjs";
-import { a as compactJsonLd, f as signJsonLd, m as verifyJsonLd, s as detachSignature } from "../ld-B9yNvtQU.mjs";
-import { t as doesActorOwnKey } from "../owner-u-sxpb4s.mjs";
-import { n as signObject, r as verifyObject } from "../proof-CU4dSRI6.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-Doj2y_GK.mjs";
+import { a as compactJsonLd, f as signJsonLd, m as verifyJsonLd, s as detachSignature } from "../ld-B2MKYZcj.mjs";
+import { t as doesActorOwnKey } from "../owner-BUbV-zsu.mjs";
+import { n as signObject, r as verifyObject } from "../proof-pGWMVV0R.mjs";
 import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { a as createFederation, i as KvSpecDeterminer, n as FederationImpl, r as InboxContextImpl, t as ContextImpl } from "../middleware-DvBRn8oT.mjs";
+import { a as createFederation, i as KvSpecDeterminer, n as FederationImpl, r as InboxContextImpl, t as ContextImpl } from "../middleware-DVqurycM.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import * as vocab from "@fedify/vocab";
 import { Create, Offer, Person, getTypeId, lookupObject } from "@fedify/vocab";

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-BqIso1Ys.cjs");
+const require_middleware = require("../middleware-DJcsKDyA.cjs");
 let es_toolkit = require("es-toolkit");
 //#region src/federation/kv.ts
 /**

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-DDZEjS18.js";
+import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-DMsZ7PRo.js";
 import { isEqual } from "es-toolkit";
 //#region src/federation/kv.ts
 /**

package/dist/federation/send.test.mjs

@@ -8,10 +8,10 @@ import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
 import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { l as verifyRequest } from "../http-vxO9IEIy.mjs";
+import { l as verifyRequest } from "../http-BQL35dN0.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CtZLJq76.mjs";
-import { t as doesActorOwnKey } from "../owner-u-sxpb4s.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-DliU7LA6.mjs";
+import { t as doesActorOwnKey } from "../owner-BUbV-zsu.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-DrKWpXWF.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 //#region src/federation/send.test.ts

package/dist/federation/temporal.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import "../std__assert-Duiq_YC9.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-BdqleueJ.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-BUr1JyFa.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

@@ -5,7 +5,7 @@ import { n as createRequestContext } from "../context-Juj6bdHC.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.mjs";
 import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { a as createFederation, o as handleWebFinger } from "../middleware-DvBRn8oT.mjs";
+import { a as createFederation, o as handleWebFinger } from "../middleware-DVqurycM.mjs";
 import { test } from "@fedify/fixture";
 import { Image, Link, Person } from "@fedify/vocab";
 //#region src/federation/webfinger.test.ts
@@ -224,7 +224,7 @@ test("handleWebFinger()", async (t) => {
 	});
 	onNotFoundCalled = null;
 	const actorHandleMapper = (_ctx, username) => {
-		return username === "foo" ? "someone" : username === "bar" ? "someone2" : null;
+		return username === "foo" ? "someone" : username === "bar" ? "someone2" : username === "qux" ? "someone2" : null;
 	};
 	await t.step("handle mapper", async () => {
 		const u = new URL(url);
@@ -347,21 +347,83 @@ test("handleWebFinger()", async (t) => {
 		assertEquals(response.status, 404);
 	});
 	await t.step("handleHost", async () => {
-		const u = new URL(url);
-		u.searchParams.set("resource", "acct:someone@example.com");
+		let u = new URL("https://ap.example.com/.well-known/webfinger");
+		u.searchParams.set("resource", "acct:someone@ap.example.com");
 		let context = createContext(u);
 		let request = context.request;
 		let response = await handleWebFinger(request, {
 			context,
-			host: "handle.example.com",
+			host: "example.com",
 			actorDispatcher,
 			onNotFound
 		});
 		assertEquals(response.status, 200);
 		assertEquals(await response.json(), {
-			...expected,
-			aliases: [...expected.aliases, "acct:someone@handle.example.com"]
+			subject: "acct:someone@example.com",
+			aliases: ["https://ap.example.com/users/someone", "acct:someone@ap.example.com"],
+			links: [
+				{
+					href: "https://ap.example.com/users/someone",
+					rel: "self",
+					type: "application/activity+json"
+				},
+				{
+					href: "https://ap.example.com/@someone",
+					rel: "http://webfinger.net/rel/profile-page"
+				},
+				{
+					href: "https://ap.example.com/@someone",
+					rel: "alternate",
+					type: "text/html"
+				},
+				{
+					href: "https://ap.example.com/icon.jpg",
+					rel: "http://webfinger.net/rel/avatar",
+					type: "image/jpeg"
+				}
+			]
+		});
+		u.searchParams.set("resource", "acct:qux@ap.example.com");
+		context = createContext(u);
+		request = context.request;
+		response = await handleWebFinger(request, {
+			context,
+			host: "example.com",
+			actorDispatcher,
+			actorHandleMapper,
+			onNotFound
 		});
+		assertEquals(response.status, 200);
+		assertEquals(await response.json(), {
+			subject: "acct:bar@example.com",
+			aliases: [
+				"https://ap.example.com/users/someone2",
+				"acct:qux@ap.example.com",
+				"acct:bar@ap.example.com"
+			],
+			links: [
+				{
+					href: "https://ap.example.com/users/someone2",
+					rel: "self",
+					type: "application/activity+json"
+				},
+				{
+					href: "https://ap.example.com/@someone2",
+					rel: "http://webfinger.net/rel/profile-page"
+				},
+				{
+					href: "https://ap.example.com/@someone2",
+					rel: "alternate",
+					type: "text/html"
+				},
+				{
+					href: "https://ap.example.com/icon.jpg",
+					rel: "http://webfinger.net/rel/avatar",
+					type: "image/jpeg"
+				}
+			]
+		});
+		u = new URL(url);
 		u.searchParams.set("resource", "acct:someone@handle.example.com");
 		context = createContext(u);
 		request = context.request;

package/dist/{http-vxO9IEIy.mjs → http-BQL35dN0.mjs}

@@ -1,8 +1,8 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CzWRdvbm.mjs";
-import { a as validateCryptoKey, n as fetchKey } from "./key-4XtzJ1-9.mjs";
+import { n as version, t as name } from "./deno-661NE5Kk.mjs";
+import { a as validateCryptoKey, n as fetchKey } from "./key-C0qmhoN-.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/{http-DSQs81GP.js → http-CC2-WkSX.js}

@@ -10,7 +10,7 @@ import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 import { Item, decodeDict, encodeItem } from "structured-field-values";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.0.22-dev.1552+ab7f1679";
+var version = "2.0.22";
 //#endregion
 //#region src/sig/key.ts
 /**

package/dist/{http-CN2DyRdw.cjs → http-DWhQe-I5.cjs}

@@ -11,7 +11,7 @@ let byte_encodings_base64 = require("byte-encodings/base64");
 let structured_field_values = require("structured-field-values");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.0.22-dev.1552+ab7f1679";
+var version = "2.0.22";
 //#endregion
 //#region src/sig/key.ts
 /**

package/dist/{inbox-hJL9klR1.mjs → inbox-Bqoa4PJZ.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CzWRdvbm.mjs";
+import { n as version, t as name } from "./deno-661NE5Kk.mjs";
 import { Activity, getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";

package/dist/{key-4XtzJ1-9.mjs → key-C0qmhoN-.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CzWRdvbm.mjs";
+import { n as version, t as name } from "./deno-661NE5Kk.mjs";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{kv-cache-dYvBso-A.js → kv-cache-C7XaTsof.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { c as validateCryptoKey, t as doubleKnock } from "./http-DSQs81GP.js";
+import { c as validateCryptoKey, t as doubleKnock } from "./http-CC2-WkSX.js";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/{kv-cache-BFV5hAXm.cjs → kv-cache-DY8Q_hte.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-CN2DyRdw.cjs");
+const require_http = require("./http-DWhQe-I5.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");

package/dist/{ld-B9yNvtQU.mjs → ld-B2MKYZcj.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CzWRdvbm.mjs";
-import { a as validateCryptoKey, n as fetchKey } from "./key-4XtzJ1-9.mjs";
+import { n as version, t as name } from "./deno-661NE5Kk.mjs";
+import { a as validateCryptoKey, n as fetchKey } from "./key-C0qmhoN-.mjs";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{middleware-CNRI-93D.cjs → middleware-BxR2EmWw.cjs}

@@ -1,4 +1,4 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_middleware = require("./middleware-BqIso1Ys.cjs");
+const require_middleware = require("./middleware-DJcsKDyA.cjs");
 exports.FederationImpl = require_middleware.FederationImpl;

package/dist/{middleware-BqIso1Ys.cjs → middleware-DJcsKDyA.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-CN2DyRdw.cjs");
-const require_proof = require("./proof-qW3joN5t.cjs");
-const require_types = require("./types-KC4QAoxe.cjs");
-const require_kv_cache = require("./kv-cache-BFV5hAXm.cjs");
+const require_http = require("./http-DWhQe-I5.cjs");
+const require_proof = require("./proof-B8z-9_xo.cjs");
+const require_types = require("./types-m8u9L86X.cjs");
+const require_kv_cache = require("./kv-cache-DY8Q_hte.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");
@@ -335,7 +335,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-CNRI-93D.cjs"));
+		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-BxR2EmWw.cjs"));
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -2355,6 +2355,24 @@ const logger = (0, _logtape_logtape.getLogger)([
 	"webfinger",
 	"server"
 ]);
+function getWebFingerSubjectAndAliases({ resourceUrl, actorUri, preferredUsername, acctUsername, host, contextHost }) {
+	const aliases = [];
+	let subject = resourceUrl.href;
+	if (resourceUrl.protocol != "acct:" && preferredUsername != null) {
+		aliases.push(`acct:${preferredUsername}@${host ?? contextHost}`);
+		if (host != null && host !== contextHost) aliases.push(`acct:${preferredUsername}@${contextHost}`);
+	}
+	if (resourceUrl.href !== actorUri.href) aliases.push(actorUri.href);
+	if (resourceUrl.protocol === "acct:" && host != null && host !== contextHost && !resourceUrl.href.endsWith(`@${host}`)) {
+		subject = `acct:${preferredUsername ?? acctUsername}@${host}`;
+		aliases.push(resourceUrl.href);
+		if (preferredUsername != null && preferredUsername !== "" && preferredUsername !== acctUsername) aliases.push(`acct:${preferredUsername}@${contextHost}`);
+	}
+	return {
+		subject,
+		aliases
+	};
+}
 /**
 * Handles a WebFinger request.  You would not typically call this function
 * directly, but instead use {@link Federation.fetch} method.
@@ -2409,6 +2427,7 @@ async function handleWebFingerInternal(request, { context, host, actorDispatcher
 		return identifier;
 	}
 	let identifier = null;
+	let acctUsername = null;
 	const uriParsed = context.parseUri(resourceUrl);
 	if (uriParsed?.type != "actor") {
 		const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
@@ -2422,8 +2441,9 @@ async function handleWebFingerInternal(request, { context, host, actorDispatcher
 			const normalizedHost = portMatch == null ? (0, node_url.domainToASCII)(match[2].toLowerCase()) : (0, node_url.domainToASCII)(match[2].substring(0, portMatch.index).toLowerCase()) + portMatch[0];
 			if (normalizedHost != context.url.host && normalizedHost != host) return await onNotFound(request);
 			else {
-				identifier = await mapUsernameToIdentifier(match[1]);
-				resourceUrl = new URL(`acct:${match[1]}@${normalizedHost}`);
+				acctUsername = match[1];
+				identifier = await mapUsernameToIdentifier(acctUsername);
+				resourceUrl = new URL(`acct:${acctUsername}@${normalizedHost}`);
 			}
 		}
 	} else identifier = uriParsed.identifier;
@@ -2433,9 +2453,10 @@ async function handleWebFingerInternal(request, { context, host, actorDispatcher
 		logger.error("Actor {identifier} not found.", { identifier });
 		return await onNotFound(request);
 	}
+	const actorUri = context.getActorUri(identifier);
 	const links = [{
 		rel: "self",
-		href: context.getActorUri(identifier).href,
+		href: actorUri.href,
 		type: "application/activity+json"
 	}];
 	for (const url of actor.urls) if (url instanceof _fedify_vocab.Link && url.href != null) links.push({
@@ -2459,22 +2480,19 @@ async function handleWebFingerInternal(request, { context, host, actorDispatcher
 		const customLinks = await webFingerLinksDispatcher(context, resourceUrl);
 		if (customLinks != null) for (const link of customLinks) links.push(link);
 	}
-	const aliases = [];
-	if (resourceUrl.protocol != "acct:" && actor.preferredUsername != null) {
-		aliases.push(`acct:${actor.preferredUsername}@${host ?? context.url.host}`);
-		if (host != null && host !== context.url.host) aliases.push(`acct:${actor.preferredUsername}@${context.url.host}`);
-	}
-	if (resourceUrl.href !== context.getActorUri(identifier).href) aliases.push(context.getActorUri(identifier).href);
-	if (resourceUrl.protocol === "acct:" && host != null && host !== context.url.host && !resourceUrl.href.endsWith(`@${host}`)) {
-		const username = resourceUrl.href.replace(/^acct:/, "").replace(/@.*$/, "");
-		aliases.push(`acct:${username}@${host}`);
-	}
-	const jrd = {
-		subject: resourceUrl.href,
+	const { subject, aliases } = getWebFingerSubjectAndAliases({
+		resourceUrl,
+		actorUri,
+		preferredUsername: actor.preferredUsername,
+		acctUsername,
+		host,
+		contextHost: context.url.host
+	});
+	return new Response(JSON.stringify({
+		subject,
 		aliases,
 		links
-	};
-	return new Response(JSON.stringify(jrd), { headers: {
+	}), { headers: {
 		"Content-Type": "application/jrd+json",
 		"Access-Control-Allow-Origin": "*"
 	} });