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
concurrency hardening
Andreyd5485ff69964
diff --git a/backend/src/ee/services/pam-session/pam-session-access-fns.ts b/backend/src/ee/services/pam-session/pam-session-access-fns.tsindex 4236ec0827..d8e2421810 100644--- a/backend/src/ee/services/pam-session/pam-session-access-fns.ts+++ b/backend/src/ee/services/pam-session/pam-session-access-fns.ts@@ -1,6 +1,7 @@import { Knex } from "knex";import { TGatewayV2ServiceFactory } from "@app/ee/services/gateway-v2/gateway-v2-service";+import { ForbiddenRequestError } from "@app/lib/errors";import { ActorType } from "@app/services/auth/auth-type";import { TMembershipDALFactory } from "@app/services/membership/membership-dal";import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";@@ -200,3 +201,22 @@ export const terminatePamSessionsForUsers = async ({}};};++export const assertUserStillActiveInOrg = async ({+ orgId,+ userId,+ membershipDAL,+ tx+}: {+ orgId: string;+ userId: string;+ membershipDAL: Pick<TMembershipDALFactory, "lockOrgMembershipForUser">;+ tx: Knex;+}) => {+ const membership = await membershipDAL.lockOrgMembershipForUser(orgId, userId, tx);+ if (!membership || !membership.isActive) {+ throw new ForbiddenRequestError({+ message: "Your organization membership is no longer active. Contact an organization admin to restore access."+ });+ }+};diff --git a/backend/src/ee/services/pam-session/pam-session-service.ts b/backend/src/ee/services/pam-session/pam-session-service.tsindex 68c59e2349..5846d7cd3b 100644--- a/backend/src/ee/services/pam-session/pam-session-service.ts+++ b/backend/src/ee/services/pam-session/pam-session-service.ts@@ -69,6 +69,7 @@ import {} from "./aws-iam/aws-iam-federation";import { getAzureAccessTokens } from "./azure/azure-federation";import { mintGcpAccessToken } from "./gcp/gcp-federation";+import { assertUserStillActiveInOrg } from "./pam-session-access-fns";import { DEFAULT_SESSION_DURATION_MS } from "./pam-session-constants";import { TPamSessionDALFactory } from "./pam-session-dal";import { TPamSessionExpirationServiceFactory } from "./pam-session-expiration-queue";@@ -89,13 +90,14 @@ type TPamSessionServiceFactoryDep = {| "create"| "endSessionById"| "terminateSessionById"+ | "transaction"| "updateById"| "claimRecordingSecrets"| "activateSession">;pamAccountDAL: Pick<TPamAccountDALFactory, "findByIdWithDetails" | "findOne">;pamFolderDAL: Pick<TPamFolderDALFactory, "findOne">;- membershipDAL: Pick<TMembershipDALFactory, "findResourceMembershipsForActor">;+ membershipDAL: Pick<TMembershipDALFactory, "findResourceMembershipsForActor" | "lockOrgMembershipForUser">;membershipRoleDAL: Pick<TMembershipRoleDALFactory, "find">;permissionService: Pick<TPermissionServiceFactory, "getProjectPermission" | "getResourcePermission">;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;@@ -638,24 +640,33 @@ export const pamSessionServiceFactory = ({}}- const session = await pamSessionDAL.create({- status: PamSessionStatus.Active,- accessMethod,- expiresAt,- startedAt: new Date(),- accountName: account.name,- accountType: account.accountType,- actorEmail,- actorIp,- actorName,- actorUserAgent,- projectId,- accountId: account.id,- // userId FKs users and identityId FKs identities; exactly one is set based on the actor type- userId: isUserActor ? actor.actorId : null,- identityId: isUserActor ? null : actor.actorId,- reason: trimmedReason,- folderName: account.folderName+ const session = await pamSessionDAL.transaction(async (tx) => {+ if (isUserActor) {+ await assertUserStillActiveInOrg({ orgId: actor.actorOrgId, userId: actor.actorId, membershipDAL, tx });+ }++ return pamSessionDAL.create(+ {+ status: PamSessionStatus.Active,+ accessMethod,+ expiresAt,+ startedAt: new Date(),+ accountName: account.name,+ accountType: account.accountType,+ actorEmail,+ actorIp,+ actorName,+ actorUserAgent,+ projectId,+ accountId: account.id,+ // userId FKs users and identityId FKs identities; exactly one is set based on the actor type+ userId: isUserActor ? actor.actorId : null,+ identityId: isUserActor ? null : actor.actorId,+ reason: trimmedReason,+ folderName: account.folderName+ },+ tx+ );});await pamSessionExpirationService.scheduleSessionExpiration(session.id, expiresAt);@@ -692,25 +703,34 @@ export const pamSessionServiceFactory = ({const user = isUserActor ? await userDAL.findById(actor.actorId) : null;const expiresAt = new Date(Date.now() + sessionDurationMs);- const session = await pamSessionDAL.create({- status: PamSessionStatus.Starting,- accessMethod: PamAccessMethod.Cli,- expiresAt,- accountName: account.name,- accountType: account.accountType,- actorEmail,- actorIp,- actorName,- actorUserAgent,- projectId,- accountId: account.id,- // userId FKs users and identityId FKs identities; exactly one is set based on the actor type- userId: isUserActor ? actor.actorId : null,- identityId: isUserActor ? null : actor.actorId,- gatewayId: effectiveGatewayId,- reason: trimmedReason,- folderName: account.folderName,- selectedHost: connectHost+ const session = await pamSessionDAL.transaction(async (tx) => {+ if (isUserActor) {+ await assertUserStillActiveInOrg({ orgId: actor.actorOrgId, userId: actor.actorId, membershipDAL, tx });+ }++ return pamSessionDAL.create(+ {+ status: PamSessionStatus.Starting,+ accessMethod: PamAccessMethod.Cli,+ expiresAt,+ accountName: account.name,+ accountType: account.accountType,+ actorEmail,+ actorIp,+ actorName,+ actorUserAgent,+ projectId,+ accountId: account.id,+ // userId FKs users and identityId FKs identities; exactly one is set based on the actor type+ userId: isUserActor ? actor.actorId : null,+ identityId: isUserActor ? null : actor.actorId,+ gatewayId: effectiveGatewayId,+ reason: trimmedReason,+ folderName: account.folderName,+ selectedHost: connectHost+ },+ tx+ );});await pamSessionDAL.activateSession(session.id);diff --git a/backend/src/ee/services/pam-web-access/pam-web-access-service.ts b/backend/src/ee/services/pam-web-access/pam-web-access-service.tsindex 1f7215232b..b9e6c76594 100644--- a/backend/src/ee/services/pam-web-access/pam-web-access-service.ts+++ b/backend/src/ee/services/pam-web-access/pam-web-access-service.ts@@ -20,6 +20,7 @@ import { TAuthTokenServiceFactory } from "@app/services/auth-token/auth-token-seimport { TokenType } from "@app/services/auth-token/auth-token-types";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { KmsDataKey } from "@app/services/kms/kms-types";+import { TMembershipDALFactory } from "@app/services/membership/membership-dal";import { TMfaSessionServiceFactory } from "@app/services/mfa-session/mfa-session-service";import { TOrgDALFactory } from "@app/services/org/org-dal";import { TTelemetryServiceFactory } from "@app/services/telemetry/telemetry-service";@@ -40,6 +41,7 @@ import {PamAccountAccessibilityIssue,resolveSelectedHost} from "../pam-account/pam-account-schemas";+import { assertUserStillActiveInOrg } from "../pam-session/pam-session-access-fns";import { TPamSessionDALFactory } from "../pam-session/pam-session-dal";import { reportPamSessionEnded } from "../pam-session/pam-session-fns";import { SESSION_HANDLERS } from "./pam-session-handlers";@@ -73,7 +75,9 @@ type TPamWebAccessServiceFactoryDep = {| "endExpiredWebSessions"| "isSessionTerminated"| "updateById"+ | "transaction">;+ membershipDAL: Pick<TMembershipDALFactory, "lockOrgMembershipForUser">;gatewayV2Service: Pick<TGatewayV2ServiceFactory, "getPAMConnectionDetails">;gatewayPoolService: Pick<TGatewayPoolServiceFactory, "resolveEffectiveGatewayId" | "runWithPoolFailover">;kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;@@ -120,6 +124,7 @@ export const pamWebAccessServiceFactory = ({userDAL,mfaSessionService,orgDAL,+ membershipDAL,telemetryService}: TPamWebAccessServiceFactoryDep) => {const decrypt = async (projectId: string, blob: Buffer): Promise<Record<string, unknown>> => {@@ -508,23 +513,30 @@ export const pamWebAccessServiceFactory = ({const sessionDurationMs = sessionDurationCapMs;const expiresAt = new Date(Date.now() + sessionDurationMs);- session = await pamSessionDAL.create({- status: PamSessionStatus.Starting,- accessMethod: PamAccessMethod.Web,- expiresAt,- accountName,- accountType: account.accountType,- actorEmail,- actorIp,- actorName,- actorUserAgent,- projectId,- accountId: account.id,- userId,- gatewayId: effectiveGatewayId,- reason: accessReason?.trim() || null,- folderName: account.folderName,- selectedHost: targetHost+ session = await pamSessionDAL.transaction(async (tx) => {+ await assertUserStillActiveInOrg({ orgId, userId, membershipDAL, tx });++ return pamSessionDAL.create(+ {+ status: PamSessionStatus.Starting,+ accessMethod: PamAccessMethod.Web,+ expiresAt,+ accountName,+ accountType: account.accountType,+ actorEmail,+ actorIp,+ actorName,+ actorUserAgent,+ projectId,+ accountId: account.id,+ userId,+ gatewayId: effectiveGatewayId,+ reason: accessReason?.trim() || null,+ folderName: account.folderName,+ selectedHost: targetHost+ },+ tx+ );});const createdSession = session;diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 4450ecf450..5734f23717 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -2211,6 +2211,7 @@ export const registerRoutes = async (userDAL,mfaSessionService,orgDAL,+ membershipDAL,telemetryService});diff --git a/backend/src/services/membership/membership-dal.ts b/backend/src/services/membership/membership-dal.tsindex ae2098a7a0..32b0e18bc3 100644--- a/backend/src/services/membership/membership-dal.ts+++ b/backend/src/services/membership/membership-dal.ts@@ -1,7 +1,7 @@import { Knex } from "knex";import { TDbClient } from "@app/db";-import { RESOURCE_SCOPE, TableName, TMemberships } from "@app/db/schemas";+import { AccessScope, RESOURCE_SCOPE, TableName, TMemberships } from "@app/db/schemas";import { DatabaseError } from "@app/lib/errors";import { ormify, selectAllTableCols } from "@app/lib/knex";import { ActorType } from "@app/services/auth/auth-type";@@ -159,5 +159,29 @@ export const membershipDALFactory = (db: TDbClient) => {}};- return { ...orm, findResourceMembershipsForActor, findResourceMembershipsForActors, findResourceMembershipsForGroup };+ // 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 (+ orgId: string,+ userId: string,+ tx: Knex+ ): Promise<TMemberships | undefined> => {+ try {+ return await tx(TableName.Membership)+ .where({ scope: AccessScope.Organization, scopeOrgId: orgId, actorUserId: userId })+ .select(selectAllTableCols(TableName.Membership))+ .forUpdate()+ .first();+ } catch (error) {+ throw new DatabaseError({ error, name: "LockOrgMembershipForUser" });+ }+ };++ return {+ ...orm,+ findResourceMembershipsForActor,+ findResourceMembershipsForActors,+ findResourceMembershipsForGroup,+ lockOrgMembershipForUser+ };};