@fedify/fedify 2.2.6 → 2.2.8

package/README.md

@@ -193,7 +193,7 @@ This project exists thanks to all the people who contribute, donate, and sponsor
 it.  We are grateful for their support.  We would like to thank the following
 financial contributors:[^2]
 
-[^2]: Those lists are automatically updated every hour.
+[^2]: Those lists are automatically updated twice a day.
 
 <!-- hongdown-disable -->
 
@@ -204,21 +204,22 @@ financial contributors:[^2]
 ### Corporate sponsors
 
 - [<img src="https://images.opencollective.com/ghost/avatar/128.png" width="64" height="64"> Ghost](https://ghost.org)
+- [<img src="https://images.opencollective.com/altstore/avatar/128.png" width="64" height="64"> AltStore](https://altstore.io)
 
 ### Supporters
 
-- [Daniel Supernault](https://pixelfed.org/)
 - [tkgka](https://opencollective.com/tkgka)
 - [Blaine](https://opencollective.com/blaine)
 - [Erick González Aguilar](https://opencollective.com/erick-gonzalez-aguilar)
+- [Daniel Supernault](https://pixelfed.org/)
 
 ### Backers
 
-Robin Riley, yamanoku, Encyclia, taye, okin, Andy Piper, box464, Evan Prodromou, Rafael Goulart, malte
+Robin Riley, Encyclia, taye, box464, Evan Prodromou, okin, yamanoku, malte, Rafael Goulart, Andy Piper
 
 ### One-time donations
 
-Robin Riley, Markus P, Nils Bergmann, Rameez
+Robin Riley, malte, Nils Bergmann, Markus P, Rameez
 
 <!-- /DO NOT EDIT -->
 

package/dist/{builder-C-al99Vs.mjs → builder-Hr1c39Ha.mjs}

@@ -2,7 +2,7 @@ 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-B0LcALOm.mjs";
+import { n as version, t as name } from "./deno-B_vGx2Ji.mjs";
 import { t as ActivityListenerSet } from "./activity-listener-ell7W1s9.mjs";
 import { Tombstone, getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
@@ -58,7 +58,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-BysI6Pqz.mjs");
+		const { FederationImpl } = await import("./middleware-Ds3ujCKo.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -69,6 +69,8 @@ var FederationBuilderImpl = class {
 		f.webFingerLinksDispatcher = this.webFingerLinksDispatcher;
 		f.objectCallbacks = { ...this.objectCallbacks };
 		f.objectTypeIds = { ...this.objectTypeIds };
+		f.collectionCallbacks = { ...this.collectionCallbacks };
+		f.collectionTypeIds = { ...this.collectionTypeIds };
 		f.inboxPath = this.inboxPath;
 		f.outboxPath = this.outboxPath;
 		f.inboxCallbacks = this.inboxCallbacks == null ? void 0 : { ...this.inboxCallbacks };

package/dist/{client-D_1QpnWt.mjs → client-dx126nMS.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-DikXweDx.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-C3JAusAj.mjs";
+import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-BJM6vrlT.mjs";
 import { test } from "@fedify/fixture";
 import { Follow, Person } from "@fedify/vocab";
 //#region src/compat/transformers.test.ts

package/dist/{deno-B0LcALOm.mjs → deno-B_vGx2Ji.mjs}

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

package/dist/{docloader-DLAjdiZt.mjs → docloader-DixiMoIZ.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { o as validateCryptoKey } from "./key-BcpJR7wT.mjs";
-import { n as doubleKnock } from "./http-BkivuOe4.mjs";
+import { o as validateCryptoKey } from "./key-6U1u5H_H.mjs";
+import { n as doubleKnock } from "./http-BlHW6_Oi.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

@@ -6,7 +6,7 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { i as assertExists } from "../std__assert-CRDpx_HF.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { n as createFederationBuilder } from "../builder-C-al99Vs.mjs";
+import { n as createFederationBuilder } from "../builder-Hr1c39Ha.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Note, Person } from "@fedify/vocab";
 //#region src/federation/builder.test.ts
@@ -180,6 +180,18 @@ test("FederationBuilder", async (t) => {
 		});
 		builder.setCollectionDispatcher(strId, Note, "/string-id/{id}", dispatcher);
 	});
+	await t.step("propagates custom collection dispatchers to the built federation", async () => {
+		const kv = new MemoryKvStore();
+		const builder = createFederationBuilder();
+		builder.setCollectionDispatcher("test", Note, "/c/{id}", () => ({ items: [] }));
+		const impl = await builder.build({
+			kv,
+			origin: "https://example.com"
+		});
+		assertExists(impl.collectionCallbacks["test"]);
+		assertEquals(impl.collectionTypeIds["test"], Note);
+		assertEquals((await impl.fetch(new Request("https://example.com/c/x", { headers: { accept: "application/activity+json" } }), { contextData: void 0 })).status, 200);
+	});
 });
 //#endregion
 export {};

package/dist/federation/handler.test.mjs

@@ -8,11 +8,11 @@ import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { r as parseAcceptSignature } from "../accept-CPkZzmGN.mjs";
-import { s as signRequest } from "../http-BkivuOe4.mjs";
+import { s as signRequest } from "../http-BlHW6_Oi.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-DGu1NFwu.mjs";
-import { a as compactJsonLd, p as signJsonLd } from "../ld-DAZQsoKN.mjs";
+import { a as compactJsonLd, p as signJsonLd } from "../ld-DDBxn1rq.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-C3JAusAj.mjs";
+import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-BJM6vrlT.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-ell7W1s9.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Activity, Create, Note, Person, Tombstone } from "@fedify/vocab";

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { r as signObject } from "../proof-wrxzZi_u.mjs";
+import { r as signObject } from "../proof-BGrdGhcb.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { o as createFederation } from "../middleware-C3JAusAj.mjs";
+import { o as createFederation } from "../middleware-BJM6vrlT.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, Follow, Person } from "@fedify/vocab";
 //#region src/federation/idempotency.test.ts

package/dist/federation/middleware.test.mjs

@@ -11,14 +11,14 @@ import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-Dmjbg-bA.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-BkivuOe4.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-BlHW6_Oi.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-DLAjdiZt.mjs";
-import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-DAZQsoKN.mjs";
-import { t as doesActorOwnKey } from "../owner-CwVIBwY0.mjs";
-import { i as verifyObject, r as signObject } from "../proof-wrxzZi_u.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-DixiMoIZ.mjs";
+import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-DDBxn1rq.mjs";
+import { t as doesActorOwnKey } from "../owner-vuyMTd_f.mjs";
+import { i as verifyObject, r as signObject } from "../proof-BGrdGhcb.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-C3JAusAj.mjs";
+import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-BJM6vrlT.mjs";
 import { createTestTracerProvider, 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-BUiHyCQ9.cjs");
+const require_middleware = require("../middleware-Bj5UFOaT.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-Bk-ge16h.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-DOkcTiZ-.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-DikXweDx.mjs";
-import { l as verifyRequest } from "../http-BkivuOe4.mjs";
+import { l as verifyRequest } from "../http-BlHW6_Oi.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { t as doesActorOwnKey } from "../owner-CwVIBwY0.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-DOlXF7S8.mjs";
+import { t as doesActorOwnKey } from "../owner-vuyMTd_f.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-BvazsIXC.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-CRDpx_HF.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-B13wkvUP.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-MdUFasAg.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 { r as createRequestContext } from "../context-Dk_tacqz.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-C3JAusAj.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-BJM6vrlT.mjs";
 import { test } from "@fedify/fixture";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 //#region src/federation/webfinger.test.ts
@@ -257,7 +257,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);
@@ -380,21 +380,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-BkivuOe4.mjs → http-BlHW6_Oi.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-B0LcALOm.mjs";
+import { n as version, t as name } from "./deno-B_vGx2Ji.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CPkZzmGN.mjs";
-import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-BcpJR7wT.mjs";
+import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-6U1u5H_H.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/{http-C-9duWvR.js → http-C-FdpmAl.js}

@@ -10,7 +10,7 @@ import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } fro
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.2.6";
+var version = "2.2.8";
 //#endregion
 //#region src/sig/accept.ts
 /**

package/dist/{http-NEN2KDMb.cjs → http-DLRpF855.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.2.6";
+var version = "2.2.8";
 //#endregion
 //#region src/sig/accept.ts
 /**

package/dist/{key-BcpJR7wT.mjs → key-6U1u5H_H.mjs}

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

package/dist/{kv-cache-8o7zAqEi.js → kv-cache-BjlL4Zk0.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { d as validateCryptoKey, t as doubleKnock } from "./http-C-9duWvR.js";
+import { d as validateCryptoKey, t as doubleKnock } from "./http-C-FdpmAl.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-9K6uVGgd.cjs → kv-cache-DKprbYof.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-NEN2KDMb.cjs");
+const require_http = require("./http-DLRpF855.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");

package/dist/{ld-DAZQsoKN.mjs → ld-DDBxn1rq.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-B0LcALOm.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-BcpJR7wT.mjs";
+import { n as version, t as name } from "./deno-B_vGx2Ji.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-6U1u5H_H.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-C3JAusAj.mjs → middleware-BJM6vrlT.mjs}

@@ -2,25 +2,25 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-B0LcALOm.mjs";
+import { n as version, t as name } from "./deno-B_vGx2Ji.mjs";
 import { t as formatAcceptSignature } from "./accept-CPkZzmGN.mjs";
-import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-BcpJR7wT.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-BkivuOe4.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-DLAjdiZt.mjs";
+import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-6U1u5H_H.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-BlHW6_Oi.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-DixiMoIZ.mjs";
 import { n as kvCache } from "./kv-cache-DYsF2MhP.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-DAZQsoKN.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CwVIBwY0.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-DDBxn1rq.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-vuyMTd_f.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-CNmZLixq.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-wrxzZi_u.mjs";
-import { t as getNodeInfo } from "./client-D_1QpnWt.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-BGrdGhcb.mjs";
+import { t as getNodeInfo } from "./client-dx126nMS.mjs";
 import { t as nodeInfoToJson } from "./types-J53Kw7so.mjs";
-import { t as FederationBuilderImpl } from "./builder-C-al99Vs.mjs";
+import { t as FederationBuilderImpl } from "./builder-Hr1c39Ha.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-D-HqUuA2.mjs";
 import { t as KvKeyCache } from "./keycache-EGATflN-.mjs";
 import { t as acceptsJsonLd } from "./negotiation-SQvQgUqe.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "./temporal-B13wkvUP.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "./temporal-MdUFasAg.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-v_sGLH1d.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-DOlXF7S8.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-BvazsIXC.mjs";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
@@ -1697,6 +1697,24 @@ const logger = 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.
@@ -1751,6 +1769,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);
@@ -1764,8 +1783,9 @@ async function handleWebFingerInternal(request, { context, host, actorDispatcher
 			const normalizedHost = portMatch == null ? domainToASCII(match[2].toLowerCase()) : 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;
@@ -1779,9 +1799,10 @@ async function handleWebFingerInternal(request, { context, host, actorDispatcher
 		status: 410,
 		headers: { "Access-Control-Allow-Origin": "*" }
 	});
+	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 Link && url.href != null) links.push({
@@ -1805,23 +1826,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 = [];
-	const preferredUsername = actor.preferredUsername;
-	if (resourceUrl.protocol != "acct:" && preferredUsername != null) {
-		aliases.push(`acct:${preferredUsername}@${host ?? context.url.host}`);
-		if (host != null && host !== context.url.host) aliases.push(`acct:${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": "*"
 	} });