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
lock on every change
Thiago Araujo da Silva5771879c4c2d
diff --git a/backend/AGENTS.md b/backend/AGENTS.mdindex 06797b4a9b..4df148a834 100644--- a/backend/AGENTS.md+++ b/backend/AGENTS.md@@ -942,9 +942,11 @@ itself whether the actor still reaches the org.- Every path that writes a project or resource membership for a user or identity, through`lockAndAssertActiveOrgAccess` (`services/org/org-access-fns.ts`), which locks and rechecks`findActorsWithActiveOrgAccess` inside the write's own transaction: the generic user and identity- `createMembership` at project scope, PAM's `addProductMember`, `addProductUserMembers` and- `addResourceMember`, and Agent Vault's `addProductMembers`. A new add path must call it before its write;- the pre-checks outside the transaction stay for their error messages but don't close the race.+ `createMembership` at project scope, the deprecated `addUsersToProject`, the org admin console's+ `grantProjectAdminAccess`, PKI application and signer `addMember` (their `addUserMembers` go through it),+ PAM's `addProductMember`, `addProductUserMembers` and `addResourceMember`, and Agent Vault's+ `addProductMembers`. A new add path must call it before its write; the pre-checks outside the transaction+ stay for their error messages but don't close the race.- **Indirect members can be assigned to projects, PAM and Agent Vault included.** Users and identities thatreach an org only through a linked group can get a direct project membership; that's the row the consumerrevokes once the group path goes away. Two helpers on `org-dal.ts`, and picking the wrong one is the bug:diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 05d1ce65f9..c501e2aa89 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -1810,6 +1810,7 @@ export const registerRoutes = async (const orgAdminService = orgAdminServiceFactory({smtpService,projectDAL,+ orgDAL,permissionService,notificationService,membershipRoleDAL,@@ -1996,6 +1997,7 @@ export const registerRoutes = async (const pkiApplicationMembershipService = pkiApplicationMembershipServiceFactory({pkiApplicationDAL,+ orgDAL,membershipDAL,membershipRoleDAL,permissionService,@@ -2009,6 +2011,7 @@ export const registerRoutes = async (const signerMembershipService = signerMembershipServiceFactory({signerDAL,+ orgDAL,membershipDAL,membershipRoleDAL,permissionService,diff --git a/backend/src/services/org-admin/org-admin-service.ts b/backend/src/services/org-admin/org-admin-service.tsindex 936ce4b7ec..0b07ee8371 100644--- a/backend/src/services/org-admin/org-admin-service.ts+++ b/backend/src/services/org-admin/org-admin-service.ts@@ -6,6 +6,8 @@ import { TPermissionServiceFactory } from "@app/ee/services/permission/permissioimport { NotFoundError } from "@app/lib/errors";import { AgentVaultIdentities } from "@app/services/license-client";import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";+import { lockAndAssertActiveOrgAccess } from "@app/services/org/org-access-fns";+import { TOrgDALFactory } from "@app/services/org/org-dal";import { TMembershipRoleDALFactory } from "../membership/membership-role-dal";import { TMembershipUserDALFactory } from "../membership-user/membership-user-dal";@@ -17,6 +19,7 @@ import { SmtpTemplates, TSmtpService } from "../smtp/smtp-service";import { TAccessProjectDTO, TListOrgProjectsDTO } from "./org-admin-types";type TOrgAdminServiceFactoryDep = {+ orgDAL: Pick<TOrgDALFactory, "lockActorsForOrgAccess" | "findActorsWithActiveOrgAccess">;permissionService: Pick<TPermissionServiceFactory, "getOrgPermission">;projectDAL: Pick<TProjectDALFactory, "find" | "findById" | "findProjectGhostUser" | "findOne">;projectMembershipDAL: Pick<TProjectMembershipDALFactory, "findAllProjectMembers">;@@ -37,7 +40,8 @@ export const orgAdminServiceFactory = ({notificationService,membershipUserDAL,membershipRoleDAL,- usageMeteringService+ usageMeteringService,+ orgDAL}: TOrgAdminServiceFactoryDep) => {const listOrgProjects = async ({actor,@@ -100,6 +104,7 @@ export const orgAdminServiceFactory = ({// Reads inside this transaction so it sees the primary, not a possibly-lagging replica, in// case a caller (e.g. PAM's bootstrap) just wrote this actor's membership moments earlier.const { isExistingMember, membership: updatedMembership } = await membershipUserDAL.transaction(async (tx) => {+ await lockAndAssertActiveOrgAccess({ orgDAL, orgId: actorOrgId, userIds: [actorId] }, tx);const projectMembership = await membershipUserDAL.findOne({ scopeProjectId: projectId, scope: AccessScope.Project, actorUserId: actorId },txdiff --git a/backend/src/services/pki-application/pki-application-membership-service.ts b/backend/src/services/pki-application/pki-application-membership-service.tsindex 6a990946cd..1ed34f16d2 100644--- a/backend/src/services/pki-application/pki-application-membership-service.ts+++ b/backend/src/services/pki-application/pki-application-membership-service.ts@@ -12,6 +12,8 @@ import {ResourcePermissionSub} from "@app/ee/services/permission/resource-permission";import { BadRequestError, NotFoundError } from "@app/lib/errors";+import { lockAndAssertActiveOrgAccess } from "@app/services/org/org-access-fns";+import { TOrgDALFactory } from "@app/services/org/org-dal";import { TApprovalPolicyDALFactory } from "../approval-policy/approval-policy-dal";import { ApprovalPolicyScope } from "../approval-policy/approval-policy-enums";@@ -32,6 +34,7 @@ import {} from "./pki-application-types";type TPkiApplicationMembershipServiceFactoryDep = {+ orgDAL: Pick<TOrgDALFactory, "lockActorsForOrgAccess" | "findActorsWithActiveOrgAccess">;pkiApplicationDAL: Pick<TPkiApplicationDALFactory, "findById" | "find">;membershipDAL: Pick<TMembershipDALFactory, "create" | "findById" | "find" | "deleteById" | "transaction">;membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create" | "find" | "delete" | "update">;@@ -69,7 +72,8 @@ export const pkiApplicationMembershipServiceFactory = ({groupDAL,userGroupMembershipDAL,identityGroupMembershipDAL,- approvalPolicyDAL+ approvalPolicyDAL,+ orgDAL}: TPkiApplicationMembershipServiceFactoryDep) => {const $projectGroupIds = async (projectId: string, tx?: Knex): Promise<string[]> => {const projectMemberships = await membershipDAL.find(@@ -270,6 +274,11 @@ export const pkiApplicationMembershipServiceFactory = ({});}+ await lockAndAssertActiveOrgAccess(+ { orgDAL, orgId: actorOrgId, userIds: userId ? [userId] : [], identityIds: identityId ? [identityId] : [] },+ tx+ );+const newMembership = await membershipDAL.create({scope: RESOURCE_SCOPE,diff --git a/backend/src/services/project-membership/project-membership-service.ts b/backend/src/services/project-membership/project-membership-service.tsindex ca368dfbff..93ea46dffc 100644--- a/backend/src/services/project-membership/project-membership-service.ts+++ b/backend/src/services/project-membership/project-membership-service.ts@@ -15,6 +15,7 @@ import { requestMemoize } from "@app/lib/request-context/request-memoizer";import { ApprovalPolicyType } from "@app/services/approval-policy/approval-policy-enums";import { AgentVaultIdentities, PamIdentities, SecretIdentities } from "@app/services/license-client";import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";+import { lockAndAssertActiveOrgAccess } from "@app/services/org/org-access-fns";import { TAccessApprovalPolicyApproverDALFactory } from "../../ee/services/access-approval-policy/access-approval-policy-approver-dal";import { TAccessApprovalPolicyDALFactory } from "../../ee/services/access-approval-policy/access-approval-policy-dal";@@ -59,7 +60,7 @@ type TProjectMembershipServiceFactoryDep = {membershipRoleDAL: Pick<TMembershipRoleDALFactory, "insertMany" | "find" | "delete" | "findRolesByMembershipIds">;userDAL: Pick<TUserDALFactory, "find">;userAliasDAL: Pick<TUserAliasDALFactory, "findBySsoExternalIds">;- orgDAL: Pick<TOrgDALFactory, "findById">;+ orgDAL: Pick<TOrgDALFactory, "findById" | "lockActorsForOrgAccess" | "findActorsWithActiveOrgAccess">;userGroupMembershipDAL: TUserGroupMembershipDALFactory;projectDAL: Pick<TProjectDALFactory, "findById" | "findProjectGhostUser" | "transaction" | "findProjectById">;projectKeyDAL: Pick<TProjectKeyDALFactory, "findLatestProjectKey" | "delete" | "insertMany">;@@ -367,6 +368,10 @@ export const projectMembershipServiceFactory = ({);await membershipUserDAL.transaction(async (tx) => {+ await lockAndAssertActiveOrgAccess(+ { orgDAL, orgId: actorOrgId, userIds: orgMembers.map(({ actorUserId }) => actorUserId as string) },+ tx+ );const projectMemberships = await membershipUserDAL.insertMany(orgMembers.map(({ actorUserId }) => ({scopeProjectId: projectId,diff --git a/backend/src/services/signer-membership/signer-membership-service.ts b/backend/src/services/signer-membership/signer-membership-service.tsindex 8b02fb7c91..824873b35e 100644--- a/backend/src/services/signer-membership/signer-membership-service.ts+++ b/backend/src/services/signer-membership/signer-membership-service.ts@@ -10,6 +10,8 @@ import {ResourcePermissionSub} from "@app/ee/services/permission/resource-permission";import { BadRequestError, NotFoundError } from "@app/lib/errors";+import { lockAndAssertActiveOrgAccess } from "@app/services/org/org-access-fns";+import { TOrgDALFactory } from "@app/services/org/org-dal";import { TApprovalPolicyDALFactory } from "../approval-policy/approval-policy-dal";import { ApprovalPolicyScope } from "../approval-policy/approval-policy-enums";@@ -33,6 +35,7 @@ import {} from "./signer-membership-types";type TSignerMembershipServiceFactoryDep = {+ orgDAL: Pick<TOrgDALFactory, "lockActorsForOrgAccess" | "findActorsWithActiveOrgAccess">;signerDAL: Pick<TSignerDALFactory, "findById" | "find">;membershipDAL: Pick<TMembershipDALFactory, "create" | "findById" | "find" | "deleteById" | "transaction">;membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create" | "find" | "delete" | "update">;@@ -82,7 +85,8 @@ export const signerMembershipServiceFactory = ({groupDAL,userGroupMembershipDAL,identityGroupMembershipDAL,- approvalPolicyDAL+ approvalPolicyDAL,+ orgDAL}: TSignerMembershipServiceFactoryDep) => {const $loadSignerOrThrow = async (signerId: string, projectId: string) => {const signer = await signerDAL.findById(signerId);@@ -232,6 +236,11 @@ export const signerMembershipServiceFactory = ({});}+ await lockAndAssertActiveOrgAccess(+ { orgDAL, orgId: actorOrgId, userIds: userId ? [userId] : [], identityIds: identityId ? [identityId] : [] },+ tx+ );+const newMembership = await membershipDAL.create({scope: RESOURCE_SCOPE,