@growth-labs/cms 0.5.30 → 0.5.31

package/src/engine/foundry-dispatch.ts

@@ -400,8 +400,13 @@ export async function applyFoundryCallback(db: D1Database, input: CallbackInput)
 
 /**
  * Verify a HMAC-SHA256 signature over `rawBody` using `secret`.
- * The `signature` is expected as a lowercase hex string.
- * Uses Web Crypto `crypto.subtle` and a constant-time comparison.
+ *
+ * The `signature` is a hex string, with or without a `sha256=` scheme prefix.
+ * Foundry (and the GitHub-webhook convention it mirrors) sends
+ * `X-Foundry-Signature: sha256=<hex>`; the prefix MUST be stripped before the
+ * hex parse or every prefixed signature fails to decode and the callback 401s.
+ * Comparison is case-insensitive on the hex and constant-time on the bytes.
+ * Uses Web Crypto `crypto.subtle`.
  */
 export async function verifyHmac(
 	secret: string,
@@ -410,13 +415,24 @@ export async function verifyHmac(
 ): Promise<boolean> {
 	if (!signature) return false
 
+	// Strip the optional `sha256=` scheme prefix (case-insensitive) and any
+	// surrounding whitespace before decoding the hex digest.
+	let hex = signature.trim()
+	if (/^sha256=/i.test(hex)) hex = hex.slice('sha256='.length).trim()
+	if (!hex) return false
+	// Reject non-hex up front: `Number.parseInt('1z', 16)` returns 1 (parses the
+	// leading nibble and stops), so malformed hex would otherwise decode to a
+	// truncated-but-valid byte string. The constant-time compare still guards
+	// forgery, but a strict charset check keeps the decode honest.
+	if (!/^[0-9a-f]+$/i.test(hex)) return false
+
 	let sigBytes: Uint8Array
 	try {
 		// Parse the hex signature
-		if (signature.length % 2 !== 0) return false
-		sigBytes = new Uint8Array(signature.length / 2)
-		for (let i = 0; i < signature.length; i += 2) {
-			const byte = Number.parseInt(signature.slice(i, i + 2), 16)
+		if (hex.length % 2 !== 0) return false
+		sigBytes = new Uint8Array(hex.length / 2)
+		for (let i = 0; i < hex.length; i += 2) {
+			const byte = Number.parseInt(hex.slice(i, i + 2), 16)
 			if (Number.isNaN(byte)) return false
 			sigBytes[i / 2] = byte
 		}