@fedify/fedify 2.1.1 → 2.1.3

package/dist/federation/{webfinger.test.js → webfinger.test.mjs}

@@ -1,51 +1,23 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-      globalThis.addEventListener = () => {};
-    
-import { assertEquals } from "../assert_equals-DSbWqCm3.js";
-import "../assert-MZs1qjMx.js";
-import "../assert_instance_of-DHz7EHNU.js";
-import { MemoryKvStore } from "../kv-QzKcOQgP.js";
-import "../deno-DH972JvX.js";
-import { createFederation, handleWebFinger } from "../middleware-BHJ0xm0L.js";
-import "../client-CoCIaTNO.js";
-import "../router-D9eI0s4b.js";
-import "../types-CPz01LGH.js";
-import "../accept-D7sAxyNa.js";
-import "../key-CypuWa94.js";
-import "../http-DFzT4YFG.js";
-import "../ld-CXLtTc0G.js";
-import "../owner-CwMai3jn.js";
-import "../proof-ZuJBOUoi.js";
-import "../docloader-Ck0SCLXX.js";
-import "../kv-cache-Bw2F2ABq.js";
-import "../inbox-BMLz_-pL.js";
-import "../builder-DbKYZdSy.js";
-import "../collection-CSzG2j1P.js";
-import "../keycache-CpGWAUbj.js";
-import "../negotiation-BlAuS_nr.js";
-import "../retry-mqLf4b-R.js";
-import "../send-BW73dy6Q.js";
-import "../std__assert-X-_kMxKM.js";
-import "../assert_rejects-0h7I2Esa.js";
-import "../assert_throws-rjdMBf31.js";
-import "../assert_not_equals-f3m3epl3.js";
-import { createRequestContext } from "../context-Aqenou7c.js";
+import "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+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-tL2TOE9X.mjs";
+import { a as createFederation, o as handleWebFinger } from "../middleware-dFn6ozt5.mjs";
 import { test } from "@fedify/fixture";
 import { Image, Link, Person } from "@fedify/vocab";
-
 //#region src/federation/webfinger.test.ts
 test("handleWebFinger()", async (t) => {
 	const url = new URL("https://example.com/.well-known/webfinger");
-	function createContext(url$1) {
-		const federation = createFederation({ kv: new MemoryKvStore() });
+	function createContext(url) {
 		const context = createRequestContext({
-			federation,
-			url: url$1,
+			federation: createFederation({ kv: new MemoryKvStore() }),
+			url,
 			data: void 0,
 			getActorUri(identifier) {
-				return new URL(`${url$1.origin}/users/${identifier}`);
+				return new URL(`${url.origin}/users/${identifier}`);
 			},
 			async getActor(handle) {
 				return await actorDispatcher(context, handle);
@@ -55,10 +27,9 @@ test("handleWebFinger()", async (t) => {
 				if (uri.protocol === "acct:") return null;
 				if (!uri.pathname.startsWith("/users/")) return null;
 				const paths = uri.pathname.split("/");
-				const identifier = paths[paths.length - 1];
 				return {
 					type: "actor",
-					identifier
+					identifier: paths[paths.length - 1]
 				};
 			}
 		});
@@ -90,11 +61,10 @@ test("handleWebFinger()", async (t) => {
 	await t.step("no actor dispatcher", async () => {
 		const context = createContext(url);
 		const request = context.request;
-		const response = await handleWebFinger(request, {
+		assertEquals((await handleWebFinger(request, {
 			context,
 			onNotFound
-		});
-		assertEquals(response.status, 404);
+		})).status, 404);
 		assertEquals(onNotFoundCalled, request);
 	});
 	onNotFoundCalled = null;
@@ -114,8 +84,7 @@ test("handleWebFinger()", async (t) => {
 		const u = new URL(url);
 		u.searchParams.set("resource", " invalid ");
 		const context = createContext(u);
-		const request = new Request(u);
-		const response = await handleWebFinger(request, {
+		const response = await handleWebFinger(new Request(u), {
 			context,
 			actorDispatcher,
 			onNotFound
@@ -221,12 +190,11 @@ test("handleWebFinger()", async (t) => {
 		u.searchParams.set("resource", "acct:no-one@example.com");
 		const context = createContext(u);
 		const request = context.request;
-		const response = await handleWebFinger(request, {
+		assertEquals((await handleWebFinger(request, {
 			context,
 			actorDispatcher,
 			onNotFound
-		});
-		assertEquals(response.status, 404);
+		})).status, 404);
 		assertEquals(onNotFoundCalled, request);
 	});
 	onNotFoundCalled = null;
@@ -522,16 +490,14 @@ test("handleWebFinger()", async (t) => {
 			onNotFound
 		});
 		assertEquals(response.status, 200);
-		const result = await response.json();
-		const expectedWithCustomLinks = {
+		assertEquals(await response.json(), {
 			...expected,
 			links: [...expected.links, {
 				rel: "http://ostatus.org/schema/1.0/subscribe",
 				template: "https://example.com/follow?acct={uri}"
 			}]
-		};
-		assertEquals(result, expectedWithCustomLinks);
+		});
 	});
 });
-
-//#endregion
+//#endregion
+export {};

package/dist/{http-DFzT4YFG.js → http-B53alCGi.mjs}

@@ -1,20 +1,17 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-      globalThis.addEventListener = () => {};
-    
-import { deno_default } from "./deno-DH972JvX.js";
-import { fulfillAcceptSignature, parseAcceptSignature, validateAcceptSignature } from "./accept-D7sAxyNa.js";
-import { fetchKeyDetailed, validateCryptoKey } from "./key-CypuWa94.js";
+import { Temporal } from "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { n as version, t as name } from "./deno-D5r_9RvZ.mjs";
+import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-Dd__NiUL.mjs";
+import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-D9Np_ZXl.mjs";
 import { CryptographicKey } from "@fedify/vocab";
+import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";
 import { getLogger } from "@logtape/logtape";
-import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 import { encodeHex } from "byte-encodings/hex";
 import { Item, decodeDict, encodeItem } from "structured-field-values";
-
 //#region src/sig/http.ts
 const DEFAULT_MAX_REDIRECTION = 20;
 /**
@@ -28,9 +25,7 @@ const DEFAULT_MAX_REDIRECTION = 20;
 */
 async function signRequest(request, privateKey, keyId, options = {}) {
 	validateCryptoKey(privateKey, "private");
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("http_signatures.sign", async (span) => {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("http_signatures.sign", async (span) => {
 		try {
 			const spec = options.spec ?? "draft-cavage-http-signatures-12";
 			let signed;
@@ -138,9 +133,7 @@ const derivedComponents = {
 * @returns The formatted signature string.
 */
 function formatRfc9421Signature(signature, components, parameters, label = "sig1") {
-	const signatureInputValue = `${label}=(${components.map((c) => formatComponentId(c)).join(" ")});${parameters}`;
-	const signatureValue = `${label}=:${encodeBase64(signature)}:`;
-	return [signatureInputValue, signatureValue];
+	return [`${label}=(${components.map((c) => formatComponentId(c)).join(" ")});${parameters}`, `${label}=:${encodeBase64(signature)}:`];
 }
 /**
 * Parse RFC 9421 Signature-Input header.
@@ -246,12 +239,11 @@ async function signRequestRfc9421(request, privateKey, keyId, span, currentTime,
 		value: "content-digest",
 		params: {}
 	}] : []];
-	const expires = rfc9421Options?.expires === true ? (currentTime.epochMilliseconds / 1e3 | 0) + 3600 : void 0;
 	const signatureParams = formatRfc9421SignatureParameters({
 		algorithm: "rsa-v1_5-sha256",
 		keyId,
 		created,
-		expires,
+		expires: rfc9421Options?.expires === true ? (currentTime.epochMilliseconds / 1e3 | 0) + 3600 : void 0,
 		nonce: rfc9421Options?.nonce,
 		tag: rfc9421Options?.tag
 	});
@@ -361,9 +353,7 @@ async function verifyRequest(request, options = {}) {
 * @since 2.1.0
 */
 async function verifyRequestDetailed(request, options = {}) {
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("http_signatures.verify", async (span) => {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("http_signatures.verify", async (span) => {
 		if (span.isRecording()) {
 			span.setAttribute(ATTR_HTTP_REQUEST_METHOD, request.method);
 			span.setAttribute(ATTR_URL_FULL, request.url);
@@ -558,8 +548,7 @@ async function verifyRequestDraft(request, span, { documentLoader, contextLoader
 	const message = headerNames.map((name) => `${name}: ` + (name === "(request-target)" ? `${request.method.toLowerCase()} ${new URL(request.url).pathname}` : name === "(created)" ? sigValues.created ?? "" : name === "(expires)" ? sigValues.expires ?? "" : name === "host" ? request.headers.get("host") ?? new URL(request.url).host : request.headers.get(name))).join("\n");
 	const sig = decodeBase64(signature);
 	span?.setAttribute("http_signatures.signature", encodeHex(sig));
-	const verified = await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, sig, new TextEncoder().encode(message));
-	if (!verified) {
+	if (!await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, sig, new TextEncoder().encode(message))) {
 		if (cached) {
 			logger.debug("Failed to verify with the cached key {keyId}; signature {signature} is invalid.  Retrying with the freshly fetched key...", {
 				keyId,
@@ -573,7 +562,7 @@ async function verifyRequestDraft(request, span, { documentLoader, contextLoader
 				currentTime,
 				keyCache: {
 					get: () => Promise.resolve(void 0),
-					set: async (keyId$1, key$1) => await keyCache?.set(keyId$1, key$1)
+					set: async (keyId, key) => await keyCache?.set(keyId, key)
 				}
 			});
 		}
@@ -735,9 +724,7 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 				failure = invalidSignatureResult(keyId);
 				continue;
 			}
-			const body = await request.arrayBuffer();
-			const digestValid = await verifyRfc9421ContentDigest(contentDigestHeader, body);
-			if (!digestValid) {
+			if (!await verifyRfc9421ContentDigest(contentDigestHeader, await request.arrayBuffer())) {
 				logger.debug("Failed to verify; Content-Digest verification failed.", { contentDigest: contentDigestHeader });
 				failure = invalidSignatureResult(keyId);
 				continue;
@@ -795,8 +782,7 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 		const signatureBaseBytes = new TextEncoder().encode(signatureBase);
 		span?.setAttribute("http_signatures.signature", encodeHex(sigBytes));
 		try {
-			const verified = await crypto.subtle.verify(algorithm, key.publicKey, sigBytes.slice(), signatureBaseBytes);
-			if (verified) return {
+			if (await crypto.subtle.verify(algorithm, key.publicKey, sigBytes.slice(), signatureBaseBytes)) return {
 				verified: true,
 				key,
 				signatureLabel: sigName
@@ -810,7 +796,7 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 					currentTime,
 					keyCache: {
 						get: () => Promise.resolve(void 0),
-						set: async (keyId$1, key$1) => await keyCache?.set(keyId$1, key$1)
+						set: async (keyId, key) => await keyCache?.set(keyId, key)
 					},
 					spec: "rfc9421"
 				});
@@ -887,8 +873,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 	});
 	if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 		if (redirected >= DEFAULT_MAX_REDIRECTION) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
-		const location = response.headers.get("Location");
-		const redirectRequest = createRedirectRequest(request, location, body);
+		const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
 		if (visited.has(redirectRequest.url)) throw new FetchError(request.url, `Redirect loop detected: ${redirectRequest.url}`);
 		return doubleKnockInternal(redirectRequest, identity, {
 			...options,
@@ -936,13 +921,10 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 					redirect: "manual",
 					signal
 				});
-				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
-					const location = response.headers.get("Location");
-					return doubleKnock(createRedirectRequest(request, location, body), identity, {
-						...options,
-						body
-					});
-				}
+				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) return doubleKnock(createRedirectRequest(request, response.headers.get("Location"), body), identity, {
+					...options,
+					body
+				});
 			}
 			if (fulfilled && response.status < 300) {
 				await specDeterminer?.rememberSpec(origin, "rfc9421");
@@ -969,8 +951,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 		});
 		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 			if (redirected >= DEFAULT_MAX_REDIRECTION) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
-			const location = response.headers.get("Location");
-			const redirectRequest = createRedirectRequest(request, location, body);
+			const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
 			if (visited.has(redirectRequest.url)) throw new FetchError(request.url, `Redirect loop detected: ${redirectRequest.url}`);
 			return doubleKnockInternal(redirectRequest, identity, {
 				...options,
@@ -1007,6 +988,5 @@ function timingSafeEqual(a, b) {
 	result |= lenA ^ lenB;
 	return result === 0;
 }
-
 //#endregion
-export { createRfc9421SignatureBase, doubleKnock, formatRfc9421Signature, formatRfc9421SignatureParameters, parseRfc9421Signature, parseRfc9421SignatureInput, signRequest, timingSafeEqual, verifyRequest, verifyRequestDetailed };
+export { parseRfc9421Signature as a, timingSafeEqual as c, formatRfc9421SignatureParameters as i, verifyRequest as l, doubleKnock as n, parseRfc9421SignatureInput as o, formatRfc9421Signature as r, signRequest as s, createRfc9421SignatureBase as t, verifyRequestDetailed as u };