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

feat: changed expand secret factory to iterative solution

Browse Source
This commit is contained in:
=
2024-08-30 10:52:46 +05:30
parent 8f461bf50c
commit 55b36b033e
1 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts
+48 -52
View File
@@ -400,7 +400,7 @@ export const expandSecretReferencesFactory = ({
const decryptedSecret = secrets.reduce<Record<string, string>>((prev, secret) => { const decryptedSecret = secrets.reduce<Record<string, string>>((prev, secret) => {
// eslint-disable-next-line // eslint-disable-next-line
prev[secret.key] = decryptSecret(secret.encryptedValue) || ""; prev[secret.key] = decryptSecret(secret.encryptedValue) || "";
return prev; return prev;
}, {}); }, {});
@@ -409,64 +409,60 @@ export const expandSecretReferencesFactory = ({
return secretCache[cacheKey][secretKey] || ""; return secretCache[cacheKey][secretKey] || "";
}; };
const recursivelyExpandSecret = async ({ const recursivelyExpandSecret = async (dto: { value?: string; secretPath: string; environment: string }) => {
value,
secretPath,
environment,
depth = 1
}: {
value?: string;
secretPath: string;
environment: string;
depth?: number;
}) => {
if (!value) return ""; if (!value) return "";
if (depth > MAX_SECRET_REFERENCE_DEPTH) return "";
const refs = value.match(INTERPOLATION_SYNTAX_REG); const stack = [{ ...dto, depth: 0 }];
let expandedValue = value; let expandedValue = dto.value;
if (refs) {
for (const interpolationSyntax of refs) {
const interpolationKey = interpolationSyntax.slice(2, interpolationSyntax.length - 1);
const entities = interpolationKey.trim().split(".");
if (entities.length === 1) { while (stack.length) {
const [secretKey] = entities; const { value, secretPath, environment, depth } = stack.pop()!;
// eslint-disable-next-line
if (depth > MAX_SECRET_REFERENCE_DEPTH) continue;
const refs = value.match(INTERPOLATION_SYNTAX_REG);
if (refs) {
for (const interpolationSyntax of refs) {
const interpolationKey = interpolationSyntax.slice(2, interpolationSyntax.length - 1);
const entities = interpolationKey.trim().split(".");
// eslint-disable-next-line // eslint-disable-next-line
let referenceValue = await fetchSecret(environment, secretPath, secretKey); if (!entities.length) continue;
if (INTERPOLATION_SYNTAX_REG.test(referenceValue)) {
// eslint-disable-next-line
referenceValue = await recursivelyExpandSecret({
environment,
secretPath,
value: referenceValue,
depth: depth + 1
});
}
const cacheKey = getCacheUniqueKey(environment, secretPath);
secretCache[cacheKey][secretKey] = referenceValue;
expandedValue = expandedValue.replaceAll(interpolationSyntax, referenceValue);
}
if (entities.length > 1) { if (entities.length === 1) {
const secretReferenceEnvironment = entities[0]; const [secretKey] = entities;
const secretReferencePath = path.join("/", ...entities.slice(1, entities.length - 1));
const secretReferenceKey = entities[entities.length - 1];
// eslint-disable-next-line
let referenceValue = await fetchSecret(secretReferenceEnvironment, secretReferencePath, secretReferenceKey);
if (INTERPOLATION_SYNTAX_REG.test(referenceValue)) {
// eslint-disable-next-line // eslint-disable-next-line
referenceValue = await recursivelyExpandSecret({ const referedValue = await fetchSecret(environment, secretPath, secretKey);
environment: secretReferenceEnvironment, const cacheKey = getCacheUniqueKey(environment, secretPath);
secretPath: secretReferencePath, secretCache[cacheKey][secretKey] = referedValue;
value: referenceValue, if (INTERPOLATION_SYNTAX_REG.test(referedValue)) {
depth: depth + 1 stack.push({
}); value: referedValue,
secretPath,
environment,
depth: depth + 1
});
}
expandedValue = expandedValue.replaceAll(interpolationSyntax, referedValue);
} else {
const secretReferenceEnvironment = entities[0];
const secretReferencePath = path.join("/", ...entities.slice(1, entities.length - 1));
const secretReferenceKey = entities[entities.length - 1];
// eslint-disable-next-line
let referedValue = await fetchSecret(secretReferenceEnvironment, secretReferencePath, secretReferenceKey);
const cacheKey = getCacheUniqueKey(secretReferenceEnvironment, secretReferencePath);
secretCache[cacheKey][secretReferenceKey] = referedValue;
if (INTERPOLATION_SYNTAX_REG.test(referedValue)) {
stack.push({
value: referedValue,
secretPath: secretReferencePath,
environment: secretReferenceEnvironment,
depth: depth + 1
});
}
expandedValue = expandedValue.replaceAll(interpolationSyntax, referedValue);
} }
const cacheKey = getCacheUniqueKey(secretReferenceEnvironment, secretReferencePath);
secretCache[cacheKey][secretReferenceKey] = referenceValue;
expandedValue = expandedValue.replaceAll(interpolationSyntax, referenceValue);
} }
} }
} }