Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
accept condition to keep compatibility with old behavior
Thiago Araujo da Silva8a42b8d9835a
diff --git a/backend/src/ee/services/permission/permission-fns.test.ts b/backend/src/ee/services/permission/permission-fns.test.tsindex 4b7c6aff1c..eaa955e71a 100644--- a/backend/src/ee/services/permission/permission-fns.test.ts+++ b/backend/src/ee/services/permission/permission-fns.test.ts@@ -396,7 +396,7 @@ describe("interpolatePermissionRules", () => {});describe("checkForInvalidPermissionCombination", () => {- test("rejects conditions on member assume-privileges, which are not evaluated", () => {+ test("accepts a userEmail condition on member assume-privileges", () => {expect(() =>checkForInvalidPermissionCombination([{@@ -405,7 +405,19 @@ describe("checkForInvalidPermissionCombination", () => {conditions: { userEmail: "[email protected]" }}] as never)- ).toThrow('Condition "userEmail" is not allowed for action "assume-privileges" on subject "member"');+ ).not.toThrow();+ });++ test("rejects conditions on member assume-privileges other than userEmail", () => {+ expect(() =>+ checkForInvalidPermissionCombination([+ {+ subject: ProjectPermissionSub.Member,+ action: [ProjectPermissionMemberActions.AssumePrivileges],+ conditions: { assignableRole: "admin" }+ }+ ] as never)+ ).toThrow('Condition "assignableRole" is not allowed for action "assume-privileges" on subject "member"');});test("rejects conditions when assume-privileges shares a rule with an action that allows them", () => {@@ -414,10 +426,10 @@ describe("checkForInvalidPermissionCombination", () => {{subject: ProjectPermissionSub.Member,action: [ProjectPermissionMemberActions.AssignRole, ProjectPermissionMemberActions.AssumePrivileges],- conditions: { userEmail: "[email protected]" }+ conditions: { userEmail: "[email protected]", assignableRole: "admin" }}] as never)- ).toThrow('Condition "userEmail" is not allowed for action "assume-privileges" on subject "member"');+ ).toThrow('Condition "assignableRole" is not allowed for action "assume-privileges" on subject "member"');});test("accepts member assume-privileges without conditions", () => {diff --git a/backend/src/ee/services/permission/project-permission.ts b/backend/src/ee/services/permission/project-permission.tsindex bab3eef5a9..a2b97bba81 100644--- a/backend/src/ee/services/permission/project-permission.ts+++ b/backend/src/ee/services/permission/project-permission.ts@@ -418,7 +418,7 @@ export const ActionAllowedConditions: ActionAllowedConditionsType = {],[ProjectPermissionMemberActions.AssignRole]: ["userEmail", "assignableRole"],[ProjectPermissionMemberActions.AssignAdditionalPrivileges]: ["userEmail", "assignableSubject", "assignableAction"],- [ProjectPermissionMemberActions.AssumePrivileges]: []+ [ProjectPermissionMemberActions.AssumePrivileges]: ["userEmail"]},[ProjectPermissionSub.Identity]: {[ProjectPermissionIdentityActions.Read]: ["identityId"],diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils.tsxindex a68efb5132..a7b9af1696 100644--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils.tsx+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils.tsx@@ -488,7 +488,7 @@ export const ACTION_ALLOWED_CONDITIONS: ActionAllowedConditionsType = {[ProjectPermissionMemberActions.Create]: [],[ProjectPermissionMemberActions.Edit]: [],[ProjectPermissionMemberActions.Delete]: [],- [ProjectPermissionMemberActions.AssumePrivileges]: [],+ [ProjectPermissionMemberActions.AssumePrivileges]: ["userEmail"],[ProjectPermissionMemberActions.GrantPrivileges]: ["userEmail","assignableRole",