diff --git a/backend/src/lib/crypto/index.ts b/backend/src/lib/crypto/index.ts index 0fe05bc01..9d7f4e886 100644 --- a/backend/src/lib/crypto/index.ts +++ b/backend/src/lib/crypto/index.ts @@ -11,4 +11,10 @@ export { encryptSymmetric128BitHexKeyUTF8, generateAsymmetricKeyPair } from "./encryption"; +export { + decryptIntegrationAuths, + decryptSecretApprovals, + decryptSecrets, + decryptSecretVersions +} from "./secret-encryption"; export { generateSrpServerKey, srpCheckClientProof } from "./srp"; diff --git a/backend/src/lib/secret/index.ts b/backend/src/lib/crypto/secret-encryption.ts similarity index 93% rename from backend/src/lib/secret/index.ts rename to backend/src/lib/crypto/secret-encryption.ts index dd23c318a..2e0492560 100644 --- a/backend/src/lib/secret/index.ts +++ b/backend/src/lib/crypto/secret-encryption.ts @@ -11,9 +11,8 @@ import { TSecretApprovalRequestsSecrets, TSecrets, TSecretVersions -} from "@app/db/schemas"; - -import { decryptAsymmetric } from "../crypto"; +} from "../../db/schemas"; +import { decryptAsymmetric } from "./encryption"; const DecryptedValuesSchema = z.object({ id: z.string(), @@ -42,15 +41,15 @@ const DecryptedSecretVersionsSchema = z.object({ original: SecretVersionsSchema }); -export const DecryptedSecretApprovalsSchema = z.object({ +const DecryptedSecretApprovalsSchema = z.object({ decrypted: DecryptedValuesSchema, original: SecretApprovalRequestsSecretsSchema }); -export type DecryptedSecret = z.infer; -export type DecryptedSecretVersions = z.infer; -export type DecryptedSecretApprovals = z.infer; -export type DecryptedIntegrationAuths = z.infer; +type DecryptedSecret = z.infer; +type DecryptedSecretVersions = z.infer; +type DecryptedSecretApprovals = z.infer; +type DecryptedIntegrationAuths = z.infer; type TLatestKey = TProjectKeys & { sender: { @@ -79,7 +78,7 @@ const decryptCipher = ({ }; const getDecryptedValues = (data: Array<{ ciphertext: string; iv: string; tag: string }>, key: string | Buffer) => { - const results = []; + const results: string[] = []; for (const { ciphertext, iv, tag } of data) { if (!ciphertext || !iv || !tag) { diff --git a/backend/src/services/project/project-queue.ts b/backend/src/services/project/project-queue.ts index 8e924af1a..5620a89c4 100644 --- a/backend/src/services/project/project-queue.ts +++ b/backend/src/services/project/project-queue.ts @@ -16,6 +16,12 @@ import { import { TSecretApprovalRequestDALFactory } from "@app/ee/services/secret-approval-request/secret-approval-request-dal"; import { TSecretApprovalRequestSecretDALFactory } from "@app/ee/services/secret-approval-request/secret-approval-request-secret-dal"; import { RequestState } from "@app/ee/services/secret-approval-request/secret-approval-request-types"; +import { + decryptIntegrationAuths, + decryptSecretApprovals, + decryptSecrets, + decryptSecretVersions +} from "@app/lib/crypto"; import { decryptAsymmetric, encryptSymmetric128BitHexKeyUTF8, @@ -23,12 +29,6 @@ import { infisicalSymmetricEncypt } from "@app/lib/crypto/encryption"; import { logger } from "@app/lib/logger"; -import { - decryptIntegrationAuths, - decryptSecretApprovals, - decryptSecrets, - decryptSecretVersions -} from "@app/lib/secret"; import { QueueJobs, QueueName, TQueueJobTypes, TQueueServiceFactory } from "@app/queue"; import { TIntegrationAuthDALFactory } from "../integration-auth/integration-auth-dal";