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
only take into account active memberships
Thiago Araujo da Silva6e070714ff1d
diff --git a/backend/src/services/org/org-dal.ts b/backend/src/services/org/org-dal.tsindex 5999bd4aac..80053f10a5 100644--- a/backend/src/services/org/org-dal.ts+++ b/backend/src/services/org/org-dal.ts@@ -863,6 +863,34 @@ export const orgDALFactory = (db: TDbClient) => {}};+ const findActiveEffectiveOrgMembershipsByUserId = async (userId: string, tx?: Knex): Promise<TMemberships[]> => {+ try {+ const conn = tx ?? db.replicaNode();++ const userGroupIdsSubquery = conn(TableName.UserGroupMembership)+ .where(`${TableName.UserGroupMembership}.userId`, userId)+ .select(db.ref("groupId").withSchema(TableName.UserGroupMembership));++ const rows = await conn(TableName.Membership)+ .where(`${TableName.Membership}.scope`, AccessScope.Organization)+ .where(`${TableName.Membership}.isActive`, true)+ .where((qb) => {+ void qb+ .where(`${TableName.Membership}.actorUserId`, userId)+ .orWhereIn(`${TableName.Membership}.actorGroupId`, userGroupIdsSubquery);+ })+ .where((qb) => {+ void qb+ .where(`${TableName.Membership}.status`, OrgMembershipStatus.Accepted)+ .orWhereNull(`${TableName.Membership}.status`);+ })+ .select(selectAllTableCols(TableName.Membership));+ return rows as TMemberships[];+ } catch (error) {+ throw new DatabaseError({ error, name: "Find active effective org memberships by user id" });+ }+ };+/*** Returns the first effective org membership for an actor (user or identity): direct or via group.* Use for access checks and to get a single membership id/role. For all memberships use findEffectiveOrgMemberships.@@ -1075,6 +1103,7 @@ export const orgDALFactory = (db: TDbClient) => {findMembership,findEffectiveOrgMembership,findEffectiveOrgMemberships,+ findActiveEffectiveOrgMembershipsByUserId,findMembershipWithScimFilter,createMembership,bulkCreateMemberships,diff --git a/backend/src/services/user/user-service.ts b/backend/src/services/user/user-service.tsindex fac48b30c1..af7902b0b1 100644--- a/backend/src/services/user/user-service.ts+++ b/backend/src/services/user/user-service.ts@@ -1,7 +1,7 @@import { ForbiddenError } from "@casl/ability";import { Knex } from "knex";-import { AccessScope, OrganizationActionScope, OrgMembershipStatus, TUsers } from "@app/db/schemas";+import { AccessScope, OrganizationActionScope, TUsers } from "@app/db/schemas";import { TEmailDomainDALFactory } from "@app/ee/services/email-domain/email-domain-dal";import { EmailDomainStatus } from "@app/ee/services/email-domain/email-domain-types";import { OrgPermissionMemberActions, OrgPermissionSubjects } from "@app/ee/services/permission/org-permission";@@ -9,6 +9,7 @@ import { TPermissionServiceFactory } from "@app/ee/services/permission/permissioimport { getConfig } from "@app/lib/config/env";import { crypto } from "@app/lib/crypto";import { BadRequestError, ForbiddenRequestError, NotFoundError } from "@app/lib/errors";+import { unique } from "@app/lib/fn";import { logger } from "@app/lib/logger";import { sanitizeEmail, validateEmail } from "@app/lib/validator";import { TAlertChannelRecipientDALFactory } from "@app/services/alert/alert-channel-recipient-dal";@@ -72,7 +73,14 @@ type TUserServiceFactoryDep = {| "findAllMyAccounts">;groupProjectDAL: Pick<TGroupProjectDALFactory, "findByUserId">;- orgDAL: Pick<TOrgDALFactory, "findById" | "find" | "findEffectiveOrgMembership" | "findEffectiveOrgMemberships">;+ orgDAL: Pick<+ TOrgDALFactory,+ | "findById"+ | "find"+ | "findEffectiveOrgMembership"+ | "findEffectiveOrgMemberships"+ | "findActiveEffectiveOrgMembershipsByUserId"+ >;membershipUserDAL: Pick<TMembershipUserDALFactory, "find" | "insertMany" | "findOne" | "updateById">;tokenService: Pick<TAuthTokenServiceFactory, "createTokenForUser" | "validateTokenForUser" | "revokeAllMySessions">;smtpService: Pick<TSmtpService, "sendMail">;@@ -221,16 +229,15 @@ export const userServiceFactory = ({};const findMfaEnforcingOrgs = async (userId: string) => {- const userOrgMemberships = await membershipUserDAL.find({- actorUserId: userId,- scope: AccessScope.Organization,- status: OrgMembershipStatus.Accepted- });- if (!userOrgMemberships.length) return [];+ const memberships = await orgDAL.findActiveEffectiveOrgMembershipsByUserId(userId);+ if (!memberships.length) return [];- const orgIds = userOrgMemberships.map((membership) => membership.scopeOrgId);- const organizations = await orgDAL.find({ $in: { id: orgIds } });- return organizations.filter((org) => org.enforceMfa);+ const memberOrgs = await orgDAL.find({+ $in: { id: unique(memberships.map((membership) => membership.scopeOrgId)) }+ });+ const rootOrgIds = unique(memberOrgs.map((org) => org.rootOrgId ?? org.id));+ const rootOrgs = await orgDAL.find({ $in: { id: rootOrgIds } });+ return rootOrgs.filter((org) => org.enforceMfa);};const hasMfaEnforcingOrg = async (userId: string) => (await findMfaEnforcingOrgs(userId)).length > 0;