From 50128bbac696a678c184c73259f91cb0946845ae Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Fri, 16 Feb 2024 01:49:52 +0100
Subject: [PATCH] Test decrypt fix

---
 backend/src/lib/secret/index.ts | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/backend/src/lib/secret/index.ts b/backend/src/lib/secret/index.ts
index 08cb0163d..848ebde70 100644
--- a/backend/src/lib/secret/index.ts
+++ b/backend/src/lib/secret/index.ts
@@ -1,3 +1,4 @@
+import crypto from "crypto";
 import { z } from "zod";
 
 import { SecretKeyEncoding, TProjectKeys } from "@app/db/schemas";
@@ -50,16 +51,30 @@ const symmetricDecrypt = ({
   key,
   isApprovalSecret
 }: TDecryptSymmetricInput & { keyEncoding: SecretKeyEncoding; isApprovalSecret: boolean }) => {
-  if (keyEncoding === SecretKeyEncoding.UTF8 || isApprovalSecret) {
-    const data = decryptSymmetric128BitHexKeyUTF8({ key, iv, tag, ciphertext });
-    return data;
-  }
-  if (keyEncoding === SecretKeyEncoding.BASE64) {
-    const data = decryptSymmetric({ key, iv, tag, ciphertext });
-    return data;
-  }
+  try {
+    if (keyEncoding === SecretKeyEncoding.UTF8 || isApprovalSecret) {
+      const data = decryptSymmetric128BitHexKeyUTF8({ key, iv, tag, ciphertext });
+      return data;
+    }
+    if (keyEncoding === SecretKeyEncoding.BASE64) {
+      const data = decryptSymmetric({ key, iv, tag, ciphertext });
+      return data;
+    }
+    throw new Error("BAD_ENCODING");
+  } catch (err) {
+    if (err instanceof Error && err.message === "BAD_ENCODING") {
+      throw new Error("Invalid key encoding, cannot decrypt secret!");
+    }
 
-  throw new Error("Missing both encryption keys");
+    // This is taken directly from our frontend secret decryption logic.
+    const decipher = crypto.createDecipheriv("aes-256-gcm", key, Buffer.from(iv, "base64"));
+    decipher.setAuthTag(Buffer.from(tag, "base64"));
+
+    let data = decipher.update(ciphertext, "base64", "utf8");
+    data += decipher.final("utf8");
+
+    return data;
+  }
 };
 
 export const decryptSecrets = (