feat: secret v2 architecture for secret rotation

frontend/src/hooks/api/secretRotation/queries.tsx

@@ -1,14 +1,9 @@
-import { useCallback } from "react";
 import { useQuery, UseQueryOptions } from "@tanstack/react-query";
 
-import {
-  decryptAssymmetric,
-  decryptSymmetric
-} from "@app/components/utilities/cryptography/crypto";
 import { apiRequest } from "@app/config/request";
 
 import {
-  TGetSecretRotationList,
+  TGetSecretRotationListDTO,
   TGetSecretRotationProviders,
   TSecretRotation,
   TSecretRotationProviderList
@@ -19,7 +14,7 @@ export const secretRotationKeys = {
     { workspaceId },
     "secret-rotation-providers"
   ],
-  list: ({ workspaceId }: Omit<TGetSecretRotationList, "decryptFileKey">) =>
+  list: ({ workspaceId }: Omit<TGetSecretRotationListDTO, "decryptFileKey">) =>
     [{ workspaceId }, "secret-rotations"] as const
 };
 
@@ -53,7 +48,7 @@ export const useGetSecretRotationProviders = ({
 
 const fetchSecretRotations = async ({
   workspaceId
-}: Omit<TGetSecretRotationList, "decryptFileKey">) => {
+}: Omit<TGetSecretRotationListDTO, "decryptFileKey">) => {
   const { data } = await apiRequest.get<{ secretRotations: TSecretRotation[] }>(
     "/api/v1/secret-rotations",
     { params: { workspaceId } }
@@ -63,14 +58,13 @@ const fetchSecretRotations = async ({
 
 export const useGetSecretRotations = ({
   workspaceId,
-  decryptFileKey,
   options = {}
-}: TGetSecretRotationList & {
+}: TGetSecretRotationListDTO & {
   options?: Omit<
     UseQueryOptions<
       TSecretRotation[],
       unknown,
-      TSecretRotation<{ key: string }>[],
+      TSecretRotation[],
       ReturnType<typeof secretRotationKeys.list>
     >,
     "queryKey" | "queryFn"
@@ -80,31 +74,5 @@ export const useGetSecretRotations = ({
     ...options,
     queryKey: secretRotationKeys.list({ workspaceId }),
     enabled: Boolean(workspaceId) && (options?.enabled ?? true),
-    queryFn: async () => fetchSecretRotations({ workspaceId }),
-    select: useCallback(
-      (data: TSecretRotation[]) => {
-        const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY") as string;
-        const decryptKey = decryptAssymmetric({
-          ciphertext: decryptFileKey.encryptedKey,
-          nonce: decryptFileKey.nonce,
-          publicKey: decryptFileKey.sender.publicKey,
-          privateKey: PRIVATE_KEY
-        });
-        return data.map((el) => ({
-          ...el,
-          outputs: el.outputs.map(({ key, secret }) => ({
-            key,
-            secret: {
-              key: decryptSymmetric({
-                ciphertext: secret.secretValueCiphertext,
-                iv: secret.secretValueIV,
-                tag: secret.secretValueTag,
-                key: decryptKey
-              })
-            }
-          }))
-        }));
-      },
-      [decryptFileKey]
-    )
+    queryFn: async () => fetchSecretRotations({ workspaceId })
   });

frontend/src/hooks/api/secretRotation/types.ts

@@ -1,5 +1,3 @@
-import { UserWsKeyPair } from "../keys/types";
-import { EncryptedSecret } from "../secrets/types";
 import { WorkspaceEnv } from "../workspace/types";
 
 export enum TProviderFunctionTypes {
@@ -74,7 +72,7 @@ export type TDbProviderTemplate = {
   outputs: Record<string, unknown>;
 };
 
-export type TSecretRotation<T extends unknown = EncryptedSecret> = {
+export type TSecretRotation = {
   id: string;
   interval: number;
   provider: string;
@@ -85,7 +83,11 @@ export type TSecretRotation<T extends unknown = EncryptedSecret> = {
   secretPath: string;
   outputs: Array<{
     key: string;
-    secret: T;
+    secret: {
+      version: number;
+      id: string;
+      secretKey: string;
+    };
   }>;
   status?: "success" | "failed";
   lastRotatedAt?: string;
@@ -103,9 +105,8 @@ export type TGetSecretRotationProviders = {
   workspaceId: string;
 };
 
-export type TGetSecretRotationList = {
+export type TGetSecretRotationListDTO = {
   workspaceId: string;
-  decryptFileKey: UserWsKeyPair;
 };
 
 export type TCreateSecretRotationDTO = {

frontend/src/views/SecretRotationPage/SecretRotationPage.tsx

@@ -1,4 +1,3 @@
-import { useTranslation } from "react-i18next";
 import Link from "next/link";
 import {
   faArrowsSpin,
@@ -16,12 +15,9 @@ import { formatDistance } from "date-fns";
 import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 import {
-  Button,
   DeleteActionModal,
   EmptyState,
   IconButton,
-  Modal,
-  ModalContent,
   Skeleton,
   Spinner,
   Table,
@@ -48,22 +44,17 @@ import {
   useDeleteSecretRotation,
   useGetSecretRotationProviders,
   useGetSecretRotations,
-  useGetUserWsKey,
-  useGetWorkspaceBot,
-  useRestartSecretRotation,
-  useUpdateBotActiveStatus
+  useRestartSecretRotation
 } from "@app/hooks/api";
 import { TSecretRotationProviderTemplate } from "@app/hooks/api/types";
 
 import { CreateRotationForm } from "./components/CreateRotationForm";
-import { generateBotKey } from "./SecretRotationPage.utils";
 
 export const SecretRotationPage = withProjectPermission(
   () => {
     const { currentWorkspace } = useWorkspace();
-    const { t } = useTranslation();
     const { permission } = useProjectPermission();
-    
+
     const { popUp, handlePopUpOpen, handlePopUpToggle, handlePopUpClose } = usePopUp([
       "createRotation",
       "activeBot",
@@ -77,13 +68,10 @@ export const SecretRotationPage = withProjectPermission(
     );
     const { subscription } = useSubscription();
 
-    const { data: userWsKey } = useGetUserWsKey(workspaceId);
-
     const { data: secretRotationProviders, isLoading: isRotationProviderLoading } =
       useGetSecretRotationProviders({ workspaceId });
     const { data: secretRotations, isLoading: isRotationLoading } = useGetSecretRotations({
-      workspaceId,
-      decryptFileKey: userWsKey!
+      workspaceId
     });
 
     const {
@@ -97,11 +85,6 @@ export const SecretRotationPage = withProjectPermission(
       isLoading: isRestartingRotation
     } = useRestartSecretRotation();
 
-    const { data: bot } = useGetWorkspaceBot(workspaceId);
-    const { mutateAsync: updateBotActiveStatus } = useUpdateBotActiveStatus();
-
-    const isBotActive = Boolean(bot?.isActive);
-
     const handleDeleteRotation = async () => {
       const { id } = popUp.deleteRotation.data as { id: string };
       try {
@@ -142,29 +125,6 @@ export const SecretRotationPage = withProjectPermission(
       }
     };
 
-    const handleUserAcceptBotCondition = async () => {
-      const provider = popUp.activeBot?.data as TSecretRotationProviderTemplate;
-      try {
-        if (bot?.id) {
-          const botKey = generateBotKey(bot.publicKey, userWsKey!);
-          await updateBotActiveStatus({
-            isActive: true,
-            botId: bot.id,
-            workspaceId,
-            botKey
-          });
-        }
-        handlePopUpOpen("createRotation", provider);
-        handlePopUpClose("activeBot");
-      } catch (error) {
-        console.log(error);
-        createNotification({
-          type: "error",
-          text: "Failed to create bot"
-        });
-      }
-    };
-
     const handleCreateRotation = async (provider: TSecretRotationProviderTemplate) => {
       if (subscription && !subscription?.secretRotation) {
         handlePopUpOpen("upgradePlan");
@@ -174,11 +134,7 @@ export const SecretRotationPage = withProjectPermission(
         createNotification({ type: "error", text: "Access permission denied!!" });
         return;
       }
-      if (isBotActive) {
-        handlePopUpOpen("createRotation", provider);
-      } else {
-        handlePopUpOpen("activeBot", provider);
-      }
+      handlePopUpOpen("createRotation", provider);
     };
 
     return (
@@ -391,30 +347,6 @@ export const SecretRotationPage = withProjectPermission(
           onToggle={(isOpen) => handlePopUpToggle("createRotation", isOpen)}
           provider={(popUp.createRotation.data as TSecretRotationProviderTemplate) || {}}
         />
-        <Modal
-          isOpen={popUp.activeBot?.isOpen}
-          onOpenChange={(isOpen) => handlePopUpToggle("activeBot", isOpen)}
-        >
-          <ModalContent
-            title={t("integrations.grant-access-to-secrets") as string}
-            footerContent={
-              <div className="flex items-center space-x-2">
-                <Button onClick={() => handleUserAcceptBotCondition()}>
-                  {t("integrations.grant-access-button") as string}
-                </Button>
-                <Button
-                  onClick={() => handlePopUpClose("activeBot")}
-                  variant="outline_bg"
-                  colorSchema="secondary"
-                >
-                  Cancel
-                </Button>
-              </div>
-            }
-          >
-            {t("integrations.why-infisical-needs-access")}
-          </ModalContent>
-        </Modal>
         <DeleteActionModal
           isOpen={popUp.deleteRotation.isOpen}
           title="Are you sure want to delete this rotation?"