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 pam checkup
Thiago Araujo da Silva1ba9fec08f09
diff --git a/backend/src/ee/services/pam-session/pam-session-access-fns.test.ts b/backend/src/ee/services/pam-session/pam-session-access-fns.test.tsnew file mode 100644index 0000000000..d50517d3cf--- /dev/null+++ b/backend/src/ee/services/pam-session/pam-session-access-fns.test.ts@@ -0,0 +1,67 @@+import { Knex } from "knex";+import { vi } from "vitest";++import { TMemberships } from "@app/db/schemas";++import { assertUserStillActiveInOrg } from "./pam-session-access-fns";++describe("assertUserStillActiveInOrg", () => {+ const tx = {} as Knex;++ const build = ({+ rows,+ groupAccessOrgIds = []+ }: {+ rows: Record<string, { isActive: boolean } | undefined>;+ groupAccessOrgIds?: string[];+ }) => {+ const membershipDAL = {+ lockOrgMembershipForUser: vi.fn(async (orgId: string) => rows[orgId] as TMemberships | undefined)+ };+ const orgDAL = {+ findById: vi.fn().mockResolvedValue({ id: "sub-org", rootOrgId: "root-org" }),+ lockActorsForOrgAccess: vi.fn().mockResolvedValue(undefined),+ findActorsWithActiveOrgAccess: vi.fn(async ({ orgId, userIds }: { orgId: string; userIds: string[] }) => ({+ userIds: new Set(groupAccessOrgIds.includes(orgId) ? userIds : []),+ identityIds: new Set<string>()+ }))+ };+ const run = () =>+ assertUserStillActiveInOrg({+ orgId: "sub-org",+ userId: "user-1",+ membershipDAL,+ orgDAL: orgDAL as unknown as Parameters<typeof assertUserStillActiveInOrg>[0]["orgDAL"],+ tx+ });+ return { run, orgDAL };+ };++ test("passes on active rows of their own without taking the actor lock", async () => {+ const { run, orgDAL } = build({ rows: { "sub-org": { isActive: true }, "root-org": { isActive: true } } });+ await expect(run()).resolves.toBeUndefined();+ expect(orgDAL.lockActorsForOrgAccess).not.toHaveBeenCalled();+ });++ test("refuses a deactivated row even when a group would reach the org", async () => {+ const { run } = build({+ rows: { "sub-org": { isActive: false }, "root-org": { isActive: true } },+ groupAccessOrgIds: ["sub-org"]+ });+ await expect(run()).rejects.toThrow("no longer active");+ });++ test("passes a user who reaches the sub-org only through a group, under the actor lock", async () => {+ const { run, orgDAL } = build({ rows: { "root-org": { isActive: true } }, groupAccessOrgIds: ["sub-org"] });+ await expect(run()).resolves.toBeUndefined();+ expect(orgDAL.lockActorsForOrgAccess).toHaveBeenCalledWith(["user-1"], tx);+ expect(orgDAL.lockActorsForOrgAccess.mock.invocationCallOrder[0]).toBeLessThan(+ orgDAL.findActorsWithActiveOrgAccess.mock.invocationCallOrder[0]+ );+ });++ test("refuses a user with no row and no group path", async () => {+ const { run } = build({ rows: { "root-org": { isActive: true } } });+ await expect(run()).rejects.toThrow("no longer active");+ });+});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 4f7fa8a0c0..ad3c125288 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@@ -215,7 +215,7 @@ export const assertUserStillActiveInOrg = async ({orgId: string;userId: string;membershipDAL: Pick<TMembershipDALFactory, "lockOrgMembershipForUser">;- orgDAL: Pick<TOrgDALFactory, "findById">;+ orgDAL: Pick<TOrgDALFactory, "findById" | "lockActorsForOrgAccess" | "findActorsWithActiveOrgAccess">;tx: Knex;}) => {const org = await orgDAL.findById(orgId, tx);@@ -224,7 +224,16 @@ export const assertUserStillActiveInOrg = async ({for await (const id of orgIds) {const membership = await membershipDAL.lockOrgMembershipForUser(id, userId, tx);- if (!membership || !membership.isActive) {+ let isActive = Boolean(membership?.isActive);+ if (!membership) {+ await orgDAL.lockActorsForOrgAccess([userId], tx);+ const withAccess = await orgDAL.findActorsWithActiveOrgAccess(+ { orgId: id, userIds: [userId], identityIds: [] },+ tx+ );+ isActive = withAccess.userIds.has(userId);+ }+ if (!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 5977dd445c..447891717f 100644--- a/backend/src/ee/services/pam-session/pam-session-service.ts+++ b/backend/src/ee/services/pam-session/pam-session-service.ts@@ -110,7 +110,7 @@ type TPamSessionServiceFactoryDep = {TMfaSessionServiceFactory,"createMfaSession" | "getMfaSession" | "deleteMfaSession" | "sendMfaCode">;- orgDAL: Pick<TOrgDALFactory, "findOrgById" | "findById">;+ orgDAL: Pick<TOrgDALFactory, "findOrgById" | "findById" | "lockActorsForOrgAccess" | "findActorsWithActiveOrgAccess">;pamAccessRequestService: Pick<TPamAccessRequestServiceFactory,"checkGrant" | "getAccessStatusBatch" | "getFolderPolicyConfigured"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 db9ec4f0e9..2676faf32d 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@@ -87,7 +87,7 @@ type TPamWebAccessServiceFactoryDep = {TMfaSessionServiceFactory,"createMfaSession" | "getMfaSession" | "deleteMfaSession" | "sendMfaCode">;- orgDAL: Pick<TOrgDALFactory, "findOrgById" | "findById">;+ orgDAL: Pick<TOrgDALFactory, "findOrgById" | "findById" | "lockActorsForOrgAccess" | "findActorsWithActiveOrgAccess">;telemetryService: Pick<TTelemetryServiceFactory, "sendPostHogEvents">;};