awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 19:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1832 from Infisical/daniel/fix-secret-expand-with-recursive

Browse Source 
Fix: Secret expansion with recursive mode enabled
This commit is contained in:
Daniel Hougaard
2024-05-16 02:33:28 +02:00
committed by GitHub
parent 6b5cafa631 2f92719771
commit 58c1d3b0ac
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/secret/secret-fns.ts
+1 -1
View File
@@ -353,7 +353,7 @@ export const interpolateSecrets = ({ projectId, secretEncKey, secretDAL, folderD
}; };
export const decryptSecretRaw = ( export const decryptSecretRaw = (
secret: TSecrets & { workspace: string; environment: string; secretPath?: string }, secret: TSecrets & { workspace: string; environment: string; secretPath: string },
key: string key: string
) => { ) => {
const secretKey = decryptSymmetric128BitHexKeyUTF8({ const secretKey = decryptSymmetric128BitHexKeyUTF8({
backend/src/services/secret/secret-service.ts
+21 -10
View File
@@ -285,7 +285,7 @@ export const secretServiceFactory = ({
await snapshotService.performSnapshot(folderId); await snapshotService.performSnapshot(folderId);
await secretQueueService.syncSecrets({ secretPath: path, projectId, environment }); await secretQueueService.syncSecrets({ secretPath: path, projectId, environment });
// TODO(akhilmhdh-pg): licence check, posthog service and snapshot // TODO(akhilmhdh-pg): licence check, posthog service and snapshot
return { ...secret[0], environment, workspace: projectId, tags }; return { ...secret[0], environment, workspace: projectId, tags, secretPath: path };
}; };
const updateSecret = async ({ const updateSecret = async ({
@@ -415,7 +415,7 @@ export const secretServiceFactory = ({
await snapshotService.performSnapshot(folderId); await snapshotService.performSnapshot(folderId);
await secretQueueService.syncSecrets({ secretPath: path, projectId, environment }); await secretQueueService.syncSecrets({ secretPath: path, projectId, environment });
// TODO(akhilmhdh-pg): licence check, posthog service and snapshot // TODO(akhilmhdh-pg): licence check, posthog service and snapshot
return { ...updatedSecret[0], workspace: projectId, environment }; return { ...updatedSecret[0], workspace: projectId, environment, secretPath: path };
}; };
const deleteSecret = async ({ const deleteSecret = async ({
@@ -484,7 +484,7 @@ export const secretServiceFactory = ({
await secretQueueService.syncSecrets({ secretPath: path, projectId, environment }); await secretQueueService.syncSecrets({ secretPath: path, projectId, environment });
// TODO(akhilmhdh-pg): licence check, posthog service and snapshot // TODO(akhilmhdh-pg): licence check, posthog service and snapshot
return { ...deletedSecret[0], _id: deletedSecret[0].id, workspace: projectId, environment }; return { ...deletedSecret[0], _id: deletedSecret[0].id, workspace: projectId, environment, secretPath: path };
}; };
const getSecrets = async ({ const getSecrets = async ({
@@ -681,7 +681,8 @@ export const secretServiceFactory = ({
return { return {
...importedSecrets[i].secrets[j], ...importedSecrets[i].secrets[j],
workspace: projectId, workspace: projectId,
environment: importedSecrets[i].environment environment: importedSecrets[i].environment,
secretPath: importedSecrets[i].secretPath
}; };
} }
} }
@@ -689,7 +690,7 @@ export const secretServiceFactory = ({
} }
if (!secret) throw new BadRequestError({ message: "Secret not found" }); if (!secret) throw new BadRequestError({ message: "Secret not found" });
return { ...secret, workspace: projectId, environment }; return { ...secret, workspace: projectId, environment, secretPath: path };
}; };
const createManySecret = async ({ const createManySecret = async ({
@@ -984,6 +985,7 @@ export const secretServiceFactory = ({
secretKey: string; secretKey: string;
secretValue: string; secretValue: string;
secretComment?: string; secretComment?: string;
secretPath: string;
}[] }[]
) => { ) => {
const secretRecord: Record< const secretRecord: Record<
@@ -996,7 +998,8 @@ export const secretServiceFactory = ({
> = {}; > = {};
secretBatch.forEach((decryptedSecret) => { secretBatch.forEach((decryptedSecret) => {
secretRecord[decryptedSecret.secretKey] = { const uniqueKey = `${decryptedSecret.secretPath}/${decryptedSecret.secretKey}`;
secretRecord[uniqueKey] = {
value: decryptedSecret.secretValue, value: decryptedSecret.secretValue,
comment: decryptedSecret.secretComment comment: decryptedSecret.secretComment
}; };
@@ -1005,8 +1008,9 @@ export const secretServiceFactory = ({
await expandSecrets(secretRecord); await expandSecrets(secretRecord);
secretBatch.forEach((decryptedSecret, index) => { secretBatch.forEach((decryptedSecret, index) => {
const uniqueKey = `${decryptedSecret.secretPath}/${decryptedSecret.secretKey}`;
// eslint-disable-next-line no-param-reassign // eslint-disable-next-line no-param-reassign
secretBatch[index].secretValue = secretRecord[decryptedSecret.secretKey].value; secretBatch[index].secretValue = secretRecord[uniqueKey].value;
}); });
}; };
@@ -1055,6 +1059,7 @@ export const secretServiceFactory = ({
includeImports, includeImports,
version version
}); });
return decryptSecretRaw(secret, botKey); return decryptSecretRaw(secret, botKey);
}; };
@@ -1227,7 +1232,9 @@ export const secretServiceFactory = ({
await snapshotService.performSnapshot(secrets[0].folderId); await snapshotService.performSnapshot(secrets[0].folderId);
await secretQueueService.syncSecrets({ secretPath, projectId, environment }); await secretQueueService.syncSecrets({ secretPath, projectId, environment });
return secrets.map((secret) => decryptSecretRaw({ ...secret, workspace: projectId, environment }, botKey)); return secrets.map((secret) =>
decryptSecretRaw({ ...secret, workspace: projectId, environment, secretPath }, botKey)
);
}; };
const updateManySecretsRaw = async ({ const updateManySecretsRaw = async ({
@@ -1279,7 +1286,9 @@ export const secretServiceFactory = ({
await snapshotService.performSnapshot(secrets[0].folderId); await snapshotService.performSnapshot(secrets[0].folderId);
await secretQueueService.syncSecrets({ secretPath, projectId, environment }); await secretQueueService.syncSecrets({ secretPath, projectId, environment });
return secrets.map((secret) => decryptSecretRaw({ ...secret, workspace: projectId, environment }, botKey)); return secrets.map((secret) =>
decryptSecretRaw({ ...secret, workspace: projectId, environment, secretPath }, botKey)
);
}; };
const deleteManySecretsRaw = async ({ const deleteManySecretsRaw = async ({
@@ -1313,7 +1322,9 @@ export const secretServiceFactory = ({
await snapshotService.performSnapshot(secrets[0].folderId); await snapshotService.performSnapshot(secrets[0].folderId);
await secretQueueService.syncSecrets({ secretPath, projectId, environment }); await secretQueueService.syncSecrets({ secretPath, projectId, environment });
return secrets.map((secret) => decryptSecretRaw({ ...secret, workspace: projectId, environment }, botKey)); return secrets.map((secret) =>
decryptSecretRaw({ ...secret, workspace: projectId, environment, secretPath }, botKey)
);
}; };
const getSecretVersions = async ({ const getSecretVersions = async ({