Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

Merge remote-tracking branch 'origin/main' into PAM-531

Andrey4bd74acf4e44
diff --cc backend/e2e-test/membership-dal.spec.ts
index 0000000000,d8b7c0c2e8..77bd7779e8
mode 000000,100644..100644
--- a/backend/e2e-test/membership-dal.spec.ts
+++ b/backend/e2e-test/membership-dal.spec.ts
@@@ -1,0 -1,103 +1,111 @@@
+ import { afterAll, beforeAll, describe, expect, test } from "vitest";
+
+ import { OrgMembershipRole, ProjectMembershipRole } from "@app/db/schemas";
+ import { groupDALFactory } from "@app/ee/services/group/group-dal";
+ import { removeUsersFromGroupByUserIds } from "@app/ee/services/group/group-fns";
+ import { userGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal";
++import { pamAccountDALFactory } from "@app/ee/services/pam-account/pam-account-dal";
++import { pamSessionDALFactory } from "@app/ee/services/pam-session/pam-session-dal";
+ import { additionalPrivilegeDALFactory } from "@app/services/additional-privilege/additional-privilege-dal";
+ import { alertChannelRecipientDALFactory } from "@app/services/alert/alert-channel-recipient-dal";
+ import { membershipDALFactory } from "@app/services/membership/membership-dal";
++import { membershipRoleDALFactory } from "@app/services/membership/membership-role-dal";
+ import { membershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";
+ import { projectKeyDALFactory } from "@app/services/project-key/project-key-dal";
+ import { userDALFactory } from "@app/services/user/user-dal";
+
+ import { createIsolatedOrgAndProject } from "./testUtils/fixtures";
+ import { createProjectGroup } from "./testUtils/groups";
+ import { pollUntil } from "./testUtils/poll";
+ import { addUserMembership, createUser, deleteUsers } from "./testUtils/users";
+
+ const membershipDAL = membershipDALFactory(testDb);
+
+ const removalDeps = {
+ userDAL: userDALFactory(testDb),
+ userGroupMembershipDAL: userGroupMembershipDALFactory(testDb),
+ membershipGroupDAL: membershipGroupDALFactory(testDb),
+ projectKeyDAL: projectKeyDALFactory(testDb),
+ additionalPrivilegeDAL: additionalPrivilegeDALFactory(testDb),
+ alertChannelRecipientDAL: alertChannelRecipientDALFactory(testDb),
+ groupDAL: groupDALFactory(testDb),
- eventEmitter: { emit: async () => {} }
++ eventEmitter: { emit: async () => {} },
++ membershipDAL,
++ membershipRoleDAL: membershipRoleDALFactory(testDb),
++ pamAccountDAL: pamAccountDALFactory(testDb),
++ pamSessionDAL: pamSessionDALFactory(testDb),
++ gatewayV2Service: { getPAMConnectionDetails: () => Promise.reject(new Error("unexpected gateway call")) }
+ };
+
+ const waitUntilBlockedBy = (pid: number) =>
+ pollUntil({
+ describe: `a query blocked by backend ${pid}`,
+ read: async () => {
+ const { rows } = await testDb.raw(
+ "select count(*)::int as waiting from pg_stat_activity where ? = any(pg_blocking_pids(pid))",
+ [pid]
+ );
+ return rows[0].waiting as number;
+ },
+ done: (waiting) => waiting > 0,
+ timeoutMs: 5_000
+ });
+
+ describe("membershipDAL.lockUserProjectMemberships", () => {
+ let fixture: Awaited<ReturnType<typeof createIsolatedOrgAndProject>>;
+ const userIds: string[] = [];
+
+ const createOrgUser = async (label: string) => {
+ const { userId } = await createUser(label);
+ userIds.push(userId);
+ await addUserMembership({ userId, orgId: fixture.orgId, role: OrgMembershipRole.Member });
+ return userId;
+ };
+
+ const lockWhileRemovedFromGroup = async (userId: string, group: Awaited<ReturnType<typeof createProjectGroup>>) => {
+ const removal = await testDb.transaction();
+ const grant = await testDb.transaction();
+ try {
+ const { rows } = await removal.raw("select pg_backend_pid() as pid");
+ await removeUsersFromGroupByUserIds({ ...removalDeps, group, userIds: [userId], tx: removal });
+
+ const isMember = membershipDAL.lockUserProjectMemberships({ projectId: fixture.projectId, userId }, grant);
+ await waitUntilBlockedBy(rows[0].pid as number);
+ await removal.commit();
+
+ return await isMember;
+ } finally {
+ if (!removal.isCompleted()) await removal.rollback();
+ if (!grant.isCompleted()) await grant.rollback();
+ }
+ };
+
+ beforeAll(async () => {
+ fixture = await createIsolatedOrgAndProject("membership-lock");
+ });
+
+ afterAll(async () => {
+ await fixture.cleanup();
+ await deleteUsers(userIds);
+ });
+
+ test("does not count a group the user was removed from while waiting for its lock", async () => {
+ const userId = await createOrgUser("group-only");
+ const group = await createProjectGroup({ orgId: fixture.orgId, projectId: fixture.projectId, userIds: [userId] });
+
+ expect(await lockWhileRemovedFromGroup(userId, group)).toBe(false);
+ });
+
+ test("still counts a direct membership when the user leaves a group while waiting for its lock", async () => {
+ const userId = await createOrgUser("direct-and-group");
+ await addUserMembership({
+ userId,
+ orgId: fixture.orgId,
+ projectId: fixture.projectId,
+ role: ProjectMembershipRole.Member
+ });
+ const group = await createProjectGroup({ orgId: fixture.orgId, projectId: fixture.projectId, userIds: [userId] });
+
+ expect(await lockWhileRemovedFromGroup(userId, group)).toBe(true);
+ });
+ });
diff --cc backend/src/ee/services/group/group-fns.ts
index 177ec0ce9d,fad63abfa6..e26a615104
--- a/backend/src/ee/services/group/group-fns.ts
+++ b/backend/src/ee/services/group/group-fns.ts
@@@ -6,9 -6,9 +6,10 @@@ import { BadRequestError, ForbiddenRequ
import { logger } from "@app/lib/logger";
import { recordLegacyRootKeyUsageMetric } from "@app/lib/telemetry/metrics";
import { AgentVaultIdentities, PamIdentities, SecretIdentities } from "@app/services/license-client";
+ import { lockMembershipsById } from "@app/services/membership/membership-dal";
import { emitGroupMembershipRemoved, toOrgMembershipActors } from "@app/services/org/org-membership-events";
+import { terminatePamSessionsLosingGroupAccess } from "../pam-session/pam-session-access-fns";
import {
TAddIdentitiesToGroup,
TAddUsersToGroup,
diff --cc backend/src/ee/services/group/group-types.ts
index f3bb36bec3,10e8e20ec0..386d041360
--- a/backend/src/ee/services/group/group-types.ts
+++ b/backend/src/ee/services/group/group-types.ts
@@@ -10,13 -7,12 +10,13 @@@ import { TAlertChannelRecipientDALFacto
import { TEventEmitter } from "@app/services/event-outbox/event-outbox-types";
import { TIdentityDALFactory } from "@app/services/identity/identity-dal";
import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";
+ import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";
import { TMembershipDALFactory } from "@app/services/membership/membership-dal";
+import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";
- import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";
import { TOrgDALFactory } from "@app/services/org/org-dal";
- import { TProjectDALFactory } from "@app/services/project/project-dal";
import { TProjectBotDALFactory } from "@app/services/project-bot/project-bot-dal";
import { TProjectKeyDALFactory } from "@app/services/project-key/project-key-dal";
+ import { TProjectDALFactory } from "@app/services/project/project-dal";
import { TUserDALFactory } from "@app/services/user/user-dal";
import { TIdentityGroupMembershipDALFactory } from "./identity-group-membership-dal";
diff --cc backend/src/ee/services/ldap-config/ldap-config-service.ts
index c3c61d990c,cf9ca8f3ca..b7ca4d9165
--- a/backend/src/ee/services/ldap-config/ldap-config-service.ts
+++ b/backend/src/ee/services/ldap-config/ldap-config-service.ts
@@@ -42,14 -39,13 +42,14 @@@ import { TEventEmitter } from "@app/ser
import { TKmsServiceFactory } from "@app/services/kms/kms-service";
import { KmsDataKey } from "@app/services/kms/kms-types";
import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";
+ import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";
+import { TMembershipDALFactory } from "@app/services/membership/membership-dal";
import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";
- import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";
import { TOrgDALFactory } from "@app/services/org/org-dal";
import { getDefaultOrgMembershipRole } from "@app/services/org/org-role-fns";
- import { TProjectDALFactory } from "@app/services/project/project-dal";
import { TProjectBotDALFactory } from "@app/services/project-bot/project-bot-dal";
import { TProjectKeyDALFactory } from "@app/services/project-key/project-key-dal";
+ import { TProjectDALFactory } from "@app/services/project/project-dal";
import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";
import { getServerCfg } from "@app/services/super-admin/super-admin-service";
import { LoginMethod } from "@app/services/super-admin/super-admin-types";
diff --cc backend/src/ee/services/oidc/oidc-config-service.ts
index fa1fe95fa3,9fb17cae91..93f8c8149d
--- a/backend/src/ee/services/oidc/oidc-config-service.ts
+++ b/backend/src/ee/services/oidc/oidc-config-service.ts
@@@ -48,14 -45,13 +48,14 @@@ import { TEventEmitter } from "@app/ser
import { TKmsServiceFactory } from "@app/services/kms/kms-service";
import { KmsDataKey } from "@app/services/kms/kms-types";
import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";
+ import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";
+import { TMembershipDALFactory } from "@app/services/membership/membership-dal";
import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";
- import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";
import { TOrgDALFactory } from "@app/services/org/org-dal";
import { getDefaultOrgMembershipRole } from "@app/services/org/org-role-fns";
- import { TProjectDALFactory } from "@app/services/project/project-dal";
import { TProjectBotDALFactory } from "@app/services/project-bot/project-bot-dal";
import { TProjectKeyDALFactory } from "@app/services/project-key/project-key-dal";
+ import { TProjectDALFactory } from "@app/services/project/project-dal";
import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";
import { getServerCfg } from "@app/services/super-admin/super-admin-service";
import { LoginMethod } from "@app/services/super-admin/super-admin-types";
diff --cc backend/src/ee/services/pam-web-access/pam-web-access-service.ts
index 78b2832118,afc05e86f7..aadcc49d27
--- 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
@@@ -46,6 -38,13 +39,13 @@@ import
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 {
+ PAM_CANCELLATION_FLUSH_TIMEOUT_MS,
+ PamAccessMethod,
+ PamSessionEndReason,
+ PamSessionStatus
+ } from "../pam/pam-enums";
-import { checkAccountAccess } from "../pam/pam-permission";
++import { checkAccountAccess, getLaunchAccessRemainingMs } from "../pam/pam-permission";
import { SESSION_HANDLERS } from "./pam-session-handlers";
import {
DEFAULT_WEB_SESSION_DURATION_MS,
diff --cc backend/src/ee/services/saml-config/saml-config-service.ts
index e3e05fa3f2,8045aec1fb..75d95c9328
--- a/backend/src/ee/services/saml-config/saml-config-service.ts
+++ b/backend/src/ee/services/saml-config/saml-config-service.ts
@@@ -32,14 -32,13 +32,14 @@@ import { TIdentityMetadataDALFactory }
import { TKmsServiceFactory } from "@app/services/kms/kms-service";
import { KmsDataKey } from "@app/services/kms/kms-types";
import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";
+ import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";
+import { TMembershipDALFactory } from "@app/services/membership/membership-dal";
import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";
- import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";
import { TOrgDALFactory } from "@app/services/org/org-dal";
import { getDefaultOrgMembershipRole } from "@app/services/org/org-role-fns";
- import { TProjectDALFactory } from "@app/services/project/project-dal";
import { TProjectBotDALFactory } from "@app/services/project-bot/project-bot-dal";
import { TProjectKeyDALFactory } from "@app/services/project-key/project-key-dal";
+ import { TProjectDALFactory } from "@app/services/project/project-dal";
import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";
import { getServerCfg } from "@app/services/super-admin/super-admin-service";
import { LoginMethod } from "@app/services/super-admin/super-admin-types";
diff --cc backend/src/ee/services/scim/scim-service.ts
index a9c224e9a0,855053bebe..ba238d526c
--- a/backend/src/ee/services/scim/scim-service.ts
+++ b/backend/src/ee/services/scim/scim-service.ts
@@@ -52,9 -48,8 +52,9 @@@ import { TUsageMeteringServiceFactory
import { TMembershipGroupDALFactory } from "@app/services/membership-group/membership-group-dal";
import { TMembershipUserDALFactory } from "@app/services/membership-user/membership-user-dal";
import { assertWillRetainOrgAdmin } from "@app/services/membership-user/membership-user-fns";
++import { TMembershipDALFactory } from "@app/services/membership/membership-dal";
+ import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";
+ import { TProjectAccessRevokeServiceFactory } from "@app/services/membership/project-access-revoke-service";
import { TOrgDALFactory } from "@app/services/org/org-dal";
import { deleteOrgMembershipsFn } from "@app/services/org/org-fns";
import { emitGroupRemoved, toOrgMembershipActors } from "@app/services/org/org-membership-events";