add folder id to versions in batch update

Patch backfill data

backend/src/controllers/v2/secretsController.ts

@@ -218,6 +218,7 @@ export const batchSecrets = async (req: Request, res: Response) => {
           algorithm: ALGORITHM_AES_256_GCM,
           keyEncoding: ENCODING_SCHEME_UTF8,
           tags: u.tags,
+          folder: u.folder
         })
     );
 
@@ -909,13 +910,13 @@ export const updateSecrets = async (req: Request, res: Response) => {
             keyEncoding: ENCODING_SCHEME_UTF8,
             tags,
             ...(secretCommentCiphertext !== undefined &&
-            secretCommentIV &&
-            secretCommentTag
+              secretCommentIV &&
+              secretCommentTag
               ? {
-                  secretCommentCiphertext,
-                  secretCommentIV,
-                  secretCommentTag,
-                }
+                secretCommentCiphertext,
+                secretCommentIV,
+                secretCommentTag,
+              }
               : {}),
           },
         },

backend/src/helpers/secrets.ts

@@ -185,26 +185,56 @@ const generateSecretBlindIndexHelper = async ({
   workspaceId: Types.ObjectId;
 }) => {
   // check if workspace blind index data exists
+  const encryptionKey = await getEncryptionKey();
+  const rootEncryptionKey = await getRootEncryptionKey();
+
   const secretBlindIndexData = await SecretBlindIndexData.findOne({
     workspace: workspaceId,
-  });
+  }).select('+algorithm +keyEncoding');
 
   if (!secretBlindIndexData) throw SecretBlindIndexDataNotFoundError();
 
-  // decrypt workspace salt
-  const salt = decryptSymmetric128BitHexKeyUTF8({
-    ciphertext: secretBlindIndexData.encryptedSaltCiphertext,
-    iv: secretBlindIndexData.saltIV,
-    tag: secretBlindIndexData.saltTag,
-    key: await getEncryptionKey(),
-  });
+  let salt;
+  if (
+    rootEncryptionKey &&
+    secretBlindIndexData.keyEncoding === ENCODING_SCHEME_BASE64
+  ) {
+    salt = client.decryptSymmetric(
+      secretBlindIndexData.encryptedSaltCiphertext,
+      rootEncryptionKey,
+      secretBlindIndexData.saltIV,
+      secretBlindIndexData.saltTag
+    );
 
-  const secretBlindIndex = await generateSecretBlindIndexWithSaltHelper({
-    secretName,
-    salt,
-  });
+    const secretBlindIndex = await generateSecretBlindIndexWithSaltHelper({
+      secretName,
+      salt,
+    });
 
-  return secretBlindIndex;
+    return secretBlindIndex;
+  } else if (
+    encryptionKey &&
+    secretBlindIndexData.keyEncoding === ENCODING_SCHEME_UTF8
+  ) {
+    // decrypt workspace salt
+    salt = decryptSymmetric128BitHexKeyUTF8({
+      ciphertext: secretBlindIndexData.encryptedSaltCiphertext,
+      iv: secretBlindIndexData.saltIV,
+      tag: secretBlindIndexData.saltTag,
+      key: encryptionKey,
+    });
+
+    const secretBlindIndex = await generateSecretBlindIndexWithSaltHelper({
+      secretName,
+      salt,
+    });
+
+    return secretBlindIndex;
+  }
+  
+  throw InternalServerError({
+    message: 'Failed to generate secret blind index'
+  });
 };
 
 /**

backend/src/types/secret/index.d.ts

@@ -43,4 +43,5 @@ export interface BatchSecret {
   secretCommentIV: string;
   secretCommentTag: string;
   tags: string[];
+  folder: string
 }

backend/src/utils/setup/validateConfig.ts

@@ -21,39 +21,39 @@ import {
 export const validateEncryptionKeysConfig = async () => {
     const encryptionKey = await getEncryptionKey();
     const rootEncryptionKey = await getRootEncryptionKey();
-    
+
     if (
         (encryptionKey === undefined || encryptionKey === "") &&
         (rootEncryptionKey === undefined || rootEncryptionKey === "")
     ) throw InternalServerError({
         message: "Failed to find required root encryption key environment variable. Please make sure that you're passing in a ROOT_ENCRYPTION_KEY environment variable."
     });
-    
-    if (encryptionKey && encryptionKey !== '') {
-        // validate [encryptionKey]
-        
-        const keyBuffer = Buffer.from(encryptionKey, 'hex');
-        const decoded = keyBuffer.toString('hex');
 
-        if (decoded !== encryptionKey) throw InternalServerError({
-            message: 'Failed to validate that the encryption key is correctly encoded in hex.'
-        });
-        
-        if (keyBuffer.length !== 16) throw InternalServerError({
-            message: 'Failed to validate that the encryption key is a 128-bit hex string.'
-        });
-    }
+    // if (encryptionKey && encryptionKey !== '') {
+    //     // validate [encryptionKey]
+
+    //     const keyBuffer = Buffer.from(encryptionKey, 'hex');
+    //     const decoded = keyBuffer.toString('hex');
+
+    //     if (decoded !== encryptionKey) throw InternalServerError({
+    //         message: 'Failed to validate that the encryption key is correctly encoded in hex.'
+    //     });
+
+    //     if (keyBuffer.length !== 16) throw InternalServerError({
+    //         message: 'Failed to validate that the encryption key is a 128-bit hex string.'
+    //     });
+    // }
 
     if (rootEncryptionKey && rootEncryptionKey !== '') {
         // validate [rootEncryptionKey]
-        
+
         const keyBuffer = Buffer.from(rootEncryptionKey, 'base64')
         const decoded = keyBuffer.toString('base64');
 
         if (decoded !== rootEncryptionKey) throw InternalServerError({
             message: 'Failed to validate that the root encryption key is correctly encoded in base64'
         });
-        
+
         if (keyBuffer.length !== 32) throw InternalServerError({
             message: 'Failed to validate that the encryption key is a 256-bit base64 string'
         });

backend/src/validation/workspace.ts

@@ -51,7 +51,6 @@ export const validateClientForWorkspace = async ({
 	requiredPermissions?: string[];
 	requireBlindIndicesEnabled: boolean;
 }) => {
-	
 	const workspace = await Workspace.findById(workspaceId);
 
 	if (!workspace) throw WorkspaceNotFoundError({