wip

Author: tamaina

dist/index.cjs

@@ -475,7 +475,7 @@ function correctHeaders(src) {
       if (typeof prop !== "string") {
         throw new Error(`Invalid header key type '${typeof prop}' of ${prop}`);
       }
-      if (prop in dst)
+      if (prop.toLowerCase() in dst)
         return dst;
       dst[prop.toLowerCase()] = [];
     } else {

dist/index.mjs

@@ -365,7 +365,7 @@ function correctHeaders(src) {
       if (typeof prop !== "string") {
         throw new Error(`Invalid header key type '${typeof prop}' of ${prop}`);
       }
-      if (prop in dst)
+      if (prop.toLowerCase() in dst)
         return dst;
       dst[prop.toLowerCase()] = [];
     } else {

dist/rfc9421/const.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Structured Field Value Type Dictionary
+ * https://datatracker.ietf.org/doc/html/rfc8941
+ *
+ * key: field name
+ * value: item, list, dict
+ */
+export type SFVHeaderTypeDictionary = Record<string, 'item' | 'list' | 'dict'>;
+/**
+ * Dictionary of field name known to be structured field value
+ * TODO: Find official registry
+ */
+export declare const knownSfvHeaderTypeDictionary: {
+    /**
+     * RFC 9421 HTTP Message Signatures
+     * https://datatracker.ietf.org/doc/html/rfc9421#name-initial-contents-3
+     */
+    signature: "dict";
+    'signature-input': "dict";
+    'accept-signature': "dict";
+    /**
+     * RFC 9530 Digest Fields
+     * https://datatracker.ietf.org/doc/html/rfc9530#name-http-field-name-registratio
+     */
+    'content-digest': "dict";
+    'repr-digest': "dict";
+    'want-content-digest': "dict";
+    'want-repr-digest': "dict";
+};

dist/rfc9421/sign.d.ts

@@ -1,18 +1,6 @@
 /// <reference types="node" />
 import type { IncomingRequest, MapLikeObj, OutgoingResponse, SFVSignatureInputDictionary, SFVSignatureInputDictionaryForInput, HeadersLike } from "../types";
-/**
- * Structured Field Value Type Dictionary
- * https://datatracker.ietf.org/doc/html/rfc8941
- *
- * key: field (header) name
- * value: item, list, dict
- */
-export type SFVHeaderTypeDictionary = Record<string, 'item' | 'list' | 'dict'>;
-export declare const sfvHeaderTypeDictionaryIKnow: {
-    signature: "dict";
-    'signature-input': "dict";
-    'content-digest': "dict";
-};
+import { SFVHeaderTypeDictionary } from "./const";
 export declare const requestTargetDerivedComponents: string[];
 export declare const responseTargetDerivedComponents: string[];
 export type Kot<T> = keyof T extends 'req' ? T : null;

dist/types.d.ts

@@ -4,13 +4,14 @@
 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;
-    rawHeaders?: (string | number | null | undefined)[];
+    rawHeaders?: HeadersValueLike[] | [string, HeadersValueLike][];
     getHeaders?: () => HeadersLike;
     body?: string;
     trailers?: Record<string, string>;
@@ -24,7 +25,7 @@ export type ResponseLike = {
     req: RequestLike;
     statusCode: number;
     headers: HeadersLike;
-    rawHeaders?: (string | number | null | undefined)[];
+    rawHeaders?: HeadersValueLike[];
     getHeaders?: () => HeadersLike;
     body?: string;
     trailers?: Record<string, string>;

dist/utils.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { MapLikeObj, SignInfo, SignatureHashAlgorithmUpperSnake, HeadersLike, HeadersValueLike } from './types.js';
+import type { MapLikeObj, SignInfo, SignatureHashAlgorithmUpperSnake, HeadersLike, HeadersValueLike, HeadersValueLikeArrayable } from './types.js';
 import { ParsedAlgorithmIdentifier } from './pem/spki.js';
 import type { webcrypto } from 'node:crypto';
 export declare function getWebcrypto(): Promise<webcrypto.Crypto>;
@@ -11,7 +11,7 @@ export declare 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 declare function canonicalizeHeaderValue(value: HeadersValueLike): string;
+export declare function canonicalizeHeaderValue(value: HeadersValueLikeArrayable): string;
 /**
  * Convert object keys to lowercase
  * (Headers in Fetch API joins multiple headers with ',', but it must be ', ' in RFC 9421)
@@ -38,7 +38,7 @@ export declare function toStringOrToLc(src: string | number | undefined | null):
  *	Convert rawHeaders to object
  *	rawHeaders: https://nodejs.org/api/http2.html#requestrawheaders
  */
-export declare function correctHeaders(src: (string | number | undefined | null)[]): Record<string, (string | number)[]>;
+export declare function correctHeaders(src: HeadersValueLike[]): Record<string, (string | number)[]>;
 /**
  * Convert number to Uint8Array, for ASN.1 length field
  */

src/index.ts

@@ -16,6 +16,7 @@ export * from './draft/parse.js';
 export * from './draft/sign.js';
 export * from './draft/verify.js';
 
+//export * from './rfc9421/const.js';
 //export * from './rfc9421/parse.js';
 //export * from './rfc9421/sign.js';
 //export * from './rfc9421/verify.js';

src/rfc9421/sign.base.test.ts

@@ -117,6 +117,27 @@ describe(RFC9421SignatureBaseFactory, () => {
 			});
 		});
 
+		test('request with raw headers (entries)', () => {
+			const request = {
+				...requestBase,
+				rawHeaders: [
+					...Object.entries(requestBase.headers),
+					['x-test', 'value'],
+					['x-test', 'value2'],
+					['X-Test', null],
+				].flat(2),
+			} satisfies RequestLike;
+			const factory = new RFC9421SignatureBaseFactory(
+				request,
+				tinySignatureInput,
+			);
+			expect(factory.requestHeaders).toEqual({
+				date: ['Tue, 07 Jun 2014 20:51:35 GMT'],
+				host: ['example.com'],
+				'x-test': ['value', 'value2', ''],
+			});
+		});
+
 		test('response basic', () => {
 			const factory = new RFC9421SignatureBaseFactory(
 				responseBase,

src/rfc9421/sign.ts

@@ -108,7 +108,7 @@ export class RFC9421SignatureBaseFactory<T extends IncomingRequest | OutgoingRes
 	 */
 	public getHeadersMap(source: IncomingRequest | OutgoingResponse): HeadersLike {
 		if ('rawHeaders' in source && source.rawHeaders) {
-			return correctHeaders(source.rawHeaders);
+			return correctHeaders(source.rawHeaders.flat(1));
 		} else if ('getHeaders' in source && typeof source.getHeaders === 'function') {
 			return lcObjectKey(source.getHeaders());
 		} else if ('headers' in source && source.headers) {

src/types.ts

@@ -11,7 +11,7 @@ export type RequestLike = {
 	method: string;
 	headers: HeadersLike
 	// https://nodejs.org/api/http2.html#requestrawheaders
-	rawHeaders?: HeadersValueLike[];
+	rawHeaders?: HeadersValueLike[] | [string, HeadersValueLike][];
 	getHeaders?: () => HeadersLike;
 	body?: string;
 	trailers?: Record<string, string>;