Skip to content

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

further fixes

varonix7108e27f87df
diff --git a/frontend/package.json b/frontend/package.json
index b11f6eba01..75d6e537a5 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -12,7 +12,7 @@
"preview": "vite preview",
"lint": "eslint ./src --max-warnings 0",
"lint:fix": "eslint --fix ./src --max-warnings 0",
- "test": "tsx --tsconfig tsconfig.app.json --test src/components/v3/generic/Combobox/combobox-accessibility.test.ts src/components/v3/generic/Combobox/combobox-items.test.ts src/components/secret-syncs/forms/schemas/secret-sync-schema.test.ts src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.utils.test.ts",
+ "test": "tsx --tsconfig tsconfig.app.json --test src/components/v3/generic/Combobox/combobox-accessibility.test.ts src/components/v3/generic/Combobox/combobox-items.test.ts src/components/secret-syncs/forms/schemas/secret-sync-schema.test.ts",
"type:check": "tsc --noEmit --project ./tsconfig.app.json",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.utils.test.ts b/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.utils.test.ts
deleted file mode 100644
index d4fe498c93..0000000000
--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.utils.test.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import assert from "node:assert/strict";
-import { describe, it } from "node:test";
-
-import {
- ProjectPermissionActions,
- ProjectPermissionSecretActions,
- ProjectPermissionSecretFolderActions,
- ProjectPermissionSub
-} from "@app/context/ProjectPermissionContext/types";
-import { TProjectRole } from "@app/hooks/api/roles/types";
-
-import { sanitizeDuplicateRolePermissions } from "./DuplicateProjectRoleModal.utils";
-
-// The built-in role definitions live in the backend and are served over the API, so the shape the
-// duplicate flow receives for the Admin role is mirrored here.
-const adminLikePermissions: TProjectRole["permissions"] = [
- {
- subject: ProjectPermissionSub.Secrets,
- action: [
- ProjectPermissionSecretActions.DescribeSecret,
- ProjectPermissionSecretActions.DescribeAndReadValue,
- ProjectPermissionSecretActions.ReadValue,
- ProjectPermissionSecretActions.Create,
- ProjectPermissionSecretActions.Edit,
- ProjectPermissionSecretActions.Delete
- ]
- },
- {
- subject: ProjectPermissionSub.SecretFolders,
- action: [
- ProjectPermissionActions.Edit,
- ProjectPermissionActions.Create,
- ProjectPermissionActions.Delete,
- ProjectPermissionSecretFolderActions.ManageAccess
- ]
- },
- {
- subject: ProjectPermissionSub.Role,
- action: [
- ProjectPermissionActions.Read,
- ProjectPermissionActions.Edit,
- ProjectPermissionActions.Create,
- ProjectPermissionActions.Delete
- ]
- }
-];
-
-const ruleFor = (permissions: TProjectRole["permissions"], subject: string) =>
- permissions.find((permission) => permission.subject === subject);
-
-describe("duplicate project role permission sanitization", () => {
- it("submits no non-grantable folder action for an Admin-like role", () => {
- const submitted = sanitizeDuplicateRolePermissions(adminLikePermissions);
-
- submitted.forEach((permission) => {
- assert.ok(
- ![permission.action].flat().includes(ProjectPermissionSecretFolderActions.ManageAccess),
- `rule for ${String(permission.subject)} still carries manage-access`
- );
- assert.ok(
- [permission.action].flat().length > 0,
- `rule for ${String(permission.subject)} has no actions left`
- );
- });
-
- assert.deepEqual(ruleFor(submitted, ProjectPermissionSub.SecretFolders)?.action, [
- ProjectPermissionActions.Edit,
- ProjectPermissionActions.Create,
- ProjectPermissionActions.Delete
- ]);
- });
-
- it("drops a folder rule whose only action is manage-access", () => {
- const submitted = sanitizeDuplicateRolePermissions([
- {
- subject: ProjectPermissionSub.SecretFolders,
- action: [ProjectPermissionSecretFolderActions.ManageAccess]
- },
- {
- subject: ProjectPermissionSub.SecretFolders,
- action: ProjectPermissionSecretFolderActions.ManageAccess
- }
- ]);
-
- assert.deepEqual(submitted, []);
- });
-
- it("strips describeAndReadValue from a secrets rule that also describes or reads values", () => {
- assert.deepEqual(ruleFor(adminLikePermissions, ProjectPermissionSub.Secrets)?.action, [
- ProjectPermissionSecretActions.DescribeSecret,
- ProjectPermissionSecretActions.DescribeAndReadValue,
- ProjectPermissionSecretActions.ReadValue,
- ProjectPermissionSecretActions.Create,
- ProjectPermissionSecretActions.Edit,
- ProjectPermissionSecretActions.Delete
- ]);
-
- assert.deepEqual(
- ruleFor(sanitizeDuplicateRolePermissions(adminLikePermissions), ProjectPermissionSub.Secrets)
- ?.action,
- [
- ProjectPermissionSecretActions.DescribeSecret,
- ProjectPermissionSecretActions.ReadValue,
- ProjectPermissionSecretActions.Create,
- ProjectPermissionSecretActions.Edit,
- ProjectPermissionSecretActions.Delete
- ]
- );
- });
-
- it("keeps describeAndReadValue on a secrets rule that grants nothing else", () => {
- const permissions: TProjectRole["permissions"] = [
- {
- subject: ProjectPermissionSub.Secrets,
- action: [ProjectPermissionSecretActions.DescribeAndReadValue]
- }
- ];
-
- assert.deepEqual(sanitizeDuplicateRolePermissions(permissions), permissions);
- });
-
- it("passes rules for other subjects through untouched", () => {
- const permissions: TProjectRole["permissions"] = [
- {
- subject: ProjectPermissionSub.Member,
- action: [ProjectPermissionActions.Read],
- conditions: { userEmail: { $eq: "[email protected]" } },
- inverted: true
- },
- {
- subject: ProjectPermissionSub.DynamicSecrets,
- action: ProjectPermissionActions.Read
- }
- ];
-
- assert.deepEqual(sanitizeDuplicateRolePermissions(permissions), permissions);
- });
-});
diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.utils.ts b/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.utils.ts
index cdab41da3c..4e898a9b18 100644
--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.utils.ts
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.utils.ts
@@ -1,10 +1,36 @@
import {
+ ProjectPermissionGroupActions,
+ ProjectPermissionIdentityActions,
+ ProjectPermissionMemberActions,
ProjectPermissionSecretActions,
ProjectPermissionSecretFolderActions,
ProjectPermissionSub
} from "@app/context/ProjectPermissionContext/types";
import { TProjectRole } from "@app/hooks/api/roles/types";
+// the built-in roles still carry grant-privileges next to the actions that replaced it, but the
+// role API rejects a rule holding both, so the legacy one goes once a replacement is present
+const LEGACY_PRIVILEGE_ACTIONS: Record<string, { legacyAction: string; replacedBy: string[] }> = {
+ [ProjectPermissionSub.Member]: {
+ legacyAction: ProjectPermissionMemberActions.GrantPrivileges,
+ replacedBy: [
+ ProjectPermissionMemberActions.AssignRole,
+ ProjectPermissionMemberActions.AssignAdditionalPrivileges
+ ]
+ },
+ [ProjectPermissionSub.Identity]: {
+ legacyAction: ProjectPermissionIdentityActions.GrantPrivileges,
+ replacedBy: [
+ ProjectPermissionIdentityActions.AssignRole,
+ ProjectPermissionIdentityActions.AssignAdditionalPrivileges
+ ]
+ },
+ [ProjectPermissionSub.Groups]: {
+ legacyAction: ProjectPermissionGroupActions.GrantPrivileges,
+ replacedBy: [ProjectPermissionGroupActions.AssignRole]
+ }
+};
+
export const sanitizeDuplicateRolePermissions = (permissions: TProjectRole["permissions"]) =>
permissions.flatMap((permission) => {
if (
@@ -32,5 +58,16 @@ export const sanitizeDuplicateRolePermissions = (permissions: TProjectRole["perm
return action.length ? [{ ...permission, action }] : [];
}
+ const legacyPrivilege = LEGACY_PRIVILEGE_ACTIONS[permission.subject as string];
+ if (legacyPrivilege) {
+ const action = [permission.action].flat();
+
+ if (action.some((el) => legacyPrivilege.replacedBy.includes(el))) {
+ return [
+ { ...permission, action: action.filter((el) => el !== legacyPrivilege.legacyAction) }
+ ];
+ }
+ }
+
return [permission];
});