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

Merge pull request #4682 from Infisical/fix/folder-deletion-policy-check-for-machine-identity

Browse Source 
fix: policy check in folder deletion for machine identity
This commit is contained in:
Piyush Gupta
2025-10-17 00:48:27 +05:30
committed by GitHub
parent d00c9e422f 69cef47a63
commit 0f0d9ab056
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/secret-folder/secret-folder-service.ts
+10 -3
View File
@@ -12,6 +12,7 @@ import { TSecretSnapshotServiceFactory } from "@app/ee/services/secret-snapshot/
import { PgSqlLock } from "@app/keystore/keystore"; import { PgSqlLock } from "@app/keystore/keystore";
import { BadRequestError, NotFoundError } from "@app/lib/errors"; import { BadRequestError, NotFoundError } from "@app/lib/errors";
import { OrderByDirection, OrgServiceActor } from "@app/lib/types"; import { OrderByDirection, OrgServiceActor } from "@app/lib/types";
import { ActorType } from "@app/services/auth/auth-type";
import { buildFolderPath } from "@app/services/secret-folder/secret-folder-fns"; import { buildFolderPath } from "@app/services/secret-folder/secret-folder-fns";
import { import {
@@ -534,13 +535,19 @@ export const secretFolderServiceFactory = ({
projectId, projectId,
env, env,
parentId, parentId,
idOrName idOrName,
actor
}: { }: {
projectId: string; projectId: string;
env: TProjectEnvironments; env: TProjectEnvironments;
parentId: string; parentId: string;
idOrName: string; idOrName: string;
actor: ActorType;
}) => { }) => {
if (actor === ActorType.IDENTITY) {
return;
}
let targetFolder = await folderDAL let targetFolder = await folderDAL
.findOne({ .findOne({
envId: env.id, envId: env.id,
@@ -664,7 +671,7 @@ export const secretFolderServiceFactory = ({
message: `Folder with path '${secretPath}' in environment with slug '${environment}' not found` message: `Folder with path '${secretPath}' in environment with slug '${environment}' not found`
}); });
await $checkFolderPolicy({ projectId, env, parentId: parentFolder.id, idOrName }); await $checkFolderPolicy({ projectId, env, parentId: parentFolder.id, idOrName, actor });
let folderToDelete = await folderDAL let folderToDelete = await folderDAL
.findOne({ .findOne({
@@ -1315,7 +1322,7 @@ export const secretFolderServiceFactory = ({
}); });
} }
await $checkFolderPolicy({ projectId, env, parentId: parentFolder.id, idOrName }); await $checkFolderPolicy({ projectId, env, parentId: parentFolder.id, idOrName, actor });
let folderToDelete = await folderDAL let folderToDelete = await folderDAL
.findOne({ .findOne({