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
fix(agent-vault): serialize role changes and allow demoting deactivated members
Scott Wilson6ec2a652e658
diff --git a/backend/e2e-test/routes/v1/agent-vault.spec.ts b/backend/e2e-test/routes/v1/agent-vault.spec.tsindex db1fe86c43..b279a16bfc 100644--- a/backend/e2e-test/routes/v1/agent-vault.spec.ts+++ b/backend/e2e-test/routes/v1/agent-vault.spec.ts@@ -2,6 +2,7 @@ import crypto from "node:crypto";import * as x509 from "@peculiar/x509";import { createAwsAppConnection, deleteAwsAppConnection } from "e2e-test/testUtils/app-connections";+import { pollUntil } from "e2e-test/testUtils/poll";import { AccessScope, ActionProjectType, OrgMembershipRole, ProjectMembershipRole, ProjectType } from "@app/db/schemas";import { seedData1 } from "@app/db/seed-data";@@ -21,7 +22,7 @@ import { isHsmActiveAndEnabled } from "@app/ee/services/hsm/hsm-fns";import { permissionDALFactory } from "@app/ee/services/permission/permission-dal";import { permissionServiceFactory } from "@app/ee/services/permission/permission-service";import { ResourceAuthMethodType } from "@app/ee/services/resource-auth-method/resource-auth-method-fns";-import { KeyStorePrefixes, TKeyStoreFactory } from "@app/keystore/keystore";+import { KeyStorePrefixes, PgSqlLock, TKeyStoreFactory } from "@app/keystore/keystore";import { getConfig, initEnvConfig } from "@app/lib/config/env";import { UnauthorizedError } from "@app/lib/errors";import { initLogger, logger } from "@app/lib/logger";@@ -3512,9 +3513,27 @@ describe("Agent Vault V1 Router", async () => {callerGroup = await makeCallerAdminOnlyThroughGroup(projectId);const { groupId } = callerGroup;+ // Holding the lock until both requests queue behind it means both have passed their permission+ // checks first. Otherwise the second can rebuild them after the first demotes the caller's group,+ // and is refused with a 403 before it ever reaches the guard.+ let lockHeld!: () => void;+ let releaseLock!: () => void;+ const held = new Promise<void>((resolve) => {+ lockHeld = resolve;+ });+ const released = new Promise<void>((resolve) => {+ releaseLock = resolve;+ });+ const holder = testDb.transaction(async (trx) => {+ await trx.raw("SELECT pg_advisory_xact_lock(?)", [PgSqlLock.LastAdminGuard("project", projectId)]);+ lockHeld();+ await released;+ });+ await held;+// Either batch alone leaves an admin standing. Together they would leave none, so one has to be// refused whichever commits first.- const results = await Promise.all(+ const pending = Promise.all([one, two].map((identity) =>inject("PATCH", "/api/v1/agent-vault/members", {groupIds: [groupId],@@ -3523,6 +3542,21 @@ describe("Agent Vault V1 Router", async () => {})));+ await pollUntil({+ describe: "both demotions to wait on the last-admin lock",+ read: async () =>+ Number(+ (+ (await testDb.raw(+ "SELECT count(*) AS waiting FROM pg_locks WHERE locktype = 'advisory' AND NOT granted"+ )) as { rows: { waiting: string }[] }+ ).rows[0].waiting+ ),+ done: (waiting) => waiting >= 2+ });+ releaseLock();+ await holder;+ const results = await pending;expect(results.map((res) => res.statusCode).sort()).toEqual([200, 400]);const refused = results.find((res) => res.statusCode === 400)!;expect(JSON.parse(refused.payload).message).toContain("must keep at least one admin");@@ -3578,6 +3612,73 @@ describe("Agent Vault V1 Router", async () => {}});+ test("a deactivated admin can be demoted, but a deactivated member cannot be promoted", async () => {+ const identity = await createOrgIdentity(`av-deactivated-role-${Date.now()}`);++ try {+ expect(+ (+ await inject("POST", "/api/v1/agent-vault/members", {+ machineIdentityIds: [identity.id],+ role: ProjectMembershipRole.Admin+ })+ ).statusCode+ ).toBe(200);+ await testDb("memberships")+ .where({ scope: AccessScope.Organization, actorIdentityId: identity.id })+ .update({ isActive: false });++ const demoted = await inject("PATCH", "/api/v1/agent-vault/members", {+ machineIdentityIds: [identity.id],+ role: ProjectMembershipRole.Member+ });+ expect(demoted.statusCode).toBe(200);+ expect(JSON.parse(demoted.payload).members).toMatchObject([{ id: identity.id, role: "member" }]);++ const promoted = await inject("PATCH", "/api/v1/agent-vault/members", {+ machineIdentityIds: [identity.id],+ role: ProjectMembershipRole.Admin+ });+ expect(promoted.statusCode).toBe(400);+ expect(JSON.parse(promoted.payload).message).toContain("is deactivated in this organization");+ } finally {+ await deleteOrgIdentity(identity.id);+ }+ });++ test("simultaneous role changes leave a member with exactly one role", async () => {+ const projectId = await getProjectId();+ const identity = await createOrgIdentity(`av-role-race-${Date.now()}`);++ try {+ expect(+ (+ await inject("POST", "/api/v1/agent-vault/members", {+ machineIdentityIds: [identity.id],+ role: ProjectMembershipRole.Member+ })+ ).statusCode+ ).toBe(200);++ const results = await Promise.all(+ Array.from({ length: 10 }, (_, i) =>+ inject("PATCH", "/api/v1/agent-vault/members", {+ machineIdentityIds: [identity.id],+ role: i % 2 ? ProjectMembershipRole.Member : ProjectMembershipRole.Admin+ })+ )+ );+ expect(results.every((res) => res.statusCode === 200)).toBe(true);++ const membership = await testDb("memberships")+ .where({ scope: AccessScope.Project, scopeProjectId: projectId, actorIdentityId: identity.id })+ .first();+ expect(await testDb("membership_roles").where({ membershipId: membership.id })).toHaveLength(1);+ } finally {+ await deleteOrgIdentity(identity.id);+ }+ });+test("a machine identity inherits a group's access bundles, on mint and on resolve", async () => {const projectId = await getProjectId();const bundle = await createAccessBundle("group-inheritance");diff --git a/backend/src/ee/routes/v1/agent-vault-routers/agent-vault-membership-router.ts b/backend/src/ee/routes/v1/agent-vault-routers/agent-vault-membership-router.tsindex 3ed9c5ffbc..47cd2655ad 100644--- a/backend/src/ee/routes/v1/agent-vault-routers/agent-vault-membership-router.ts+++ b/backend/src/ee/routes/v1/agent-vault-routers/agent-vault-membership-router.ts@@ -137,7 +137,8 @@ export const registerAgentVaultMembershipRouter = async (server: FastifyZodProvischema: {hide: false,operationId: "updateAgentVaultMemberRoles",- description: "Change the Agent Vault role of users, groups and machine identities",+ description:+ "Change the Agent Vault role of users, groups and machine identities. Name each one by ID; to add users by email, use Add members.",tags: [ApiDocsTags.AgentVaultMembers],body: AgentVaultProductMemberRoleUpdateSchema,response: {diff --git a/backend/src/ee/routes/v1/agent-vault-routers/agent-vault-schemas.ts b/backend/src/ee/routes/v1/agent-vault-routers/agent-vault-schemas.tsindex 79c20770da..68afb5cd59 100644--- a/backend/src/ee/routes/v1/agent-vault-routers/agent-vault-schemas.ts+++ b/backend/src/ee/routes/v1/agent-vault-routers/agent-vault-schemas.ts@@ -268,9 +268,11 @@ const memberIdsShape = (docs: { userIds: string; machineIdentityIds: string; groconst namedCount = (body: { userIds: string[]; machineIdentityIds: string[]; groupIds: string[]; emails?: string[] }) =>body.userIds.length + body.machineIdentityIds.length + body.groupIds.length + (body.emails?.length ?? 0);+// x-default only shapes the docs: Mintlify pre-fills its request example from a default, and a required+// enum without one is left out, so the copied example fails with a 422. Validation still requires role.export const AgentVaultProductRoleSchema = z.enum([ProjectMembershipRole.Admin, ProjectMembershipRole.Member])- .describe(AGENT_VAULT.MEMBERSHIP.role);+ .describe(JSON.stringify({ description: AGENT_VAULT.MEMBERSHIP.role, "x-default": ProjectMembershipRole.Member }));const atLeastOne = "Name at least one user, machine identity, or group";@@ -317,7 +319,7 @@ export const AgentVaultProductMemberAddSchema = z.default([]).refine((val) => val.every((el) => el === el.toLowerCase()), "Email must be lowercase").describe(AGENT_VAULT.MEMBERSHIP.emails),- role: z.enum([ProjectMembershipRole.Admin, ProjectMembershipRole.Member]).describe(AGENT_VAULT.MEMBERSHIP.role)+ role: AgentVaultProductRoleSchema}).refine((body) => namedCount(body) > 0, atLeastOne).refine((body) => namedCount(body) <= AGENT_VAULT_MAX_GRANTEES, atMost("Act on"));diff --git a/backend/src/ee/services/agent-vault-member/agent-vault-membership-service.ts b/backend/src/ee/services/agent-vault-member/agent-vault-membership-service.tsindex a9a2132272..1759d08aa8 100644--- a/backend/src/ee/services/agent-vault-member/agent-vault-membership-service.ts+++ b/backend/src/ee/services/agent-vault-member/agent-vault-membership-service.ts@@ -17,6 +17,7 @@ import {ProjectPermissionMemberActions,ProjectPermissionSub} from "@app/ee/services/permission/project-permission";+import { PgSqlLock } from "@app/keystore/keystore";import { BadRequestError, ForbiddenRequestError, NotFoundError } from "@app/lib/errors";import { TGenericPermission } from "@app/lib/types";import { ActorType } from "@app/services/auth/auth-type";@@ -521,12 +522,18 @@ export const agentVaultMembershipServiceFactory = ({throw new ForbiddenRequestError({ message: "You cannot change your own role" });}- // The add paths check this; promoting did not, so a deactivated member could still be made an admin.- await assertActorsAreAddable(actors, ctx.actorOrgId, projectId);+ // Promotion only: a deactivated member must not be made an admin, but taking admin away from one has+ // to work without reactivating them first.+ if (role === ProjectMembershipRole.Admin) {+ await assertActorsAreAddable(actors, ctx.actorOrgId, projectId);+ }const nameByKey = await resolveActorNames(actors);const written = await membershipDAL.transaction(async (tx) => {+ // Before the roles are read, not only around the admin count: two changes for one member that both+ // read the old role would each insert their own, leaving the member with two roles.+ await tx.raw("SELECT pg_advisory_xact_lock(?)", [PgSqlLock.LastAdminGuard("project", projectId)]);const existing = await findMembershipsForActors(projectId, actors, tx);const held = actors.filter((actor) => existing.has(actorKey(actor)));const heldMembershipIds = held.map((actor) => existing.get(actorKey(actor))!.id);diff --git a/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/ProductRoleDialog.tsx b/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/ProductRoleDialog.tsxindex 76015c40a7..5eb282c67b 100644--- a/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/ProductRoleDialog.tsx+++ b/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/ProductRoleDialog.tsx@@ -48,7 +48,7 @@ export const ProductRoleDialog = ({ member, onOpenChange, subject }: Props) => {type: "success"}: {- text: `${subject}'s role wasn't changed. They may have been removed from Agent Vault or already have that role.`,+ text: `Role not changed. ${subject} may have been removed from Agent Vault or already has that role.`,type: "info"});