Skip to content

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

address grep comment

Andreyd7ce7584b034
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.ts
index 705de00ca9..4f7fa8a0c0 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
@@ -5,6 +5,7 @@ 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";
+import { TOrgDALFactory } from "@app/services/org/org-dal";
import { TUserDALFactory } from "@app/services/user/user-dal";
import { PamSessionStatus } from "../pam/pam-enums";
@@ -208,17 +209,25 @@ export const assertUserStillActiveInOrg = async ({
orgId,
userId,
membershipDAL,
+ orgDAL,
tx
}: {
orgId: string;
userId: string;
membershipDAL: Pick<TMembershipDALFactory, "lockOrgMembershipForUser">;
+ orgDAL: Pick<TOrgDALFactory, "findById">;
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."
- });
+ const org = await orgDAL.findById(orgId, tx);
+
+ const orgIds = org?.rootOrgId ? [orgId, org.rootOrgId] : [orgId];
+
+ for await (const id of orgIds) {
+ const membership = await membershipDAL.lockOrgMembershipForUser(id, 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.ts
index 5846d7cd3b..13124246a9 100644
--- a/backend/src/ee/services/pam-session/pam-session-service.ts
+++ b/backend/src/ee/services/pam-session/pam-session-service.ts
@@ -109,7 +109,7 @@ type TPamSessionServiceFactoryDep = {
TMfaSessionServiceFactory,
"createMfaSession" | "getMfaSession" | "deleteMfaSession" | "sendMfaCode"
>;
- orgDAL: Pick<TOrgDALFactory, "findOrgById">;
+ orgDAL: Pick<TOrgDALFactory, "findOrgById" | "findById">;
pamAccessRequestService: Pick<
TPamAccessRequestServiceFactory,
"checkGrant" | "getAccessStatusBatch" | "getFolderPolicyConfigured"
@@ -642,7 +642,13 @@ export const pamSessionServiceFactory = ({
const session = await pamSessionDAL.transaction(async (tx) => {
if (isUserActor) {
- await assertUserStillActiveInOrg({ orgId: actor.actorOrgId, userId: actor.actorId, membershipDAL, tx });
+ await assertUserStillActiveInOrg({
+ orgId: actor.actorOrgId,
+ userId: actor.actorId,
+ membershipDAL,
+ orgDAL,
+ tx
+ });
}
return pamSessionDAL.create(
@@ -705,7 +711,7 @@ export const pamSessionServiceFactory = ({
const session = await pamSessionDAL.transaction(async (tx) => {
if (isUserActor) {
- await assertUserStillActiveInOrg({ orgId: actor.actorOrgId, userId: actor.actorId, membershipDAL, tx });
+ await assertUserStillActiveInOrg({ orgId: actor.actorOrgId, userId: actor.actorId, membershipDAL, orgDAL, tx });
}
return pamSessionDAL.create(
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.ts
index b9e6c76594..44e45d9e1c 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
@@ -86,7 +86,7 @@ type TPamWebAccessServiceFactoryDep = {
TMfaSessionServiceFactory,
"createMfaSession" | "getMfaSession" | "deleteMfaSession" | "sendMfaCode"
>;
- orgDAL: Pick<TOrgDALFactory, "findOrgById">;
+ orgDAL: Pick<TOrgDALFactory, "findOrgById" | "findById">;
telemetryService: Pick<TTelemetryServiceFactory, "sendPostHogEvents">;
};
@@ -514,7 +514,7 @@ export const pamWebAccessServiceFactory = ({
const expiresAt = new Date(Date.now() + sessionDurationMs);
session = await pamSessionDAL.transaction(async (tx) => {
- await assertUserStillActiveInOrg({ orgId, userId, membershipDAL, tx });
+ await assertUserStillActiveInOrg({ orgId, userId, membershipDAL, orgDAL, tx });
return pamSessionDAL.create(
{