Skip to content

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

legacy grant-privileges action can no longer override a forbid

Thiago Araujo da Silva5dd0d18a61ba
diff --git a/backend/src/services/additional-privilege/project/project-additional-privilege-factory.test.ts b/backend/src/services/additional-privilege/project/project-additional-privilege-factory.test.ts
index 1d96ccbed7..3926888714 100644
--- a/backend/src/services/additional-privilege/project/project-additional-privilege-factory.test.ts
+++ b/backend/src/services/additional-privilege/project/project-additional-privilege-factory.test.ts
@@ -104,4 +104,50 @@ describe("project additional privilege grant validation", () => {
])
).resolves.toBeUndefined();
});
+
+ test("an allow on the legacy grant-privileges action does not override a forbid on the new action", async () => {
+ const factory = createFactory([
+ grantAnything,
+ { action: ProjectPermissionMemberActions.GrantPrivileges, subject: ProjectPermissionSub.Member },
+ {
+ inverted: true,
+ action: ProjectPermissionMemberActions.AssignAdditionalPrivileges,
+ subject: ProjectPermissionSub.Member,
+ conditions: { assignableSubject: ProjectPermissionSub.Secrets }
+ }
+ ]);
+
+ await expect(createPrivilege(factory, readSecrets)).rejects.toThrow(PermissionBoundaryError);
+ await expect(createPrivilege(factory, readEnvironments)).resolves.toBeUndefined();
+ });
+
+ test("an allow on the legacy grant-privileges action does not override a forbid on the target's email", async () => {
+ const factory = createFactory([
+ grantAnything,
+ { action: ProjectPermissionMemberActions.GrantPrivileges, subject: ProjectPermissionSub.Member },
+ {
+ inverted: true,
+ action: ProjectPermissionMemberActions.AssignAdditionalPrivileges,
+ subject: ProjectPermissionSub.Member,
+ conditions: { userEmail: "[email protected]" }
+ }
+ ]);
+
+ await expect(createPrivilege(factory, readEnvironments)).rejects.toThrow(PermissionBoundaryError);
+ });
+
+ test("a forbid on the legacy action is enforced when the new action is allowed", async () => {
+ const factory = createFactory([
+ grantAnything,
+ {
+ inverted: true,
+ action: ProjectPermissionMemberActions.GrantPrivileges,
+ subject: ProjectPermissionSub.Member,
+ conditions: { assignableSubject: ProjectPermissionSub.Secrets }
+ }
+ ]);
+
+ await expect(createPrivilege(factory, readSecrets)).rejects.toThrow(PermissionBoundaryError);
+ await expect(createPrivilege(factory, readEnvironments)).resolves.toBeUndefined();
+ });
});
diff --git a/backend/src/services/additional-privilege/project/project-additional-privilege-factory.ts b/backend/src/services/additional-privilege/project/project-additional-privilege-factory.ts
index a003b65e0d..c7df462743 100644
--- a/backend/src/services/additional-privilege/project/project-additional-privilege-factory.ts
+++ b/backend/src/services/additional-privilege/project/project-additional-privilege-factory.ts
@@ -1,4 +1,4 @@
-import { ForbiddenError, MongoAbility, RawRule } from "@casl/ability";
+import { ForbiddenError, MongoAbility, RawRule, subject } from "@casl/ability";
import { AccessScope, ActionProjectType } from "@app/db/schemas";
import {
@@ -158,13 +158,39 @@ export const newProjectAdditionalPrivilegesFactory = ({
if (!hasUnconditionalAllowRule) {
return false;
}
- if (checkPermissionConditions(actorPermission, permissionAction, permissionSubject, "conditionalForbid")) {
- return false;
- }
// This ensures that cannot rules take precedence over can rules.
return actorPermission.can(permissionAction, permissionSubject);
};
+ const validatePrivilegeChange = (
+ shouldUseNewPrivilegeSystem: boolean,
+ actions: ProjectPermissionSet[0][],
+ permissionSubject: PrivilegeValidationSubject,
+ actorPermission: MongoAbility,
+ targetUserPermission: MongoAbility,
+ subjectFields: Record<string, string | undefined>
+ ) => {
+ if (shouldUseNewPrivilegeSystem) {
+ const subjectToCheck = subject(permissionSubject, subjectFields);
+ const isConditionallyForbidden = actions.some((action) => {
+ const rule = actorPermission.relevantRuleFor(action, subjectToCheck);
+ return Boolean(rule?.inverted && rule.conditions);
+ });
+ if (isConditionallyForbidden) {
+ return { isValid: false, missingPermissions: [{ action: actions[0], subject: permissionSubject }] };
+ }
+ }
+
+ return validatePrivilegeChangeOperation(
+ shouldUseNewPrivilegeSystem,
+ actions,
+ permissionSubject,
+ actorPermission,
+ targetUserPermission,
+ subjectFields
+ );
+ };
+
const hasSubjectOrActionConditions = (
actorPermission: MongoAbility,
permissionAction: string,
@@ -190,24 +216,14 @@ export const newProjectAdditionalPrivilegesFactory = ({
targetIdentifier: string | undefined,
permissions: unknown
) => {
- if (hasUnrestrictedGrantPrivileges(actorPermission, permissionAction, permissionSubject)) {
- return;
- }
+ const actionsToTry = getActionsToTryForPrivilegeValidation(permissionAction, permissionSubject);
- // Also check legacy action if new action is being used
+ const hasConditionalForbid = actionsToTry.some((action) =>
+ checkPermissionConditions(actorPermission, action, permissionSubject, "conditionalForbid")
+ );
if (
- (permissionAction === ProjectPermissionMemberActions.AssignAdditionalPrivileges &&
- hasUnrestrictedGrantPrivileges(
- actorPermission,
- ProjectPermissionMemberActions.GrantPrivileges,
- permissionSubject
- )) ||
- (permissionAction === ProjectPermissionIdentityActions.AssignAdditionalPrivileges &&
- hasUnrestrictedGrantPrivileges(
- actorPermission,
- ProjectPermissionIdentityActions.GrantPrivileges,
- permissionSubject
- ))
+ !hasConditionalForbid &&
+ actionsToTry.some((action) => hasUnrestrictedGrantPrivileges(actorPermission, action, permissionSubject))
) {
return;
}
@@ -242,9 +258,7 @@ export const newProjectAdditionalPrivilegesFactory = ({
? { userEmail: targetIdentifier, assignableSubject: ruleSubject }
: { identityId: targetIdentifier, assignableSubject: ruleSubject };
- const actionsToTry = getActionsToTryForPrivilegeValidation(permissionAction, permissionSubject);
-
- const subjectBoundary = validatePrivilegeChangeOperation(
+ const subjectBoundary = validatePrivilegeChange(
shouldUseNewPrivilegeSystem,
actionsToTry,
permissionSubject,
@@ -270,9 +284,7 @@ export const newProjectAdditionalPrivilegesFactory = ({
? { userEmail: targetIdentifier, assignableSubject: ruleSubject, assignableAction: subjectActionKey }
: { identityId: targetIdentifier, assignableSubject: ruleSubject, assignableAction: subjectActionKey };
- const actionsToTry = getActionsToTryForPrivilegeValidation(permissionAction, permissionSubject);
-
- const subjectActionBoundary = validatePrivilegeChangeOperation(
+ const subjectActionBoundary = validatePrivilegeChange(
shouldUseNewPrivilegeSystem,
actionsToTry,
permissionSubject,
@@ -348,7 +360,7 @@ export const newProjectAdditionalPrivilegesFactory = ({
? ProjectPermissionMemberActions.GrantPrivileges
: ProjectPermissionIdentityActions.GrantPrivileges;
- const permissionBoundary = validatePrivilegeChangeOperation(
+ const permissionBoundary = validatePrivilegeChange(
shouldUseNewPrivilegeSystem,
[permissionAction, legacyAction],
permissionSubject,
diff --git a/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembershipUserRow.tsx b/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembershipUserRow.tsx
index cfc5c7989e..db683abcf7 100644
--- a/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembershipUserRow.tsx
+++ b/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembershipUserRow.tsx
@@ -1,4 +1,3 @@
-import { subject } from "@casl/ability";
import { EllipsisIcon, UserIcon } from "lucide-react";
import { ProjectPermissionCan } from "@app/components/permissions";
@@ -49,7 +48,7 @@ export const GroupMembershipUserRow = ({
<DropdownMenuContent align="end">
<ProjectPermissionCan
I={ProjectPermissionMemberActions.AssumePrivileges}
- a={subject(ProjectPermissionSub.Member, { userEmail: email })}
+ a={ProjectPermissionSub.Member}
>
{(isAllowed) => {
return (
diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx
index da73c73318..c394c86138 100644
--- a/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx
+++ b/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx
@@ -1,7 +1,6 @@
import { useState } from "react";
import { Helmet } from "react-helmet";
import { useTranslation } from "react-i18next";
-import { subject } from "@casl/ability";
import { Link, useNavigate, useParams } from "@tanstack/react-router";
import {
ChevronLeftIcon,
@@ -228,9 +227,7 @@ export const Page = () => {
{canAssumePrivileges && (
<ProjectPermissionCan
I={ProjectPermissionMemberActions.AssumePrivileges}
- a={subject(ProjectPermissionSub.Member, {
- userEmail: membershipDetails.user.email
- })}
+ a={ProjectPermissionSub.Member}
>
{(isAllowed) => (
<Tooltip>