nebel/websri
1
0
Fork 0
mirror of https://github.com/kou029w/websri.git synced 2025-01-18 16:08:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

organize hash algorithm names

Browse source
This commit is contained in:
Nebel 2024-09-09 18:32:50 +09:00
parent 9561fb23dc
commit 5c5d171791
Signed by: nebel
GPG key ID: 79807D08C6EF6460
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/index.ts
View file

@ -1,17 +1,12 @@
/** Content Security Policy Level 2, section 4.2 */ /** Content Security Policy Level 2, section 4.2 */
export type HashAlgorithm = "sha256" | "sha384" | "sha512"; export type HashAlgorithm = "sha256" | "sha384" | "sha512";
export const supportedHashAlgorithm: ReadonlyArray<HashAlgorithm> = [ /** Supported Hash Algorithms */
"sha512", export const supportedHashAlgorithms = {
"sha384",
"sha256",
];
export const supportedHashAlgorithmName = {
sha256: "SHA-256", sha256: "SHA-256",
sha384: "SHA-384", sha384: "SHA-384",
sha512: "SHA-512", sha512: "SHA-512",
} satisfies Record<HashAlgorithm, string>; } as const satisfies Record<HashAlgorithm, HashAlgorithmIdentifier>;
export type PrioritizedHashAlgorithm = "" | HashAlgorithm; export type PrioritizedHashAlgorithm = "" | HashAlgorithm;
@ -20,8 +15,8 @@ export function getPrioritizedHashAlgorithm(
b: HashAlgorithm, b: HashAlgorithm,
): PrioritizedHashAlgorithm { ): PrioritizedHashAlgorithm {
if (a === b) return ""; if (a === b) return "";
if (!supportedHashAlgorithm.includes(a)) return ""; if (!(a in supportedHashAlgorithms)) return "";
if (!supportedHashAlgorithm.includes(b)) return ""; if (!(b in supportedHashAlgorithms)) return "";
return a < b ? b : a; return a < b ? b : a;
} }
@ -69,7 +64,7 @@ export class IntegrityMetadata {
}): string { }): string {
if (!integrity.alg) return ""; if (!integrity.alg) return "";
if (!integrity.val) return ""; if (!integrity.val) return "";
if (!supportedHashAlgorithm.includes(integrity.alg)) return ""; if (!(integrity.alg in supportedHashAlgorithms)) return "";
return `${integrity.alg}-${[integrity.val, ...integrity.opt].join("?")}`; return `${integrity.alg}-${[integrity.val, ...integrity.opt].join("?")}`;
} }
} }
@ -81,13 +76,10 @@ export async function createIntegrityMetadata(
): Promise<string> { ): Promise<string> {
const alg = hashAlgorithm.toLowerCase() as HashAlgorithm; const alg = hashAlgorithm.toLowerCase() as HashAlgorithm;
if (!supportedHashAlgorithm.includes(alg)) return ""; if (!(alg in supportedHashAlgorithms)) return "";
const arrayBuffer = await crypto.subtle.digest(
supportedHashAlgorithmName[alg],
data,
);
const hashAlgorithmIdentifier = supportedHashAlgorithms[alg];
const arrayBuffer = await crypto.subtle.digest(hashAlgorithmIdentifier, data);
const val = btoa(String.fromCharCode(...new Uint8Array(arrayBuffer))); const val = btoa(String.fromCharCode(...new Uint8Array(arrayBuffer)));
return IntegrityMetadata.stringify({ return IntegrityMetadata.stringify({
@ -124,7 +116,7 @@ export class IntegrityMetadataSet extends Map<
} }
get strongest(): IntegrityMetadata { get strongest(): IntegrityMetadata {
const [hashAlgorithm = supportedHashAlgorithm[0]]: HashAlgorithm[] = [ const [hashAlgorithm = "sha512"]: ReadonlyArray<HashAlgorithm> = [
...this.keys(), ...this.keys(),
].sort((a, b) => { ].sort((a, b) => {
switch (this.getPrioritizedHashAlgorithm(a, b)) { switch (this.getPrioritizedHashAlgorithm(a, b)) {