Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

cap secret reach at the reference expansion depth and expire actor details with the project cache

DimitrisStaratzis87638f0f4f06
diff --git a/backend/src/ee/services/secret-read-activity/secret-read-activity-fns.test.ts b/backend/src/ee/services/secret-read-activity/secret-read-activity-fns.test.ts
index 5468ee4ec2..a72138c9b5 100644
--- a/backend/src/ee/services/secret-read-activity/secret-read-activity-fns.test.ts
+++ b/backend/src/ee/services/secret-read-activity/secret-read-activity-fns.test.ts
@@ -8,6 +8,7 @@ import {
ProjectPermissionSub
} from "@app/ee/services/permission/project-permission";
import { ActorType } from "@app/services/auth/auth-type";
+import { MAX_SECRET_REFERENCE_DEPTH } from "@app/services/secret-v2-bridge/secret-reference-fns";
import {
classifySecretReads,
@@ -91,6 +92,23 @@ describe("computeSecretReach", () => {
expect([...reach.secretIds].sort()).toEqual([connection.id, dbPass.id, dbUrl.id].sort());
expect([...reach.folderIds].sort()).toEqual(["consumer", "edge", "nested", "shared"]);
});
+
+ test("stops at the depth a read expands references to", () => {
+ const chain: TReachSecret[] = Array.from({ length: MAX_SECRET_REFERENCE_DEPTH + 3 }, (_, index) => ({
+ id: `s${index}`,
+ folderId: `f${index}`,
+ key: `S${index}`
+ }));
+ const reach = computeSecretReach(chain[0], {
+ getReferencers: (secret) => {
+ const next = chain[chain.indexOf(secret) + 1];
+ return next ? [next] : [];
+ },
+ getImporterFolderIds: () => []
+ });
+ expect(reach.secretIds.has(chain[MAX_SECRET_REFERENCE_DEPTH + 1].id)).toBe(true);
+ expect(reach.secretIds.has(chain[MAX_SECRET_REFERENCE_DEPTH + 2].id)).toBe(false);
+ });
});
describe("classifySecretReads", () => {
diff --git a/backend/src/ee/services/secret-read-activity/secret-read-activity-fns.ts b/backend/src/ee/services/secret-read-activity/secret-read-activity-fns.ts
index b143168b2f..1cc2e9b81e 100644
--- a/backend/src/ee/services/secret-read-activity/secret-read-activity-fns.ts
+++ b/backend/src/ee/services/secret-read-activity/secret-read-activity-fns.ts
@@ -7,6 +7,7 @@ import { TProjectEnvDALFactory } from "@app/services/project-env/project-env-dal
import { getPredefinedRoles } from "@app/services/project-role/project-role-fns";
import { TSecretFolderDALFactory } from "@app/services/secret-folder/secret-folder-dal";
import { buildFolderIdMap, buildFolderPath } from "@app/services/secret-folder/secret-folder-fns";
+import { MAX_SECRET_REFERENCE_DEPTH } from "@app/services/secret-v2-bridge/secret-reference-fns";
import {
SecretReadNotJudgedReason,
@@ -85,9 +86,13 @@ export const computeSecretReach = (secret: TReachSecret, graph: TSecretReachGrap
const secretIds = new Set([secret.id]);
const folderIds = new Set([secret.folderId]);
- const pendingSecrets = [secret];
- while (pendingSecrets.length) {
- for (const referencer of graph.getReferencers(pendingSecrets.pop() as TReachSecret)) {
+ // A read expands references at most MAX_SECRET_REFERENCE_DEPTH + 1 levels down, so a referencer further away never
+ // returns this secret. Levels are walked in order, so each referencer is reached at its shortest distance.
+ let pendingSecrets = [secret];
+ for (let depth = 0; depth <= MAX_SECRET_REFERENCE_DEPTH && pendingSecrets.length; depth += 1) {
+ const referencers = pendingSecrets.flatMap((pending) => graph.getReferencers(pending));
+ pendingSecrets = [];
+ for (const referencer of referencers) {
// A personal secret is left out of folder reads that skip personal values, so only a read of the personal secret
// itself counts, not of its folder. Nothing referencing it is followed either: a reference to its key resolves to
// the shared secret unless the reader expands their own overrides, which records exactly what resolved.
diff --git a/backend/src/ee/services/secret-read-activity/secret-read-activity-service.ts b/backend/src/ee/services/secret-read-activity/secret-read-activity-service.ts
index 49bbe28c07..24ff234789 100644
--- a/backend/src/ee/services/secret-read-activity/secret-read-activity-service.ts
+++ b/backend/src/ee/services/secret-read-activity/secret-read-activity-service.ts
@@ -708,13 +708,14 @@ export const secretReadActivityServiceFactory = ({
message: `No unused access found for ${actorType} '${actorId}' in this project`
});
}
- // An actor past those cached in full is scanned for on its own, and kept for the same day.
+ // An actor past those cached in full is scanned for on its own, and kept only until the project result expires, so
+ // its secrets never outlive the counts shown beside them.
const secretIds =
details[actorId] ??
(await withCache({
keyStore,
key: KeyStorePrefixes.InsightsCache(projectId, `unused-access:${actorType}:${actorId}`),
- ttlSeconds: KeyStoreTtls.InsightsUnusedAccessCacheInSeconds,
+ ttlSeconds: Math.max(remainingTTL, 1),
fetcher: async () =>
(await $tallyUnusedAccess(projectId, actor.orgId)).tallies.get(actorId)?.unusedSecretIds ?? []
}));
diff --git a/backend/src/services/secret-v2-bridge/secret-reference-fns.ts b/backend/src/services/secret-v2-bridge/secret-reference-fns.ts
index cccb4e497e..32c27a71d8 100644
--- a/backend/src/services/secret-v2-bridge/secret-reference-fns.ts
+++ b/backend/src/services/secret-v2-bridge/secret-reference-fns.ts
@@ -125,7 +125,7 @@ type TInterpolateSecretArg = {
// A cross-project secret carries no id: only this project's secrets are reported to onSecretExpanded.
type TCachedReferencedSecret = { id?: string; value: string; tags: string[]; exists: boolean };
-const MAX_SECRET_REFERENCE_DEPTH = 10;
+export const MAX_SECRET_REFERENCE_DEPTH = 10;
export const expandSecretReferencesFactory = ({
projectId,
decryptSecretValue: decryptSecret,