awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix secret imports fetch secret value, and reserved folders not being computed correctly

Browse Source
This commit is contained in:
Carlos Monastyrski
2025-10-15 17:26:03 -03:00
parent 0d0f67dd35
commit 5172735570
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/services/secret-import/secret-import-fns.ts
View File

@@ -258,10 +258,6 @@ export const fnSecretsV2FromImports = async ({
})[];
}[] = [{ secretImports: rootSecretImports, depth: 0, parentImportedSecrets: [] }];
const processedSecretImports = await processReservedImports(rootSecretImports, secretImportDAL);
stack[0] = { secretImports: processedSecretImports, depth: 0, parentImportedSecrets: [] };
const processedImports: TSecretImportSecretsV2[] = [];
while (stack.length) {
@@ -299,7 +295,9 @@ export const fnSecretsV2FromImports = async ({
);
const importedSecretsGroupByFolderId = groupBy(importedSecrets, (i) => i.folderId);
sanitizedImports.forEach(({ importPath, importEnv }) => {
const processedBatchImports = await processReservedImports(sanitizedImports, secretImportDAL);
processedBatchImports.forEach(({ importPath, importEnv }) => {
cyclicDetector.add(getImportUniqKey(importEnv.slug, importPath));
});
// now we need to check recursively deeper imports made inside other imports
@@ -308,7 +306,7 @@ export const fnSecretsV2FromImports = async ({
const deeperImportsGroupByFolderId = groupBy(deeperImports, (i) => i.folderId);
const isFirstIteration = !processedImports.length;
sanitizedImports.forEach(({ importPath, importEnv, id, folderId }, i) => {
processedBatchImports.forEach(({ importPath, importEnv, id, folderId }, i) => {
const sourceImportFolder = importedFolderGroupBySourceImport[`${importEnv.id}-${importPath}`]?.[0];
const secretsWithDuplicate = (importedSecretsGroupByFolderId?.[importedFolders?.[i]?.id as string] || [])
.filter((item) =>

25
frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretImportListView/SecretImportListView.tsx
View File

@@ -33,11 +33,15 @@ type TImportedSecrets = Array<{
}>;
export const computeImportedSecretRows = (
importedSecEnv: string,
importedSecPath: string,
secretImport: TSecretImport,
importSecrets: TImportedSecrets = [],
secrets: SecretV3RawSanitized[] = []
secrets: SecretV3RawSanitized[] = [],
replicatedFolder?: TSecretImport
) => {
const importedSecEnv = replicatedFolder?.importEnv.slug ?? secretImport.importEnv.slug;
const importedSecPath = replicatedFolder?.importPath ?? secretImport.importPath;
const overrideEnv = secretImport.isReserved ? secretImport.importEnv.slug : undefined;
const overridePath = secretImport.isReserved ? secretImport.importPath : undefined;
const importedSecIndex = importSecrets.findIndex(
({ secretPath, environmentInfo }) =>
secretPath === importedSecPath && importedSecEnv === environmentInfo.slug
@@ -78,8 +82,8 @@ export const computeImportedSecretRows = (
importedSecretEntries.push({
key,
value,
environment: importedSec.environmentInfo.slug,
secretPath: importedSec.secretPath,
environment: overrideEnv ?? importedSec.environmentInfo.slug,
secretPath: overridePath ?? importedSec.secretPath,
overridden: overridenSec?.[key],
isEmpty
});
@@ -210,7 +214,9 @@ export const SecretImportListView = ({
<SortableContext items={items} strategy={verticalListSortingStrategy}>
{items?.map((item) => {
// TODO(akhilmhdh): change this and pass this whole object instead of one by one
const replicatedFolder = item.isReserved ? getImportReplicatedFolder(item.importPath) : undefined;
const replicatedFolder = item.isReserved
? getImportReplicatedFolder(item.importPath)
: undefined;
return (
<SecretImportItem
searchTerm={searchTerm}
@@ -219,10 +225,11 @@ export const SecretImportListView = ({
onExpandReplicateSecrets={handleOpenReplicationSecrets}
secretImport={item}
importedSecrets={computeImportedSecretRows(
replicatedFolder?.importEnv.slug ?? item.importEnv.slug,
replicatedFolder?.importPath ?? item.importPath,
importedSecrets
item,
importedSecrets,
[],
// secrets scott - now that secrets are paginated we are not showing if they are overridden (yet?)
replicatedFolder
)}
secretPath={secretPath}
environment={environment}