TextEncoder使い回す, .jsつける

tamaina · tamaina · commit 4f1aad403a9d · 2024-03-08T16:01:48.000Z
diff --git a/src/const.ts b/src/const.ts
@@ -0,0 +1 @@
+export const textEncoder = new TextEncoder();
diff --git a/src/digest/digest-rfc3230.ts b/src/digest/digest-rfc3230.ts
@@ -1,6 +1,6 @@
-import { collectHeaders, compareUint8Array, encodeArrayBufferToBase64, getHeaderValue } from '../utils';
-import { DigestSource, createBase64Digest } from './utils';
-import { DigestHashAlgorithm, IncomingRequest } from '../types';
+import { collectHeaders, compareUint8Array, encodeArrayBufferToBase64, getHeaderValue } from '../utils.js';
+import { DigestSource, createBase64Digest } from './utils.js';
+import { DigestHashAlgorithm, IncomingRequest } from '../types.js';
 import { base64 } from 'rfc4648';
 
 export async function genRFC3230DigestHeader(body: DigestSource, hashAlgorithm: DigestHashAlgorithm) {
diff --git a/src/digest/digest-rfc9530.ts b/src/digest/digest-rfc9530.ts
@@ -1,6 +1,6 @@
-import { collectHeaders, getHeaderValue } from '../utils';
-import { DigestSource, createBase64Digest } from './utils';
-import type { DigestHashAlgorithm, IncomingRequest } from '../types';
+import { collectHeaders, getHeaderValue } from '../utils.js';
+import { DigestSource, createBase64Digest } from './utils.js';
+import type { DigestHashAlgorithm, IncomingRequest } from '../types.js';
 import * as sh from 'structured-headers';
 import { base64 } from 'rfc4648';
 
diff --git a/src/digest/digest.ts b/src/digest/digest.ts
@@ -1,7 +1,7 @@
-import { IncomingRequest } from "../types";
-import { collectHeaders } from "../utils";
-import { verifyRFC3230DigestHeader } from "./digest-rfc3230";
-import { DigestSource } from "./utils";
+import { IncomingRequest } from "../types.js";
+import { collectHeaders } from "../utils.js";
+import { verifyRFC3230DigestHeader } from "./digest-rfc3230.js";
+import { DigestSource } from "./utils.js";
 
 export async function verifyDigestHeader(
 	request: IncomingRequest,
diff --git a/src/digest/utils.ts b/src/digest/utils.ts
@@ -1,5 +1,6 @@
-import { DigestHashAlgorithm } from '../types';
-import { getWebcrypto } from '../utils';
+import { textEncoder } from '../const.js';
+import { DigestHashAlgorithm } from '../types.js';
+import { getWebcrypto } from '../utils.js';
 
 export type DigestSource = BufferSource | string;
 
@@ -11,7 +12,7 @@ export async function createBase64Digest(
 		hash = 'SHA-1';
 	}
 	if (typeof body === 'string') {
-		body = (new TextEncoder()).encode(body);
+		body = textEncoder.encode(body);
 	}
 	return await (await getWebcrypto()).subtle.digest(hash, body);
 }
diff --git a/src/draft/sign.ts b/src/draft/sign.ts
@@ -2,6 +2,7 @@ import type { IncomingRequest, PrivateKey, SignatureHashAlgorithmUpperSnake } fr
 import { type SignInfoDefaults, defaultSignInfoDefaults, encodeArrayBufferToBase64, getWebcrypto, genAlgorithmForSignAndVerify, collectHeaders } from '../utils.js';
 import { importPrivateKey } from '../pem/pkcs8.js';
 import { keyHashAlgosForDraftEncofing } from './const.js';
+import { textEncoder } from '../const.js';
 
 /**
  * Get the algorithm string for draft encoding
@@ -86,7 +87,7 @@ export function genDraftSigningString(
 }
 
 export async function genDraftSignature(privateKey: CryptoKey, signingString: string, defaults: SignInfoDefaults = defaultSignInfoDefaults) {
-	const signatureAB = await (await getWebcrypto()).subtle.sign(genAlgorithmForSignAndVerify(privateKey.algorithm, defaults.hash), privateKey, new TextEncoder().encode(signingString));
+	const signatureAB = await (await getWebcrypto()).subtle.sign(genAlgorithmForSignAndVerify(privateKey.algorithm, defaults.hash), privateKey, textEncoder.encode(signingString));
 	return encodeArrayBufferToBase64(signatureAB);
 }
 
diff --git a/src/draft/verify.ts b/src/draft/verify.ts
@@ -1,8 +1,9 @@
-import { ParsedDraftSignature } from "../types";
-import { parseAndImportPublicKey } from "../pem/spki";
-import { parseSignInfo } from "../shared/verify";
-import { getWebcrypto } from "../utils";
+import { ParsedDraftSignature } from "../types.js";
+import { parseAndImportPublicKey } from "../pem/spki.js";
+import { parseSignInfo } from "../shared/verify.js";
+import { getWebcrypto } from "../utils.js";
 import { base64 } from "rfc4648";
+import { textEncoder } from "../const.js";
 
 /**
  * @deprecated Use `parseSignInfo`
@@ -22,7 +23,7 @@ export async function verifyDraftSignature(
 ): Promise<boolean> {
 	try {
 		const { publicKey, algorithm } = await parseAndImportPublicKey(key, ['verify'], parsed.algorithm);
-		const verify = await (await getWebcrypto()).subtle.verify(algorithm, publicKey, base64.parse(parsed.params.signature), (new TextEncoder()).encode(parsed.signingString));
+		const verify = await (await getWebcrypto()).subtle.verify(algorithm, publicKey, base64.parse(parsed.params.signature), textEncoder.encode(parsed.signingString));
 		if (verify !== true) throw new Error(`verification simply failed, result: ${verify}`);
 		return verify;
 	} catch (e) {
diff --git a/src/keypair.ts b/src/keypair.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-import { encodeArrayBufferToBase64, getWebcrypto, splitPer64Chars } from './utils';
-import type { ECNamedCurve } from './types';
+import { encodeArrayBufferToBase64, getWebcrypto, splitPer64Chars } from './utils.js';
+import type { ECNamedCurve } from './types.js';
 
 export async function exportPublicKeyPem(key: CryptoKey) {
 	const ab = await (await getWebcrypto()).subtle.exportKey('spki', key);
diff --git a/src/pem/pkcs1.ts b/src/pem/pkcs1.ts
@@ -1,6 +1,6 @@
 import ASN1 from '@lapo/asn1js';
-import { asn1ToArrayBuffer, decodePem } from './spki';
-import { genASN1Length } from 'src/utils';
+import { asn1ToArrayBuffer, decodePem } from './spki.js';
+import { genASN1Length } from '../utils.js';
 
 export class Pkcs1ParseError extends Error {
 	constructor(message: string) { super(message); }
diff --git a/src/pem/spki.ts b/src/pem/spki.ts
@@ -1,10 +1,10 @@
 import ASN1 from '@lapo/asn1js';
 import Hex from '@lapo/asn1js/hex.js';
 import Base64 from '@lapo/asn1js/base64.js';
-import { genSpkiFromPkcs1, parsePkcs1 } from './pkcs1';
-import { ECNamedCurve, KeyAlgorithmName } from '../types';
-import { SignInfoDefaults, defaultSignInfoDefaults, genAlgorithmForSignAndVerify, genSignInfo, getWebcrypto } from '../utils';
-import { parseSignInfo } from '../shared/verify';
+import { genSpkiFromPkcs1, parsePkcs1 } from './pkcs1.js';
+import { ECNamedCurve, KeyAlgorithmName } from '../types.js';
+import { SignInfoDefaults, defaultSignInfoDefaults, genAlgorithmForSignAndVerify, genSignInfo, getWebcrypto } from '../utils.js';
+import { parseSignInfo } from '../shared/verify.js';
 
 export class SpkiParseError extends Error {
 	constructor(message: string) { super(message); }
diff --git a/src/rfc9421/sign.ts b/src/rfc9421/sign.ts
@@ -1,10 +1,11 @@
 
 // TODO
 
-import { canonicalizeHeaderValue, encodeArrayBufferToBase64, getValueByLc, lcObjectKey, getMap, collectHeaders, isBrowserRequest, isBrowserResponse } from "../utils";
-import type { IncomingRequest, MapLikeObj, OutgoingResponse, SFVParametersLike, SFVSignatureInputDictionary, SFVSignatureInputDictionaryForInput, HeadersLike, HeadersValueLikeArrayable } from "../types";
+import { canonicalizeHeaderValue, encodeArrayBufferToBase64, getValueByLc, lcObjectKey, getMap, collectHeaders, isBrowserRequest, isBrowserResponse } from "../utils.js";
+import type { IncomingRequest, MapLikeObj, OutgoingResponse, SFVParametersLike, SFVSignatureInputDictionary, SFVSignatureInputDictionaryForInput, HeadersLike, HeadersValueLikeArrayable } from "../types.js";
 import * as sh from "structured-headers";
-import { SFVHeaderTypeDictionary, knownSfvHeaderTypeDictionary } from "./const";
+import { SFVHeaderTypeDictionary, knownSfvHeaderTypeDictionary } from "./const.js";
+import { textEncoder } from '../const.js';
 
 // https://datatracker.ietf.org/doc/html/rfc9421#name-initial-contents-3
 export const requestTargetDerivedComponents = [
@@ -280,11 +281,19 @@ export class RFC9421SignatureBaseFactory<T extends IncomingRequest | OutgoingRes
 			if (isBs) {
 				// https://datatracker.ietf.org/doc/html/rfc9421#section-2.1.3
 				const sequences = (Array.isArray(rawValue) ? rawValue : [rawValue])
-					.map(x => canonicalizeHeaderValue(x))
-					.map(x => (new TextEncoder()).encode(x))
-					.map(x => encodeArrayBufferToBase64(x.buffer))
-					.map(x => new sh.ByteSequence(x))
-					.map(x => [x, new Map()] as sh.Item);
+					.map(x => {
+						if (typeof x !== 'string') {
+							throw new Error(`Invalid header value type: ${typeof x}`);
+						}
+						return [
+							new sh.ByteSequence(
+								encodeArrayBufferToBase64(
+									textEncoder.encode(canonicalizeHeaderValue(x)).buffer
+								)
+							),
+							new Map()
+						] as sh.Item;
+					});
 				return sh.serializeList(sequences);
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export const textEncoder = new TextEncoder();`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`		`-import { DigestHashAlgorithm } from '../types';`
`2`		`-import { getWebcrypto } from '../utils';`
	`1`	`+import { textEncoder } from '../const.js';`
	`2`	`+import { DigestHashAlgorithm } from '../types.js';`
	`3`	`+import { getWebcrypto } from '../utils.js';`
`3`	`4`
`4`	`5`	`export type DigestSource = BufferSource \| string;`
`5`	`6`
`@@ -11,7 +12,7 @@ export async function createBase64Digest(`
`11`	`12`	`hash = 'SHA-1';`
`12`	`13`	`}`
`13`	`14`	`if (typeof body === 'string') {`
`14`		`- body = (new TextEncoder()).encode(body);`
	`15`	`+ body = textEncoder.encode(body);`
`15`	`16`	`}`
`16`	`17`	`return await (await getWebcrypto()).subtle.digest(hash, body);`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import type { IncomingRequest, PrivateKey, SignatureHashAlgorithmUpperSnake } fr`
`2`	`2`	`import { type SignInfoDefaults, defaultSignInfoDefaults, encodeArrayBufferToBase64, getWebcrypto, genAlgorithmForSignAndVerify, collectHeaders } from '../utils.js';`
`3`	`3`	`import { importPrivateKey } from '../pem/pkcs8.js';`
`4`	`4`	`import { keyHashAlgosForDraftEncofing } from './const.js';`
	`5`	`+import { textEncoder } from '../const.js';`
`5`	`6`
`6`	`7`	`/**`
`7`	`8`	`* Get the algorithm string for draft encoding`
`@@ -86,7 +87,7 @@ export function genDraftSigningString(`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`export async function genDraftSignature(privateKey: CryptoKey, signingString: string, defaults: SignInfoDefaults = defaultSignInfoDefaults) {`
`89`		`- const signatureAB = await (await getWebcrypto()).subtle.sign(genAlgorithmForSignAndVerify(privateKey.algorithm, defaults.hash), privateKey, new TextEncoder().encode(signingString));`
	`90`	`+ const signatureAB = await (await getWebcrypto()).subtle.sign(genAlgorithmForSignAndVerify(privateKey.algorithm, defaults.hash), privateKey, textEncoder.encode(signingString));`
`90`	`91`	`return encodeArrayBufferToBase64(signatureAB);`
`91`	`92`	`}`
`92`	`93`