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
add lock on membership
adilsonfb50668623ec
diff --git a/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.test.ts b/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.test.tsindex 92d80c1fce..e82a9116f2 100644--- a/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.test.ts+++ b/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.test.ts@@ -18,7 +18,7 @@ const approvedRequest = {} as unknown as TApprovalRequest;const buildResource = ({ isRequesterProjectMember }: { isRequesterProjectMember: boolean }) => {- const isUserProjectMember = vi.fn().mockResolvedValue(isRequesterProjectMember);+ const lockUserProjectMemberships = vi.fn().mockResolvedValue(isRequesterProjectMember);const createGrant = vi.fn().mockResolvedValue({ id: "grant-1" });const createPrivilege = vi.fn().mockResolvedValue({ id: "privilege-1" });@@ -26,19 +26,19 @@ const buildResource = ({ isRequesterProjectMember }: { isRequesterProjectMember:approvalPolicyDAL: { findSecretAccessPolicyByEnvIdAndSecretPath: vi.fn() },approvalRequestGrantsDAL: { find: vi.fn(), create: createGrant },additionalPrivilegeDAL: { create: createPrivilege },- membershipDAL: { isUserProjectMember }+ membershipDAL: { lockUserProjectMemberships }} as never);- return { resource, isUserProjectMember, createGrant, createPrivilege };+ return { resource, lockUserProjectMemberships, createGrant, createPrivilege };};describe("secretAccessApprovalGlobalResource.postApprovalTxRoutine", () => {test("grants a requester who is still a member of the project", async () => {- const { resource, isUserProjectMember, createPrivilege } = buildResource({ isRequesterProjectMember: true });+ const { resource, lockUserProjectMemberships, createPrivilege } = buildResource({ isRequesterProjectMember: true });await expect(resource.postApprovalTxRoutine(approvedRequest, TX)).resolves.toEqual({ grantId: "grant-1" });- expect(isUserProjectMember).toHaveBeenCalledWith({ projectId: "project-1", userId: "user-1" }, TX);+ expect(lockUserProjectMemberships).toHaveBeenCalledWith({ projectId: "project-1", userId: "user-1" }, TX);expect(createPrivilege).toHaveBeenCalledWith(expect.objectContaining({ actorUserId: "user-1", projectId: "project-1", grantId: "grant-1" }),TXdiff --git a/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts b/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.tsindex a1163fe5aa..787b0bfa53 100644--- a/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts+++ b/backend/src/services/approval-policy/secret-access/secret-access-policy-factory.ts@@ -21,7 +21,7 @@ type TSecretAccessApprovalGlobalResourceDep = {approvalPolicyDAL: Pick<TApprovalPolicyDALFactory, "findSecretAccessPolicyByEnvIdAndSecretPath">;approvalRequestGrantsDAL: Pick<TApprovalRequestGrantsDALFactory, "find" | "create">;additionalPrivilegeDAL: Pick<TAdditionalPrivilegeDALFactory, "create">;- membershipDAL: Pick<TMembershipDALFactory, "isUserProjectMember">;+ membershipDAL: Pick<TMembershipDALFactory, "lockUserProjectMemberships">;};export type TSecretAccessApprovalGlobalResource = ReturnType<typeof secretAccessApprovalGlobalResourceFactory>;@@ -72,9 +72,11 @@ export const secretAccessApprovalGlobalResourceFactory = ({throw new NotFoundError({ message: "The user who created this access request no longer exists" });}- // An additional privilege outlives a removal that ran before it was written, and takes effect if the- // user is ever added back, so it is never granted to someone outside the project.- if (!(await membershipDAL.isUserProjectMember({ projectId: request.projectId, userId: requesterId }, tx))) {+ // Held until this transaction commits, across the privilege insert below. A privilege written+ // after removal has deleted the previous ones takes effect again if the user is added back.+ if (+ !(await membershipDAL.lockUserProjectMemberships({ projectId: request.projectId, userId: requesterId }, tx))+ ) {throw new BadRequestError({message:"The user who created this access request is no longer a member of this project, so access cannot be granted."diff --git a/backend/src/services/membership/membership-dal.ts b/backend/src/services/membership/membership-dal.tsindex 55d5508872..7b61282eb2 100644--- a/backend/src/services/membership/membership-dal.ts+++ b/backend/src/services/membership/membership-dal.ts@@ -181,6 +181,29 @@ export const membershipDALFactory = (db: TDbClient) => {}};+ // Locks every matching project membership in id order, direct or through a group, until the+ // caller's transaction commits. The group-membership subquery is not locked.+ const lockUserProjectMemberships = async ({ projectId, userId }: { projectId: string; userId: string }, tx: Knex) => {+ try {+ const userGroupSubquery = tx(TableName.UserGroupMembership).where("userId", userId).select("groupId");++ const memberships = await tx(TableName.Membership)+ .where(`${TableName.Membership}.scope`, AccessScope.Project)+ .where(`${TableName.Membership}.scopeProjectId`, projectId)+ .where((qb) => {+ void qb+ .where(`${TableName.Membership}.actorUserId`, userId)+ .orWhereIn(`${TableName.Membership}.actorGroupId`, userGroupSubquery);+ })+ .orderBy(`${TableName.Membership}.id`)+ .select(`${TableName.Membership}.id`)+ .forUpdate();+ return memberships.length > 0;+ } catch (error) {+ throw new DatabaseError({ error, name: "Lock user project memberships" });+ }+ };+// Locks the row so a concurrent deactivation or removal of the same membership serializes behind the// caller. Always reads the primary, so it also bypasses the cached permission blob.const lockOrgMembershipForUser = async (@@ -254,6 +277,7 @@ export const membershipDALFactory = (db: TDbClient) => {findResourceMembershipsForActors,findResourceMembershipsForGroup,isUserProjectMember,+ lockUserProjectMemberships,lockOrgMembershipForUser,lockResourceMembershipForActor};