fix

Author: tamaina

src/rfc9421/sign.base.test.ts

@@ -103,7 +103,7 @@ describe(RFC9421SignatureBaseFactory, () => {
 					...Object.entries(requestBase.headers),
 					...['x-test', 'value'],
 					...['x-test', 'value2'],
-					...['x-test', null],
+					...['X-Test', null],
 				].flat(2),
 			} satisfies RequestLike;
 			const factory = new RFC9421SignatureBaseFactory(

src/rfc9421/sign.ts

@@ -2,7 +2,7 @@
 // TODO
 
 import { canonicalizeHeaderValue, encodeArrayBufferToBase64, getValueByLc, lcObjectKey, getMap, correctHeaders } from "../utils";
-import type { IncomingRequest, MapLikeObj, OutgoingResponse, SFVParametersLike, SFVSignatureInputDictionary, SFVSignatureInputDictionaryForInput, HeadersLike, HeadersValueLike } from "../types";
+import type { IncomingRequest, MapLikeObj, OutgoingResponse, SFVParametersLike, SFVSignatureInputDictionary, SFVSignatureInputDictionaryForInput, HeadersLike, HeadersValueLikeArrayable } from "../types";
 import * as sh from "structured-headers";
 import { SFVHeaderTypeDictionary, knownSfvHeaderTypeDictionary } from "./const";
 
@@ -217,7 +217,7 @@ export class RFC9421SignatureBaseFactory<T extends IncomingRequest | OutgoingRes
 				throw new Error(`Invalid component: ${componentIdentifier} (multiple params are specified)`);
 			}
 
-			const rawValue: HeadersValueLike = (() => {
+			const rawValue: HeadersValueLikeArrayable = (() => {
 				if (isReq) {
 					if (isTr) {
 						if ('trailers' in this.request && this.request.trailers) {

src/types.ts

@@ -2,15 +2,16 @@ import type { IncomingMessage, ServerResponse } from "http";
 import type { Http2ServerRequest, Http2ServerResponse } from "http2";
 import type { webcrypto } from "node:crypto";
 
-export type HeadersValueLike = string | number | null | undefined | (string | number | null | undefined)[];
-export type HeadersLike = Record<string, HeadersValueLike>;
+export type HeadersValueLike = string | number | null | undefined;
+export type HeadersValueLikeArrayable = HeadersValueLike | HeadersValueLike[];
+export type HeadersLike = Record<string, HeadersValueLikeArrayable>;
 
 export type RequestLike = {
 	url: string;
 	method: string;
 	headers: HeadersLike
 	// https://nodejs.org/api/http2.html#requestrawheaders
-	rawHeaders?: (string | number | null | undefined)[];
+	rawHeaders?: HeadersValueLike[];
 	getHeaders?: () => HeadersLike;
 	body?: string;
 	trailers?: Record<string, string>;
@@ -26,7 +27,7 @@ export type ResponseLike = {
 	statusCode: number;
 	headers: HeadersLike;
 	// https://nodejs.org/api/http2.html#requestrawheaders
-	rawHeaders?: (string | number | null | undefined)[];
+	rawHeaders?: HeadersValueLike[];
 	getHeaders?: () => HeadersLike;
 	body?: string;
 	trailers?: Record<string, string>;

src/utils.ts

@@ -1,4 +1,4 @@
-import type { MapLikeObj, SignInfo, SignatureHashAlgorithmUpperSnake, HeadersLike, HeadersValueLike } from './types.js';
+import type { MapLikeObj, SignInfo, SignatureHashAlgorithmUpperSnake, HeadersLike, HeadersValueLike, HeadersValueLikeArrayable } from './types.js';
 import { ParsedAlgorithmIdentifier, getNistCurveFromOid, getPublicKeyAlgorithmNameFromOid } from './pem/spki.js';
 import type { webcrypto } from 'node:crypto';
 
@@ -17,7 +17,7 @@ export function removeObsoleteLineFolding(str: string): string {
 /**
  * RFC 9421 2.1 (If the correctly combined value is not directly available for a given field by an implementation, ...)
  */
-export function canonicalizeHeaderValue(value: HeadersValueLike): string {
+export function canonicalizeHeaderValue(value: HeadersValueLikeArrayable): string {
 	if (typeof value === 'number') return value.toString();
 	if (!value) return '';
 	if (typeof value === 'string') return removeObsoleteLineFolding(value).trim();
@@ -102,13 +102,13 @@ export function toStringOrToLc(src: string | number | undefined | null): string
  *	Convert rawHeaders to object
  *	rawHeaders: https://nodejs.org/api/http2.html#requestrawheaders
  */
-export function correctHeaders(src: (string | number | undefined | null)[]): Record<string, (string | number)[]> {
+export function correctHeaders(src: HeadersValueLike[]): Record<string, (string | number)[]> {
 	return src.reduce((dst, prop, i) => {
 		if (i % 2 === 0) {
 			if (typeof prop !== 'string') {
 				throw new Error(`Invalid header key type '${typeof prop}' of ${prop}`);
 			}
-			if (prop in dst) return dst;
+			if (prop.toLowerCase() in dst) return dst;
 			dst[prop.toLowerCase()] = [];
 		} else {
 			dst[toStringOrToLc(src[i - 1])].push(prop == null ? '' : prop.toString());