Skip to content

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

fix(secrets): address review feedback on secret events

Calvin7df514973d18
diff --git a/backend/e2e-test/event-outbox.spec.ts b/backend/e2e-test/event-outbox.spec.ts
index 20bcaaf556..aa2f06d5f1 100644
--- a/backend/e2e-test/event-outbox.spec.ts
+++ b/backend/e2e-test/event-outbox.spec.ts
@@ -54,6 +54,21 @@ describe("event outbox (postgres)", () => {
expect(await rowsFor(`${CONSUMER}-other`)).toHaveLength(1);
});
+ // A bulk write emits one row per secret, past the 1000-row chunk insertEvents splits on.
+ test("insertEvents writes a batch larger than one chunk in the caller's transaction", async () => {
+ await insert(Array.from({ length: 1001 }, () => makeRow()));
+
+ expect(await rowsFor()).toHaveLength(1001);
+ });
+
+ test("insertEvents keeps nothing from a batch whose second chunk fails", async () => {
+ const rows = Array.from({ length: 1001 }, () => makeRow());
+ rows[1000] = makeRow({ eventId: "not-a-uuid" });
+
+ await expect(insert(rows)).rejects.toThrow();
+ expect(await rowsFor()).toHaveLength(0);
+ });
+
test("claimBatch hands each row to exactly one concurrent claimer, in id order", async () => {
await insert(Array.from({ length: 6 }, () => makeRow()));
diff --git a/backend/src/ee/services/honey-token/honey-token-service.ts b/backend/src/ee/services/honey-token/honey-token-service.ts
index d2a8dd4bbe..9f962b5efe 100644
--- a/backend/src/ee/services/honey-token/honey-token-service.ts
+++ b/backend/src/ee/services/honey-token/honey-token-service.ts
@@ -444,10 +444,13 @@ export const honeyTokenServiceFactory = ({
const { projectId } = honeyToken;
const [folderWithEnv] = await folderDAL.findSecretPathByFolderIds(projectId, [honeyToken.folderId]);
- if (!folderWithEnv) {
- throw new NotFoundError({ message: `Folder of honey token with ID "${honeyTokenId}" not found` });
- }
- const eventScope = { projectId, environment: folderWithEnv.environmentSlug, secretPath: folderWithEnv.path };
+ // No folder resolves while the environment is pending deletion, and update and revoke must still work
+ // then. The empty scope fails the event schema, so that event is dropped rather than misrouted.
+ const eventScope = {
+ projectId,
+ environment: folderWithEnv?.environmentSlug ?? "",
+ secretPath: folderWithEnv?.path ?? "/"
+ };
const { permission: updatePermission } = await permissionService.getProjectPermission({
actor: actor.type,
actorId: actor.id,
@@ -643,10 +646,13 @@ export const honeyTokenServiceFactory = ({
const { projectId } = honeyToken;
const [folderWithEnv] = await folderDAL.findSecretPathByFolderIds(projectId, [honeyToken.folderId]);
- if (!folderWithEnv) {
- throw new NotFoundError({ message: `Folder of honey token with ID "${honeyTokenId}" not found` });
- }
- const eventScope = { projectId, environment: folderWithEnv.environmentSlug, secretPath: folderWithEnv.path };
+ // No folder resolves while the environment is pending deletion, and update and revoke must still work
+ // then. The empty scope fails the event schema, so that event is dropped rather than misrouted.
+ const eventScope = {
+ projectId,
+ environment: folderWithEnv?.environmentSlug ?? "",
+ secretPath: folderWithEnv?.path ?? "/"
+ };
const { permission: revokePermission } = await permissionService.getProjectPermission({
actor: actor.type,
actorId: actor.id,
diff --git a/backend/src/ee/services/secret-replication/secret-replication-service.ts b/backend/src/ee/services/secret-replication/secret-replication-service.ts
index 2a883b5186..09f6d09915 100644
--- a/backend/src/ee/services/secret-replication/secret-replication-service.ts
+++ b/backend/src/ee/services/secret-replication/secret-replication-service.ts
@@ -69,7 +69,7 @@ type TSecretReplicationServiceFactoryDep = {
secretImportDAL: Pick<TSecretImportDALFactory, "find" | "updateById" | "findByFolderIds" | "findByIds">;
folderDAL: Pick<
TSecretFolderDALFactory,
- "findSecretPathByFolderIds" | "findBySecretPath" | "create" | "findOne" | "findByManySecretPath"
+ "findSecretPathByFolderIds" | "findBySecretPath" | "create" | "findOne" | "findByManySecretPath" | "transaction"
>;
secretVersionTagDAL: Pick<TSecretVersionTagDALFactory, "find" | "insertMany">;
secretVersionV2TagBridgeDAL: Pick<TSecretVersionV2TagDALFactory, "find" | "insertMany">;
@@ -380,20 +380,29 @@ export const secretReplicationServiceFactory = ({
isReserved: true
});
if (!destinationReplicationFolder) {
- destinationReplicationFolder = await folderDAL.create({
- parentId: destinationFolder.id,
- name: destinationReplicationFolderName,
- envId: destinationFolder.envId,
- isReserved: true
+ // One transaction, so a folder never exists without its event: a retry finds the folder and
+ // would not emit again.
+ destinationReplicationFolder = await folderDAL.transaction(async (tx) => {
+ const createdFolder = await folderDAL.create(
+ {
+ parentId: destinationFolder.id,
+ name: destinationReplicationFolderName,
+ envId: destinationFolder.envId,
+ isReserved: true
+ },
+ tx
+ );
+ await eventEmitter.emit(
+ FolderModifiedEventV1.build({
+ folderId: createdFolder.id,
+ projectId,
+ environment: destinationFolder.environmentSlug,
+ secretPath: destinationReplicationFolderPath
+ }),
+ tx
+ );
+ return createdFolder;
});
- await eventEmitter.emit(
- FolderModifiedEventV1.build({
- folderId: destinationReplicationFolder.id,
- projectId,
- environment: destinationFolder.environmentSlug,
- secretPath: destinationReplicationFolderPath
- })
- );
}
const destinationReplicationFolderId = destinationReplicationFolder.id;
const replicationEventScope = {
diff --git a/backend/src/services/folder-commit/folder-commit-service.ts b/backend/src/services/folder-commit/folder-commit-service.ts
index 898ec4fe1a..77351515e7 100644
--- a/backend/src/services/folder-commit/folder-commit-service.ts
+++ b/backend/src/services/folder-commit/folder-commit-service.ts
@@ -6,7 +6,6 @@ import { Knex } from "knex";
import {
ActionProjectType,
- SecretType,
TSecretFolders,
TSecretFolderVersions,
TSecretV2TagJunctionInsert,
@@ -1053,7 +1052,7 @@ export const folderCommitServiceFactory = ({
tx?: Knex
) => {
const commitChanges = [];
- const modifiedSecretIds: string[] = [];
+ const modifiedSecrets: { id: string; type: string }[] = [];
const folder = await folderDAL.findById(folderId, tx);
if (!folder) {
return [];
@@ -1103,7 +1102,7 @@ export const folderCommitServiceFactory = ({
}
];
await secretV2BridgeDAL.insertMany(newSecret, tx);
- modifiedSecretIds.push(change.id);
+ modifiedSecrets.push({ id: change.id, type: secretVersion.type });
const metadata: { key: string; value?: string; encryptedValue?: string }[] = Array.isArray(
secretVersion.metadata
@@ -1168,7 +1167,7 @@ export const folderCommitServiceFactory = ({
case "update":
{
- modifiedSecretIds.push(change.id);
+ modifiedSecrets.push({ id: change.id, type: secretVersion.type });
await secretV2BridgeDAL.updateById(
change.id,
{
@@ -1265,7 +1264,7 @@ export const folderCommitServiceFactory = ({
// Delete case remains unchanged
case "delete":
await secretV2BridgeDAL.deleteById(change.id, tx);
- modifiedSecretIds.push(change.id);
+ modifiedSecrets.push({ id: change.id, type: secretVersion.type });
commitChanges.push({
type: ChangeType.DELETE,
secretVersionId: change.versionId
@@ -1277,14 +1276,13 @@ export const folderCommitServiceFactory = ({
}
}
- if (modifiedSecretIds.length) {
+ if (modifiedSecrets.length) {
const [folderLocation] = await folderDAL.findSecretPathByFolderIds(folder.projectId, [folderId], tx);
if (folderLocation) {
- // Folder commits only record shared secrets, so everything restored here is shared.
await emitSecretsModified(
eventEmitter,
{ projectId: folder.projectId, environment: folderLocation.environmentSlug, secretPath: folderLocation.path },
- modifiedSecretIds.map((id) => ({ id, type: SecretType.Shared })),
+ modifiedSecrets,
tx
);
}