Skip to content

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

fix: record only returned secrets for personal-override reads and keep the read stream flushing

Dimitris Staratzis0bb72a52c577
diff --git a/backend/src/ee/services/secret-read-activity/secret-read-activity-queue.ts b/backend/src/ee/services/secret-read-activity/secret-read-activity-queue.ts
index 48ad070ed8..3ae3c7780c 100644
--- a/backend/src/ee/services/secret-read-activity/secret-read-activity-queue.ts
+++ b/backend/src/ee/services/secret-read-activity/secret-read-activity-queue.ts
@@ -38,7 +38,8 @@ const SECRET_READ_GATE_TTL_SECONDS = 25 * 60 * 60;
const SECRET_READ_STREAM_MAX_LENGTH = 300_000;
const SECRET_READ_FLUSH_BATCH_SIZE = 1000;
const SECRET_READ_FLUSH_MAX_ENTRIES = 50_000;
-const SECRET_READ_CONSUMER_LOCK_TTL_MS = 60_000;
+// Covers the cron manager's default handler timeout, so a slow flush still holds the lock until it finishes.
+const SECRET_READ_CONSUMER_LOCK_TTL_MS = 5 * 60 * 1000;
// The cap counts entries, not bytes, so this bounds an entry at about 3.7 KB and a full stream at about 1.1 GB.
const SECRET_READ_STREAM_ENTRY_MAX_SECRETS = 100;
@@ -143,6 +144,7 @@ export const secretReadActivityQueueServiceFactory = ({
isFiltered,
includeImports,
expandSecretReferences,
+ includesPersonalOverrides,
notModified,
secrets,
imports = []
@@ -150,7 +152,8 @@ export const secretReadActivityQueueServiceFactory = ({
if (!$isTrackedReader(actor)) return;
try {
- if (!isFiltered && includeImports && expandSecretReferences) {
+ // A personal override replaces the shared value, so a read that returns overrides only covers what it returned.
+ if (!isFiltered && includeImports && expandSecretReferences && !includesPersonalOverrides) {
const normalizedPath = normalizeSecretPath(secretPath);
await $record(
{ actor, actorId, projectId },
@@ -313,7 +316,10 @@ export const secretReadActivityQueueServiceFactory = ({
// eslint-disable-next-line no-await-in-loop
rows.push(...(await $resolveProjectReads(projectId, projectReads)));
}
- await secretReadActivityDAL.upsertLastReads(rows);
+ // A read that waited in the stream past the window counts for nothing, and its month's partition may already be
+ // dropped, so writing it would fail the whole batch on every retry.
+ const windowStart = getReadActivityWindowStart();
+ await secretReadActivityDAL.upsertLastReads(rows.filter((row) => row.lastReadAt >= windowStart));
await keyStore.streamTrim(KeyStorePrefixes.SecretReadActivityStream, lastId, true);
logger.info(`secret-read-activity: Flushed read stream [entries=${entries.length}] [rows=${rows.length}]`);
};
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 831232ee5e..82a9ccea2e 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
@@ -60,6 +60,7 @@ export type TRecordBulkSecretReadDTO = TSecretReader & {
isFiltered: boolean;
includeImports: boolean;
expandSecretReferences: boolean;
+ includesPersonalOverrides?: boolean;
notModified?: boolean;
secrets: TReturnedSecret[];
imports?: { secrets: TReturnedSecret[] }[];
diff --git a/backend/src/server/routes/v4/secret-router.ts b/backend/src/server/routes/v4/secret-router.ts
index 4fad05566c..6667a43d16 100644
--- a/backend/src/server/routes/v4/secret-router.ts
+++ b/backend/src/server/routes/v4/secret-router.ts
@@ -238,6 +238,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
isFiltered: Boolean(req.query.tagSlugs?.length || req.query.metadataFilter?.length),
includeImports: req.query.includeImports,
expandSecretReferences: req.query.expandSecretReferences,
+ includesPersonalOverrides: req.query.includePersonalOverrides,
notModified,
secrets,
imports