Merge pull request #3 from BendingBender/fix-hash-type-and-typo

Correct type of THash type, fix typo

Author: frux

packages/csp-header/src/constants/values.ts

@@ -5,7 +5,11 @@ export const ALLOW_MODALS = "allow-modals";
 export const ALLOW_ORIENTATION_LOCK = "allow-orientation-lock";
 export const ALLOW_POINTER_LOCK = "allow-pointer-lock";
 export const ALLOW_POPUPS = "allow-popups";
-export const ALLOW_POPUPS_TO_ESACPE_SANDBOX = "allow-popups-to-escape-sandbox";
+export const ALLOW_POPUPS_TO_ESCAPE_SANDBOX = "allow-popups-to-escape-sandbox";
+/**
+ * @deprecated
+ */
+export const ALLOW_POPUPS_TO_ESACPE_SANDBOX = ALLOW_POPUPS_TO_ESCAPE_SANDBOX;
 export const ALLOW_PRESENTATION = "allow-presentation";
 export const ALLOW_SAME_ORIGIN = "allow-same-origin";
 export const ALLOW_STORAGE_ACCESS_BY_USER_ACTIVATION = "allow-storage-access-by-user-activation";

packages/csp-header/src/types.ts

@@ -6,7 +6,7 @@ import {
 	ALLOW_ORIENTATION_LOCK,
 	ALLOW_POINTER_LOCK,
 	ALLOW_POPUPS,
-	ALLOW_POPUPS_TO_ESACPE_SANDBOX,
+	ALLOW_POPUPS_TO_ESCAPE_SANDBOX,
 	ALLOW_PRESENTATION,
 	ALLOW_SAME_ORIGIN,
 	ALLOW_STORAGE_ACCESS_BY_USER_ACTIVATION,
@@ -48,7 +48,7 @@ export type CSPPresetsArray = Partial<CSPDirectives>[];
 
 type TSource = string;
 type TNonce = `nonce-${string}`;
-type THash = `sha-${string}`;
+type THash = `sha${'256' | '384' | '512'}-${string}`;
 type TMimeType = `${string}/${string}`;
 
 type TFetchDirective = TSource |
@@ -111,7 +111,7 @@ export type CSPDirectives = {
 		typeof ALLOW_ORIENTATION_LOCK |
 		typeof ALLOW_POINTER_LOCK |
 		typeof ALLOW_POPUPS |
-		typeof ALLOW_POPUPS_TO_ESACPE_SANDBOX |
+		typeof ALLOW_POPUPS_TO_ESCAPE_SANDBOX |
 		typeof ALLOW_PRESENTATION |
 		typeof ALLOW_SAME_ORIGIN |
 		typeof ALLOW_SCRIPTS |

packages/express-csp-header/src/constants.ts

@@ -17,6 +17,7 @@ export {
 	ALLOW_ORIENTATION_LOCK,
 	ALLOW_POINTER_LOCK,
 	ALLOW_POPUPS,
+	ALLOW_POPUPS_TO_ESCAPE_SANDBOX,
 	ALLOW_POPUPS_TO_ESACPE_SANDBOX,
 	ALLOW_PRESENTATION,
 	ALLOW_SAME_ORIGIN,