@fedify/fedify 1.7.12 → 1.7.14

package/dist/sig/http.test.js

@@ -3,42 +3,38 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { assertEquals } from "../assert_equals-B44MxcIj.js";
-import { assert } from "../assert-LOEeCUK5.js";
-import "../assert_instance_of-XtuFevV_.js";
-import "../docloader-bgBm1Hd1.js";
-import "../url-C2xuoQD1.js";
-import "../multibase-CnLHszip.js";
-import { exportSpki } from "../vocab-DFlq4Wa6.js";
-import "../langstr-DbWheeIS.js";
-import "../lookup-DL62q3Xh.js";
-import "../type-CFuiGLz9.js";
-import "../actor-TYqJGdVq.js";
-import { exportJwk } from "../key-KVhaUM92.js";
-import { createRfc9421SignatureBase, doubleKnock, formatRfc9421Signature, formatRfc9421SignatureParameters, parseRfc9421Signature, parseRfc9421SignatureInput, signRequest, timingSafeEqual, verifyRequest } from "../http-D2DkwsjA.js";
-import { test } from "../testing-DLyvtiiW.js";
-import { assertExists, assertStringIncludes } from "../std__assert-o_r9vqm1.js";
-import { assertFalse } from "../assert_rejects-DWQ4jaf9.js";
-import "../assert_is_error-BTlryvT0.js";
-import "../assert_not_equals-C685gKx6.js";
-import { assertThrows } from "../assert_throws-YetpVSc-.js";
-import { mockDocumentLoader } from "../docloader-09nVWLAZ.js";
-import { rsaPrivateKey2, rsaPublicKey1, rsaPublicKey2, rsaPublicKey5 } from "../keys-C4XQHW5_.js";
-import { esm_default } from "../esm-DO9PrujO.js";
+import "../chunk-DvTpRkcT.js";
+import { t as assertEquals } from "../assert_equals-Dy0MG_Zw.js";
+import { t as assert } from "../assert-C-mZuSQl.js";
+import "../docloader-sGz4vcrK.js";
+import "../url-BdNvnK9P.js";
+import "../multibase-DBcKTV2a.js";
+import { A as exportSpki } from "../vocab-DCHRuBGF.js";
+import "../langstr-pFHBDU4y.js";
+import "../lookup-Bq8vhIG4.js";
+import "../actor-y7shp0CR.js";
+import { t as exportJwk } from "../key-bMrDyA2T.js";
+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 } from "../http-BhES0Sg9.js";
+import { t as test } from "../testing-qaAD4B0t.js";
+import { a as assertExists, t as assertStringIncludes } from "../std__assert-BdP_WkD-.js";
+import { n as assertFalse } from "../assert_rejects-Bkh5lA1a.js";
+import "../assert_is_error-CIYFACrT.js";
+import { t as assertThrows } from "../assert_throws-CmpfkWEM.js";
+import { t as mockDocumentLoader } from "../docloader-BDSHZfTJ.js";
+import { i as rsaPrivateKey2, l as rsaPublicKey5, o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-DK4k1R8e.js";
+import { t as esm_default } from "../esm-BRXvTSrx.js";
 import { encodeBase64 } from "byte-encodings/base64";
 
 //#region sig/http.test.ts
 test("signRequest() [draft-cavage]", async () => {
-	const request = new Request("https://example.com/", {
+	assertEquals(await verifyRequest(await signRequest(new Request("https://example.com/", {
 		method: "POST",
 		body: "Hello, world!",
 		headers: {
 			"Content-Type": "text/plain; charset=utf-8",
 			Accept: "text/plain"
 		}
-	});
-	const signed = await signRequest(request, rsaPrivateKey2, new URL("https://example.com/key2"));
-	assertEquals(await verifyRequest(signed, {
+	}), rsaPrivateKey2, new URL("https://example.com/key2")), {
 		contextLoader: mockDocumentLoader,
 		documentLoader: mockDocumentLoader
 	}), rsaPublicKey2);
@@ -153,7 +149,7 @@ test("verifyRequest() [draft-cavage]", async () => {
 		currentTime: Temporal.Instant.from("2025-01-01T00:00:00.0000Z"),
 		timeWindow: false
 	}), rsaPublicKey1);
-	const request2 = new Request("https://c27a97f98d5f.ngrok.app/i/inbox", {
+	assert(await verifyRequest(new Request("https://c27a97f98d5f.ngrok.app/i/inbox", {
 		method: "POST",
 		body: "{\"@context\":[\"https://www.w3.org/ns/activitystreams\",\"https://w3id.org/security/v1\"],\"actor\":\"https://oeee.cafe/ap/users/3609fd4e-d51d-4db8-9f04-4189815864dd\",\"object\":{\"actor\":\"https://c27a97f98d5f.ngrok.app/i\",\"object\":\"https://oeee.cafe/ap/users/3609fd4e-d51d-4db8-9f04-4189815864dd\",\"type\":\"Follow\",\"id\":\"https://c27a97f98d5f.ngrok.app/i#follows/https://oeee.cafe/ap/users/3609fd4e-d51d-4db8-9f04-4189815864dd\"},\"type\":\"Accept\",\"id\":\"https://oeee.cafe/objects/0fc2608f-5660-4b91-b8c7-63c0c2ac2e20\"}",
 		headers: {
@@ -163,12 +159,10 @@ test("verifyRequest() [draft-cavage]", async () => {
 			Digest: "SHA-256=YZyjeVQW5GwliJowASkteBJhFBTq3eQk/AMqRETc//A=",
 			Signature: "keyId=\"https://oeee.cafe/ap/users/3609fd4e-d51d-4db8-9f04-4189815864dd#main-key\",algorithm=\"hs2019\",created=\"1756126694\",expires=\"1756130294\",headers=\"(request-target) (created) (expires) content-type date digest host\",signature=\"XFb0jl2uMhE7RhbneE9sK9Zls2qZec8iy6+9O8UgDQeBGJThORFLjXKlps4QO1WAf1YSVB/i5aV6yF+h73Lm3ZiuAJDx1h+00iLsxoYuIw1CZvF0V2jELoo3sQ2/ZzqeoO6H5TbK7tKnU+ulFAPTuJgjIvPwYl11OMRouVS34NiaHP9Yx9pU813TLv37thG/hUKanyq8kk0IJWtDWteY/zxDvzoe7VOkBXVBHslMyrNAI/5JGulVQAQp/E61dJAhTHHIyGxkc/7iutWFZuqFXIiPJ9KR2OuKDj/B32hEzlsf5xH/CjqOJPIg1qMK8FzDiALCq6zjiKIBEnW8HQc/hQ==\""
 		}
-	});
-	const options2 = {
+	}), {
 		...options,
 		currentTime: Temporal.Instant.from("2025-08-25T12:58:14Z")
-	};
-	assert(await verifyRequest(request2, options2) != null);
+	}) != null);
 });
 test("signRequest() and verifyRequest() [rfc9421] implementation", async () => {
 	const currentTimestamp = 1709626184;
@@ -209,9 +203,7 @@ test("signRequest() and verifyRequest() [rfc9421] implementation", async () => {
 	const contentDigest = signed.headers.get("Content-Digest");
 	assertExists(contentDigest);
 	assert(contentDigest.startsWith("sha-256=:"), "Content-Digest should use RFC 9421 format");
-	const expectedDigest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(requestBody));
-	const expectedDigestBase64 = encodeBase64(expectedDigest);
-	assertEquals(contentDigest, `sha-256=:${expectedDigestBase64}:`, "Content-Digest should have correct value");
+	assertEquals(contentDigest, `sha-256=:${encodeBase64(await crypto.subtle.digest("SHA-256", new TextEncoder().encode(requestBody)))}:`, "Content-Digest should have correct value");
 	const signature = signed.headers.get("Signature");
 	assertExists(signature);
 	const sigFormat = /^sig1=:([A-Za-z0-9+/]+=*):/;
@@ -232,25 +224,22 @@ test("signRequest() and verifyRequest() [rfc9421] implementation", async () => {
 	assertEquals(parsedSig.sig1.byteLength > 0, true, "Signature value should be a non-empty Uint8Array");
 	const verifyHeaders = new Headers();
 	for (const [name, value] of signed.headers.entries()) if (name !== "Signature" && name !== "Signature-Input") verifyHeaders.set(name, value);
-	const reconstructedRequest = new Request(request.url, {
+	const reconstructedBase = createRfc9421SignatureBase(new Request(request.url, {
 		method: request.method,
 		headers: verifyHeaders
-	});
-	const reconstructedBase = createRfc9421SignatureBase(reconstructedRequest, parsedInput.sig1.components, parsedInput.sig1.parameters);
+	}), parsedInput.sig1.components, parsedInput.sig1.parameters);
 	const signatureBytes = new Uint8Array(parsedSig.sig1);
-	const signatureVerifies = await crypto.subtle.verify("RSASSA-PKCS1-v1_5", rsaPublicKey2.publicKey, signatureBytes, new TextEncoder().encode(reconstructedBase));
-	assert(signatureVerifies, "Manual verification of signature should succeed");
+	assert(await crypto.subtle.verify("RSASSA-PKCS1-v1_5", rsaPublicKey2.publicKey, signatureBytes, new TextEncoder().encode(reconstructedBase)), "Manual verification of signature should succeed");
 });
 test("createRfc9421SignatureBase()", () => {
-	const request = new Request("https://example.com/path?query=value", {
+	assertEquals(createRfc9421SignatureBase(new Request("https://example.com/path?query=value", {
 		method: "POST",
 		headers: {
 			Host: "example.com",
 			Date: "Tue, 05 Mar 2024 07:49:44 GMT",
 			"Content-Type": "text/plain"
 		}
-	});
-	const signatureBase = createRfc9421SignatureBase(request, [
+	}), [
 		"@method",
 		"@target-uri",
 		"host",
@@ -259,31 +248,27 @@ test("createRfc9421SignatureBase()", () => {
 		algorithm: "rsa-v1_5-sha256",
 		keyId: new URL("https://example.com/key"),
 		created: 1709626184
-	}));
-	const expected = [
+	})), [
 		`"@method": POST`,
 		`"@target-uri": https://example.com/path?query=value`,
 		`"host": example.com`,
 		`"date": Tue, 05 Mar 2024 07:49:44 GMT`,
 		`"@signature-params": ("@method" "@target-uri" "host" "date");alg="rsa-v1_5-sha256";keyid="https://example.com/key";created=1709626184`
-	].join("\n");
-	assertEquals(signatureBase, expected);
+	].join("\n"));
 });
 test("formatRfc9421Signature()", () => {
-	const signature = new Uint8Array([
+	const [signatureInput, signatureHeader] = formatRfc9421Signature(new Uint8Array([
 		1,
 		2,
 		3,
 		4
-	]);
-	const keyId = new URL("https://example.com/key");
-	const [signatureInput, signatureHeader] = formatRfc9421Signature(signature, [
+	]), [
 		"@method",
 		"@target-uri",
 		"host"
 	], formatRfc9421SignatureParameters({
 		algorithm: "rsa-v1_5-sha256",
-		keyId,
+		keyId: new URL("https://example.com/key"),
 		created: 1709626184
 	}));
 	assertEquals(signatureInput, `sig1=("@method" "@target-uri" "host");alg="rsa-v1_5-sha256";keyid="https://example.com/key";created=1709626184`);
@@ -312,37 +297,33 @@ test("parseRfc9421Signature()", () => {
 	assertEquals(sig1Bytes[1], 2);
 	assertEquals(sig1Bytes[2], 3);
 	assertEquals(sig1Bytes[3], 4);
-	const sig2Text = new TextDecoder().decode(parsed.sig2);
-	assertEquals(sig2Text, "foobar");
+	assertEquals(new TextDecoder().decode(parsed.sig2), "foobar");
 });
 test("verifyRequest() [rfc9421] successful GET verification", async () => {
 	const currentTimestamp = 1709626184;
 	const currentTime = Temporal.Instant.from("2024-03-05T08:09:44Z");
-	const validRequest = new Request("https://example.com/api/resource", {
+	assertEquals(await verifyRequest(await signRequest(new Request("https://example.com/api/resource", {
 		method: "GET",
 		headers: {
 			"Accept": "application/json",
 			"Host": "example.com",
 			"Date": "Tue, 05 Mar 2024 07:49:44 GMT"
 		}
-	});
-	const signedRequest = await signRequest(validRequest, rsaPrivateKey2, new URL("https://example.com/key2"), {
+	}), rsaPrivateKey2, new URL("https://example.com/key2"), {
 		spec: "rfc9421",
 		currentTime
-	});
-	const verifiedKey = await verifyRequest(signedRequest, {
+	}), {
 		contextLoader: mockDocumentLoader,
 		documentLoader: mockDocumentLoader,
 		spec: "rfc9421",
 		currentTime: Temporal.Instant.from(`${(/* @__PURE__ */ new Date(currentTimestamp * 1e3)).toISOString()}`)
-	});
-	assertEquals(verifiedKey, rsaPublicKey2, "Valid signature should verify to the correct public key");
+	}), rsaPublicKey2, "Valid signature should verify to the correct public key");
 });
 test("verifyRequest() [rfc9421] manual POST verification", async () => {
 	const currentTimestamp = 1709626184;
 	const currentTime = Temporal.Instant.from("2024-03-05T08:09:44Z");
 	const postBody = "Test content for signature verification";
-	const postRequest = new Request("https://example.com/api/resource", {
+	const signedPostRequest = await signRequest(new Request("https://example.com/api/resource", {
 		method: "POST",
 		body: postBody,
 		headers: {
@@ -351,8 +332,7 @@ test("verifyRequest() [rfc9421] manual POST verification", async () => {
 			"Host": "example.com",
 			"Date": "Tue, 05 Mar 2024 07:49:44 GMT"
 		}
-	});
-	const signedPostRequest = await signRequest(postRequest, rsaPrivateKey2, new URL("https://example.com/key2"), {
+	}), rsaPrivateKey2, new URL("https://example.com/key2"), {
 		spec: "rfc9421",
 		currentTime
 	});
@@ -374,61 +354,54 @@ test("verifyRequest() [rfc9421] manual POST verification", async () => {
 	assertExists(parsedSignature.sig1, "Should have a valid signature value");
 	assertEquals(parsedInput.sig1.keyId, "https://example.com/key2", "Signature should have the correct key ID");
 	assertEquals(parsedInput.sig1.created, currentTimestamp, "Signature should have the correct timestamp");
-	const manualRequest = new Request("https://example.com/api/resource", {
+	const signatureBase = createRfc9421SignatureBase(new Request("https://example.com/api/resource", {
 		method: "POST",
 		body: postBody,
 		headers: new Headers(signedPostRequest.headers)
-	});
-	const signatureBase = createRfc9421SignatureBase(manualRequest, parsedInput.sig1.components, parsedInput.sig1.parameters);
-	const signatureVerified = await crypto.subtle.verify("RSASSA-PKCS1-v1_5", rsaPublicKey2.publicKey, parsedSignature.sig1.slice(), new TextEncoder().encode(signatureBase));
-	assert(signatureVerified, "Manual verification of POST signature should succeed");
+	}), parsedInput.sig1.components, parsedInput.sig1.parameters);
+	assert(await crypto.subtle.verify("RSASSA-PKCS1-v1_5", rsaPublicKey2.publicKey, parsedSignature.sig1.slice(), new TextEncoder().encode(signatureBase)), "Manual verification of POST signature should succeed");
 });
 test("verifyRequest() [rfc9421] error cases and edge cases", async () => {
 	const currentTimestamp = 1709626184;
 	const currentTime = Temporal.Instant.from("2024-03-05T08:09:44Z");
-	const validRequest = new Request("https://example.com/api/resource", {
+	const signedRequest = await signRequest(new Request("https://example.com/api/resource", {
 		method: "GET",
 		headers: {
 			"Accept": "application/json",
 			"Host": "example.com",
 			"Date": "Tue, 05 Mar 2024 07:49:44 GMT"
 		}
-	});
-	const signedRequest = await signRequest(validRequest, rsaPrivateKey2, new URL("https://example.com/key2"), {
+	}), rsaPrivateKey2, new URL("https://example.com/key2"), {
 		spec: "rfc9421",
 		currentTime
 	});
 	const validSignatureInput = signedRequest.headers.get("Signature-Input") || "";
 	const validSignature = signedRequest.headers.get("Signature") || "";
-	const missingInputHeader = new Request("https://example.com/api/resource", {
+	assertEquals(await verifyRequest(new Request("https://example.com/api/resource", {
 		method: "GET",
 		headers: new Headers({
 			"Accept": "application/json",
 			"Host": "example.com",
 			"Signature": validSignature
 		})
-	});
-	const missingInputResult = await verifyRequest(missingInputHeader, {
+	}), {
 		contextLoader: mockDocumentLoader,
 		documentLoader: mockDocumentLoader,
 		spec: "rfc9421"
-	});
-	assertEquals(missingInputResult, null, "Should fail verification when Signature-Input header is missing");
-	const missingSignatureHeader = new Request("https://example.com/api/resource", {
+	}), null, "Should fail verification when Signature-Input header is missing");
+	assertEquals(await verifyRequest(new Request("https://example.com/api/resource", {
 		method: "GET",
 		headers: new Headers({
 			"Accept": "application/json",
 			"Host": "example.com",
 			"Signature-Input": validSignatureInput
 		})
-	});
-	const missingSignatureResult = await verifyRequest(missingSignatureHeader, {
+	}), {
 		contextLoader: mockDocumentLoader,
 		documentLoader: mockDocumentLoader,
 		spec: "rfc9421"
-	});
-	assertEquals(missingSignatureResult, null, "Should fail verification when Signature header is missing");
-	const tamperedRequest = new Request("https://example.com/api/resource", {
+	}), null, "Should fail verification when Signature header is missing");
+	assertEquals(await verifyRequest(new Request("https://example.com/api/resource", {
 		method: "GET",
 		headers: new Headers({
 			"Accept": "application/json",
@@ -437,14 +410,12 @@ test("verifyRequest() [rfc9421] error cases and edge cases", async () => {
 			"Signature-Input": validSignatureInput,
 			"Signature": "sig1=:AAAAAA==:"
 		})
-	});
-	const tamperedResult = await verifyRequest(tamperedRequest, {
+	}), {
 		contextLoader: mockDocumentLoader,
 		documentLoader: mockDocumentLoader,
 		spec: "rfc9421"
-	});
-	assertEquals(tamperedResult, null, "Should fail verification when signature is tampered");
-	const expiredRequest = new Request("https://example.com/api/resource", {
+	}), null, "Should fail verification when signature is tampered");
+	assertEquals(await verifyRequest(new Request("https://example.com/api/resource", {
 		method: "GET",
 		headers: new Headers({
 			"Accept": "application/json",
@@ -453,16 +424,14 @@ test("verifyRequest() [rfc9421] error cases and edge cases", async () => {
 			"Signature-Input": validSignatureInput,
 			"Signature": validSignature
 		})
-	});
-	const expiredResult = await verifyRequest(expiredRequest, {
+	}), {
 		contextLoader: mockDocumentLoader,
 		documentLoader: mockDocumentLoader,
 		spec: "rfc9421",
 		currentTime: Temporal.Instant.from(`${(/* @__PURE__ */ new Date((currentTimestamp + 2592e3) * 1e3)).toISOString()}`),
 		timeWindow: { hours: 1 }
-	});
-	assertEquals(expiredResult, null, "Should fail verification when signature timestamp is too old");
-	const futureRequest = new Request("https://example.com/api/resource", {
+	}), null, "Should fail verification when signature timestamp is too old");
+	assertEquals(await verifyRequest(new Request("https://example.com/api/resource", {
 		method: "GET",
 		headers: new Headers({
 			"Accept": "application/json",
@@ -471,16 +440,14 @@ test("verifyRequest() [rfc9421] error cases and edge cases", async () => {
 			"Signature-Input": validSignatureInput,
 			"Signature": validSignature
 		})
-	});
-	const futureResult = await verifyRequest(futureRequest, {
+	}), {
 		contextLoader: mockDocumentLoader,
 		documentLoader: mockDocumentLoader,
 		spec: "rfc9421",
 		currentTime: Temporal.Instant.from(`${(/* @__PURE__ */ new Date((currentTimestamp - 2592e3) * 1e3)).toISOString()}`),
 		timeWindow: { hours: 1 }
-	});
-	assertEquals(futureResult, null, "Should fail verification when signature timestamp is in the future");
-	const timeCheckRequest = new Request("https://example.com/api/resource", {
+	}), null, "Should fail verification when signature timestamp is in the future");
+	assertEquals(await verifyRequest(new Request("https://example.com/api/resource", {
 		method: "GET",
 		headers: new Headers({
 			"Accept": "application/json",
@@ -489,16 +456,14 @@ test("verifyRequest() [rfc9421] error cases and edge cases", async () => {
 			"Signature-Input": validSignatureInput,
 			"Signature": validSignature
 		})
-	});
-	const timeDisabledResult = await verifyRequest(timeCheckRequest, {
+	}), {
 		contextLoader: mockDocumentLoader,
 		documentLoader: mockDocumentLoader,
 		spec: "rfc9421",
 		currentTime: Temporal.Instant.from(`${(/* @__PURE__ */ new Date((currentTimestamp + 31536e3) * 1e3)).toISOString()}`),
 		timeWindow: false
-	});
-	assertEquals(timeDisabledResult, rsaPublicKey2, "Should verify signature when time checking is disabled");
-	const postRequest = new Request("https://example.com/api/resource", {
+	}), rsaPublicKey2, "Should verify signature when time checking is disabled");
+	const freshSignedPostRequest = await signRequest(new Request("https://example.com/api/resource", {
 		method: "POST",
 		body: "Test content for signature verification",
 		headers: {
@@ -507,15 +472,14 @@ test("verifyRequest() [rfc9421] error cases and edge cases", async () => {
 			"Host": "example.com",
 			"Date": "Tue, 05 Mar 2024 07:49:44 GMT"
 		}
-	});
-	const freshSignedPostRequest = await signRequest(postRequest, rsaPrivateKey2, new URL("https://example.com/key2"), {
+	}), rsaPrivateKey2, new URL("https://example.com/key2"), {
 		spec: "rfc9421",
 		currentTime
 	});
 	const postSignatureInput = freshSignedPostRequest.headers.get("Signature-Input") || "";
 	const postSignature = freshSignedPostRequest.headers.get("Signature") || "";
 	const postContentDigest = freshSignedPostRequest.headers.get("Content-Digest") || "";
-	const tamperDigestRequest = new Request("https://example.com/api/resource", {
+	assertEquals(await verifyRequest(new Request("https://example.com/api/resource", {
 		method: "POST",
 		body: "This content won't match the digest",
 		headers: new Headers({
@@ -526,22 +490,19 @@ test("verifyRequest() [rfc9421] error cases and edge cases", async () => {
 			"Signature": postSignature,
 			"Content-Digest": postContentDigest
 		})
-	});
-	const tamperDigestResult = await verifyRequest(tamperDigestRequest, {
+	}), {
 		contextLoader: mockDocumentLoader,
 		documentLoader: mockDocumentLoader,
 		spec: "rfc9421",
 		currentTime: Temporal.Instant.from(`${(/* @__PURE__ */ new Date(currentTimestamp * 1e3)).toISOString()}`)
-	});
-	assertEquals(tamperDigestResult, null, "Should fail verification with invalid Content-Digest");
+	}), null, "Should fail verification with invalid Content-Digest");
 	const testRequest = new Request("https://example.com/", { headers: new Headers({
 		"Date": "Tue, 05 Mar 2024 07:49:44 GMT",
 		"Host": "example.com",
 		"Signature-Input": `sig1=("@method" "@target-uri" "host" "date");keyid="https://example.com/key";alg="rsa-v1_5-sha256";created=1709626184`,
 		"Signature": `sig1=:YXNkZmprc2RmaGprc2RoZmprc2hkZmtqaHNkZg==:`
 	}) });
-	const signatureInput = testRequest.headers.get("Signature-Input") || "";
-	const parsedInput = parseRfc9421SignatureInput(signatureInput);
+	const parsedInput = parseRfc9421SignatureInput(testRequest.headers.get("Signature-Input") || "");
 	assertExists(parsedInput.sig1);
 	assertEquals(parsedInput.sig1.keyId, "https://example.com/key");
 	assertEquals(parsedInput.sig1.alg, "rsa-v1_5-sha256");
@@ -552,8 +513,7 @@ test("verifyRequest() [rfc9421] error cases and edge cases", async () => {
 		"host",
 		"date"
 	]);
-	const signature = testRequest.headers.get("Signature") || "";
-	const parsedSig = parseRfc9421Signature(signature);
+	const parsedSig = parseRfc9421Signature(testRequest.headers.get("Signature") || "");
 	assertExists(parsedSig.sig1);
 	assert(new TextDecoder().decode(parsedSig.sig1).length > 0, "Signature base64 should decode to non-empty string");
 	const complexParsedInput = parseRfc9421SignatureInput("sig1=(\"@method\" \"@target-uri\" \"host\" \"content-type\" \"value with \\\"quotes\\\" and spaces\");keyid=\"https://example.com/key with spaces\";alg=\"rsa-v1_5-sha256\";created=1709626184");
@@ -581,7 +541,7 @@ test("verifyRequest() [rfc9421] error cases and edge cases", async () => {
 	assertEquals(Object.keys(parsedInvalidSig).length, 0, "Should handle invalid Signature format");
 	const parsedInvalidBase64 = parseRfc9421Signature("sig1=:!@#$%%^&*():");
 	assertEquals(Object.keys(parsedInvalidBase64).length, 0, "Should handle invalid base64 in signature");
-	const mixedRequest = new Request("https://example.com/api/resource", {
+	assertEquals(await verifyRequest(new Request("https://example.com/api/resource", {
 		method: "GET",
 		headers: new Headers({
 			"Accept": "application/json",
@@ -590,14 +550,12 @@ test("verifyRequest() [rfc9421] error cases and edge cases", async () => {
 			"Signature-Input": `${validSignatureInput},sig2=("@method" "@target-uri" "host" "date");keyid="https://example.com/invalid-key";alg="rsa-v1_5-sha256";created=${currentTimestamp}`,
 			"Signature": `${validSignature},sig2=:AAAAAA==:`
 		})
-	});
-	const mixedResult = await verifyRequest(mixedRequest, {
+	}), {
 		contextLoader: mockDocumentLoader,
 		documentLoader: mockDocumentLoader,
 		spec: "rfc9421",
 		currentTime: Temporal.Instant.from(`${(/* @__PURE__ */ new Date(currentTimestamp * 1e3)).toISOString()}`)
-	});
-	assertEquals(mixedResult, rsaPublicKey2, "Should verify when at least one signature is valid");
+	}), rsaPublicKey2, "Should verify when at least one signature is valid");
 });
 test("verifyRequest() [rfc9421] test vector from Mastodon", async () => {
 	const signedRequest = new Request("https://www.example.com/activitypub/success", {
@@ -660,14 +618,13 @@ test("doubleKnock() function with successful first attempt", async () => {
 	const logFunction = (req) => {
 		loggedRequest = req;
 	};
-	const response = await doubleKnock(request, {
+	assertEquals((await doubleKnock(request, {
 		keyId: rsaPublicKey2.id,
 		privateKey: rsaPrivateKey2
 	}, {
 		specDeterminer,
 		log: logFunction
-	});
-	assertEquals(response.status, 202, "Response status should be 202 Accepted");
+	})).status, 202, "Response status should be 202 Accepted");
 	assertEquals(requestCount, 1, "Only one request should have been made");
 	assertEquals(firstRequestSpec, "rfc9421", "First attempt should use RFC 9421");
 	assertEquals(specDeterminer.usedSpec, "rfc9421", "Spec should be remembered");
@@ -708,11 +665,10 @@ test("doubleKnock() function with fallback to draft-cavage", async () => {
 			this.rememberedSpec = spec;
 		}
 	};
-	const response = await doubleKnock(request, {
+	assertEquals((await doubleKnock(request, {
 		keyId: rsaPublicKey2.id,
 		privateKey: rsaPrivateKey2
-	}, { specDeterminer });
-	assertEquals(response.status, 202, "Response status should be 202 Accepted");
+	}, { specDeterminer })).status, 202, "Response status should be 202 Accepted");
 	assertEquals(requestCount, 2, "Two requests should have been made");
 	assertEquals(firstSpec, "rfc9421", "First attempt should use RFC 9421");
 	assertEquals(secondSpec, "draft-cavage-http-signatures-12", "Second attempt should use draft-cavage");
@@ -734,16 +690,14 @@ test("doubleKnock() function with redirect handling", async () => {
 		responseCodes.push(202);
 		return new Response("", { status: 202 });
 	});
-	const request = new Request("https://example.com/redirect-endpoint", {
+	assertEquals((await doubleKnock(new Request("https://example.com/redirect-endpoint", {
 		method: "POST",
 		body: "Test message that will be redirected",
 		headers: { "Content-Type": "text/plain" }
-	});
-	const response = await doubleKnock(request, {
+	}), {
 		keyId: rsaPublicKey2.id,
 		privateKey: rsaPrivateKey2
-	});
-	assertEquals(response.status, 202, "Final response status should be 202 Accepted");
+	})).status, 202, "Final response status should be 202 Accepted");
 	assertEquals(requestedUrls.length, 2, "Two URLs should have been requested");
 	assertEquals(requestedUrls[0], "https://example.com/redirect-endpoint", "First request should be to redirect-endpoint");
 	assertEquals(requestedUrls[1], "https://example.com/final-endpoint", "Second request should be to final-endpoint");
@@ -762,16 +716,14 @@ test("doubleKnock() function with both specs rejected", async () => {
 		else attempts.push("unknown");
 		return new Response("Unauthorized", { status: 401 });
 	});
-	const request = new Request("https://example.com/inbox-rejects-all", {
+	assertEquals((await doubleKnock(new Request("https://example.com/inbox-rejects-all", {
 		method: "POST",
 		body: "Test message that will be rejected regardless of signature format",
 		headers: { "Content-Type": "text/plain" }
-	});
-	const response = await doubleKnock(request, {
+	}), {
 		keyId: rsaPublicKey2.id,
 		privateKey: rsaPrivateKey2
-	});
-	assertEquals(response.status, 401, "Final response status should be 401 Unauthorized");
+	})).status, 401, "Final response status should be 401 Unauthorized");
 	assertEquals(requestCount, 2, "Two requests should have been made");
 	assertEquals(attempts.length, 2, "Two signature attempts should have been made");
 	assertEquals(attempts[0], "rfc9421", "First attempt should use RFC 9421");
@@ -795,16 +747,14 @@ test("doubleKnock() function with specDeterminer choosing draft-cavage first", a
 		},
 		rememberSpec(_origin, _spec) {}
 	};
-	const request = new Request("https://example.com/inbox-accepts-any", {
+	assertEquals((await doubleKnock(new Request("https://example.com/inbox-accepts-any", {
 		method: "POST",
 		body: "Test message with draft-cavage preference",
 		headers: { "Content-Type": "text/plain" }
-	});
-	const response = await doubleKnock(request, {
+	}), {
 		keyId: rsaPublicKey2.id,
 		privateKey: rsaPrivateKey2
-	}, { specDeterminer });
-	assertEquals(response.status, 202, "Response status should be 202 Accepted");
+	}, { specDeterminer })).status, 202, "Response status should be 202 Accepted");
 	assertEquals(requestCount, 1, "Only one request should have been made");
 	assertEquals(firstSpec, "draft-cavage", "First attempt should use draft-cavage");
 	esm_default.hardReset();
@@ -872,25 +822,21 @@ test("doubleKnock() async specDeterminer test", async () => {
 			await new Promise((resolve) => setTimeout(resolve, 10));
 		}
 	};
-	const request = new Request("https://example.com/inbox-async-determiner", {
+	assertEquals((await doubleKnock(new Request("https://example.com/inbox-async-determiner", {
 		method: "POST",
 		body: "Test message with async spec determiner",
 		headers: { "Content-Type": "text/plain" }
-	});
-	const response = await doubleKnock(request, {
+	}), {
 		keyId: rsaPublicKey2.id,
 		privateKey: rsaPrivateKey2
-	}, { specDeterminer });
-	assertEquals(response.status, 202, "Response status should be 202 Accepted");
+	}, { specDeterminer })).status, 202, "Response status should be 202 Accepted");
 	assertEquals(requestCount, 1, "Only one request should have been made");
 	assertEquals(specUsed, "draft-cavage-http-signatures-12", "Should use spec from async determiner");
 	esm_default.hardReset();
 });
 test("timingSafeEqual()", async (t) => {
 	await t.step("should return true for equal empty arrays", () => {
-		const a = new Uint8Array([]);
-		const b = new Uint8Array([]);
-		assert(timingSafeEqual(a, b));
+		assert(timingSafeEqual(new Uint8Array([]), new Uint8Array([])));
 	});
 	await t.step("should return true for equal non-empty arrays", async (t2) => {
 		const testCases = [
@@ -1097,14 +1043,10 @@ test("timingSafeEqual()", async (t) => {
 	});
 	await t.step("should correctly handle comparisons involving padding bytes", async (t2) => {
 		await t2.step("a=[1], b=[1,0] (b longer with trailing zero)", () => {
-			const a1 = new Uint8Array([1]);
-			const b1 = new Uint8Array([1, 0]);
-			assertFalse(timingSafeEqual(a1, b1));
+			assertFalse(timingSafeEqual(new Uint8Array([1]), new Uint8Array([1, 0])));
 		});
 		await t2.step("a=[1,0], b=[1] (a longer with trailing zero)", () => {
-			const a2 = new Uint8Array([1, 0]);
-			const b2 = new Uint8Array([1]);
-			assertFalse(timingSafeEqual(a2, b2));
+			assertFalse(timingSafeEqual(new Uint8Array([1, 0]), new Uint8Array([1])));
 		});
 	});
 });
@@ -1121,20 +1063,18 @@ test("signRequest() [rfc9421] error handling for invalid signature base creation
 	assertExists(signedRequest.headers.get("Signature"));
 });
 test("verifyRequest() [rfc9421] error handling for invalid signature base creation", async () => {
-	const request = new Request("https://example.com/test", {
+	assertEquals(await verifyRequest(new Request("https://example.com/test", {
 		method: "GET",
 		headers: {
 			"Accept": "application/json",
 			"Signature-Input": "sig1=(\"@unsupported\");alg=\"rsa-pss-sha256\";keyid=\"https://example.com/key2\";created=1234567890",
 			"Signature": "sig1=:invalid_signature_data:"
 		}
-	});
-	const result = await verifyRequest(request, {
+	}), {
 		spec: "rfc9421",
 		documentLoader: mockDocumentLoader,
 		contextLoader: mockDocumentLoader
-	});
-	assertEquals(result, null, "Verification should fail gracefully for malformed signature inputs");
+	}), null, "Verification should fail gracefully for malformed signature inputs");
 });
 test("doubleKnock() regression test for TypeError: unusable bug #294", async () => {
 	esm_default.spyGlobal();
@@ -1148,16 +1088,14 @@ test("doubleKnock() regression test for TypeError: unusable bug #294", async ()
 	esm_default.post("https://example.com/final-destination", () => {
 		return new Response("Success", { status: 200 });
 	});
-	const request = new Request("https://example.com/inbox-retry-redirect", {
+	assertEquals((await doubleKnock(new Request("https://example.com/inbox-retry-redirect", {
 		method: "POST",
 		body: "Test activity content",
 		headers: { "Content-Type": "application/activity+json" }
-	});
-	const response = await doubleKnock(request, {
+	}), {
 		keyId: rsaPublicKey2.id,
 		privateKey: rsaPrivateKey2
-	});
-	assertEquals(response.status, 200);
+	})).status, 200);
 	assertEquals(requestCount, 2, "Should make 2 requests before redirect");
 	esm_default.hardReset();
 });
@@ -1172,16 +1110,14 @@ test("doubleKnock() regression test for redirect handling bug", async () => {
 	esm_default.post("https://example.com/final-destination", () => {
 		return new Response("Success", { status: 200 });
 	});
-	const request = new Request("https://example.com/inbox-retry-redirect", {
+	assertEquals((await doubleKnock(new Request("https://example.com/inbox-retry-redirect", {
 		method: "POST",
 		body: "Test activity content",
 		headers: { "Content-Type": "application/activity+json" }
-	});
-	const response = await doubleKnock(request, {
+	}), {
 		keyId: rsaPublicKey2.id,
 		privateKey: rsaPrivateKey2
-	});
-	assertEquals(response.status, 200);
+	})).status, 200);
 	esm_default.hardReset();
 });