Skip to content

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

feat: add secretKey to audit log and secret read activity types

Dimitris Staratzis78d876fed9cb
diff --git a/backend/src/ee/services/audit-log/audit-log-clickhouse-dal.ts b/backend/src/ee/services/audit-log/audit-log-clickhouse-dal.ts
index 5b48038573..3f95da2739 100644
--- a/backend/src/ee/services/audit-log/audit-log-clickhouse-dal.ts
+++ b/backend/src/ee/services/audit-log/audit-log-clickhouse-dal.ts
@@ -514,6 +514,7 @@ export const clickhouseAuditLogDALFactory = (clickhouseClient: ClickHouseClient,
JSONExtractString(eventMetadata, 'environment') AS environment,
JSONExtractString(eventMetadata, 'secretPath') AS secretPath,
JSONExtractString(eventMetadata, 'secretId') AS secretId,
+ JSONExtractString(eventMetadata, 'secretKey') AS secretKey,
toUnixTimestamp64Milli(max(createdAt)) AS lastReadAt
FROM ${tableName}
WHERE orgId = {orgId:UUID}
@@ -523,7 +524,7 @@ export const clickhouseAuditLogDALFactory = (clickhouseClient: ClickHouseClient,
AND eventType IN ({eventTypes:Array(String)})
AND actor IN ({actors:Array(String)})
AND JSONExtractString(eventMetadata, 'environment') IN ({environments:Array(String)})
- GROUP BY actor, actorId, environment, secretPath, secretId
+ GROUP BY actor, actorId, environment, secretPath, secretId, secretKey
`;
try {
@@ -545,11 +546,14 @@ export const clickhouseAuditLogDALFactory = (clickhouseClient: ClickHouseClient,
format: "JSONEachRow"
});
- const rows = await result.json<Omit<TLastSecretRead, "lastReadAt"> & { secretId: string; lastReadAt: string }>();
+ const rows = await result.json<
+ Omit<TLastSecretRead, "lastReadAt"> & { secretId: string; secretKey: string; lastReadAt: string }
+ >();
return rows.map((row) => ({
...row,
secretId: row.secretId || null,
+ secretKey: row.secretKey || null,
lastReadAt: new Date(Number(row.lastReadAt))
}));
} catch (error) {
diff --git a/backend/src/ee/services/audit-log/audit-log-dal.ts b/backend/src/ee/services/audit-log/audit-log-dal.ts
index 61c38b848d..e32861a705 100644
--- a/backend/src/ee/services/audit-log/audit-log-dal.ts
+++ b/backend/src/ee/services/audit-log/audit-log-dal.ts
@@ -30,6 +30,7 @@ export type TLastSecretRead = {
environment: string;
secretPath: string;
secretId: string | null;
+ secretKey: string | null;
lastReadAt: Date;
};
@@ -463,9 +464,10 @@ export const auditLogDALFactory = (db: TDbClient) => {
db.raw(`"eventMetadata"->>'environment' as "environment"`),
db.raw(`"eventMetadata"->>'secretPath' as "secretPath"`),
db.raw(`"eventMetadata"->>'secretId' as "secretId"`),
+ db.raw(`"eventMetadata"->>'secretKey' as "secretKey"`),
db.raw(`MAX("createdAt") as "lastReadAt"`)
)
- .groupByRaw("1, 2, 3, 4, 5")
+ .groupByRaw("1, 2, 3, 4, 5, 6")
.timeout(1000 * 120);
return rows as unknown as TLastSecretRead[];
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 fa80b09333..5c9904c33c 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
@@ -40,6 +40,7 @@ const read = (overrides: Partial<TLastSecretRead>): TLastSecretRead => ({
environment: "prod",
secretPath: "/shared",
secretId: null,
+ secretKey: null,
lastReadAt: new Date("2026-10-10T00:00:00.000Z"),
...overrides
});
@@ -79,7 +80,21 @@ describe("classifySecretReads", () => {
});
test("ignores a single read of an unrelated secret in the same folder", () => {
- expect(classify([read({ secretId: "unrelated" })])).toBeUndefined();
+ expect(classify([read({ secretId: "unrelated", secretKey: "UNRELATED" })])).toBeUndefined();
+ });
+
+ test("counts a single read by name through an import, even when it returned a replicated copy", () => {
+ expect(
+ classify([
+ read({ environment: "dev", secretPath: "/consumer", secretId: "replicated-copy", secretKey: "DB_PASS" })
+ ])?.status
+ ).toBe(SecretReadStatus.Read);
+ });
+
+ test("ignores a single read of a different name in a folder that imports the secret", () => {
+ expect(
+ classify([read({ environment: "dev", secretPath: "/consumer", secretId: "other", secretKey: "OTHER_KEY" })])
+ ).toBeUndefined();
});
test("treats a read of a parent folder as a possible read", () => {
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 51fdcb598f..6299d78d37 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
@@ -48,6 +48,7 @@ export const computeSecretReach = (secret: TReachSecret, graph: TSecretReachGrap
}
const reach: TSecretReach = {
+ secretKey: secret.key,
secretIds,
locations: new Set(),
parentLocations: new Set(),
@@ -74,16 +75,19 @@ export const computeSecretReach = (secret: TReachSecret, graph: TSecretReachGrap
return reach;
};
-export const indexSecretReads = (reads: TLastSecretRead[]) => ({
- bySecretId: groupBy(
- reads.filter((read) => read.secretId),
- (read) => read.secretId as string
- ),
- byLocation: groupBy(
- reads.filter((read) => !read.secretId),
- (read) => toLocationKey(read)
- )
-});
+export const indexSecretReads = (reads: TLastSecretRead[]) => {
+ const singleReads = reads.filter((read) => read.secretId);
+ return {
+ bySecretId: groupBy(singleReads, (read) => read.secretId as string),
+ // A single read by name through a replication import returns a copy with its own ID, so single reads are
+ // also matched by name at the location they were made.
+ byLocationAndKey: groupBy(singleReads, (read) => `${toLocationKey(read)}:${read.secretKey}`),
+ byLocation: groupBy(
+ reads.filter((read) => !read.secretId),
+ (read) => toLocationKey(read)
+ )
+ };
+};
// Reads before trackedSince are ignored: the secret, or the path it lives at, did not exist yet.
export const classifySecretReads = (
@@ -105,7 +109,10 @@ export const classifySecretReads = (
};
reach.secretIds.forEach((secretId) => record(SecretReadStatus.Read, reads.bySecretId[secretId]));
- reach.locations.forEach((location) => record(SecretReadStatus.Read, reads.byLocation[location]));
+ reach.locations.forEach((location) => {
+ record(SecretReadStatus.Read, reads.byLocation[location]);
+ record(SecretReadStatus.Read, reads.byLocationAndKey[`${location}:${reach.secretKey}`]);
+ });
reach.parentLocations.forEach((location) => record(SecretReadStatus.PossiblyRead, reads.byLocation[location]));
return activity;
};
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 126bfec0fd..27d69a9441 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
@@ -61,7 +61,7 @@ type TSecretReadActivityServiceFactoryDep = {
folderDAL: Pick<TSecretFolderDALFactory, "findByProjectId">;
folderVersionDAL: Pick<TSecretFolderVersionDALFactory, "find">;
projectEnvDAL: Pick<TProjectEnvDALFactory, "find">;
- secretImportDAL: Pick<TSecretImportDALFactory, "findByFolderIds">;
+ secretImportDAL: Pick<TSecretImportDALFactory, "find">;
secretV2BridgeDAL: Pick<TSecretV2BridgeDALFactory, "find" | "findSecretReferencesByProjectId">;
kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;
keyStore: Pick<TKeyStoreFactory, "setItemWithExpiry" | "getItem" | "ttl">;
@@ -184,9 +184,9 @@ export const secretReadActivityServiceFactory = ({
return localReferences.get(secret.id) as string[];
};
- const importsByLocation = groupBy(
- await secretImportDAL.findByFolderIds(folders.map((folder) => folder.id)),
- (secretImport) => toLocationKey({ environment: secretImport.importEnv.id, secretPath: secretImport.importPath })
+ // Replication imports are included: a replicated copy is checked against the reader's access to its source.
+ const importsByLocation = groupBy(await secretImportDAL.find({ projectId }), (secretImport) =>
+ toLocationKey({ environment: secretImport.importEnv.id, secretPath: secretImport.importPath })
);
const secretById = new Map([...secretsByFolder.values()].flat().map((secret) => [secret.id, secret]));
const graph: TSecretReachGraph = {
diff --git a/backend/src/ee/services/secret-read-activity/secret-read-activity-types.ts b/backend/src/ee/services/secret-read-activity/secret-read-activity-types.ts
index bfb8bd2f90..655613c9ce 100644
--- a/backend/src/ee/services/secret-read-activity/secret-read-activity-types.ts
+++ b/backend/src/ee/services/secret-read-activity/secret-read-activity-types.ts
@@ -19,6 +19,7 @@ export type TSecretReadActivity = {
// Everything whose read hands over this secret's value: the secret, every secret that references it,
// and every folder that holds one of those or imports one that does.
export type TSecretReach = {
+ secretKey?: string;
secretIds: Set<string>;
locations: Set<string>;
parentLocations: Set<string>;