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
address bot comments
Andrey3b2aeda434b8
diff --git a/backend/src/ee/services/github-org-sync/github-org-sync-service.ts b/backend/src/ee/services/github-org-sync/github-org-sync-service.tsindex 0738175e14..696fbaf269 100644--- a/backend/src/ee/services/github-org-sync/github-org-sync-service.ts+++ b/backend/src/ee/services/github-org-sync/github-org-sync-service.ts@@ -1107,6 +1107,7 @@ export const githubOrgSyncServiceFactory = ({const allTeams = [...Object.values(existingTeamsMap).flat()];+ const usersRemovedFromTeams = new Set<string>();for (const team of allTeams) {const teamName = team.name.toLowerCase();const expectedUserIds = new Set<string>();@@ -1200,17 +1201,7 @@ export const githubOrgSyncServiceFactory = ({updatedTeams.add(teamName);}- const sendPamCancellations = await terminatePamSessionsLosingGroupAccess({- userIds: membershipsToRemove- .map((membership) => activeMembersById.get(membership.orgMembershipId)?.user?.id)- .filter(Boolean) as string[],- actorId: orgPermission.id,- ...pamSessionDeps,- tx- });-return {- sendPamCancellations,usersToAdd,removedUserIds: membershipsToRemove.map((membership) => activeMembersById.get(membership.orgMembershipId)?.user?.id)@@ -1218,7 +1209,7 @@ export const githubOrgSyncServiceFactory = ({removedMembershipCount: membershipsToRemove.length};});- membershipChanges.sendPamCancellations();+ membershipChanges.removedUserIds.forEach((userId) => usersRemovedFromTeams.add(userId));totalRemovedMemberships += membershipChanges.removedMembershipCount;await createGithubOrgSyncAuditLogs({@@ -1261,6 +1252,18 @@ export const githubOrgSyncServiceFactory = ({}}+ if (usersRemovedFromTeams.size) {+ const sendPamCancellations = await groupDAL.transaction((tx) =>+ terminatePamSessionsLosingGroupAccess({+ userIds: [...usersRemovedFromTeams],+ actorId: orgPermission.id,+ ...pamSessionDeps,+ tx+ })+ );+ sendPamCancellations();+ }+if (createdTeams.size || updatedTeams.size) {// Team membership changes cascade into the group-expanded project identity meters.usageMeteringService.emit(orgPermission.orgId, SecretIdentities.key);diff --git a/backend/src/ee/services/pam/pam-permission.ts b/backend/src/ee/services/pam/pam-permission.tsindex 5d52ff68df..c93b25b128 100644--- a/backend/src/ee/services/pam/pam-permission.ts+++ b/backend/src/ee/services/pam/pam-permission.ts@@ -134,7 +134,8 @@ const findActivePamMemberships = async (membershipRoleDAL: TMembershipRoleDep,projectId: string,ctx: Pick<TActorContext, "actor" | "actorId">,- tx?: Knex+ tx?: Knex,+ isRelevant: (membership: { scopeResourceId?: string | null }) => boolean = () => true) => {const [folderMemberships, accountMemberships] = await Promise.all([membershipDAL.findResourceMembershipsForActor(@@ -157,8 +158,8 @@ const findActivePamMemberships = async ()]);- const activeFolderMemberships = folderMemberships.filter((m) => m.isActive);- const activeAccountMemberships = accountMemberships.filter((m) => m.isActive);+ const activeFolderMemberships = folderMemberships.filter((m) => m.isActive && isRelevant(m));+ const activeAccountMemberships = accountMemberships.filter((m) => m.isActive && isRelevant(m));const allMemberships = [...activeFolderMemberships, ...activeAccountMemberships];const roles = allMemberships.length@@ -177,11 +178,14 @@ export const getLaunchAccessRemainingMs = async (account: { id: string; folderId?: string | null },ctx: Pick<TActorContext, "actor" | "actorId">): Promise<number | null> => {- const {- folderMemberships,- accountMemberships,- roles: allRoles- } = await findActivePamMemberships(membershipDAL, membershipRoleDAL, projectId, ctx);+ const { folderMemberships, accountMemberships, roles } = await findActivePamMemberships(+ membershipDAL,+ membershipRoleDAL,+ projectId,+ ctx,+ undefined,+ (m) => m.scopeResourceId === account.id || (Boolean(account.folderId) && m.scopeResourceId === account.folderId)+ );const membershipIds = new Set([...folderMemberships.filter((m) => m.scopeResourceId === account.folderId),@@ -190,7 +194,6 @@ export const getLaunchAccessRemainingMs = async ();if (membershipIds.size === 0) return 0;- const roles = allRoles.filter((r) => membershipIds.has(r.membershipId));const grantingRoles = roles.filter((r) => isActiveRole(r) && pamRoleHasAction(r.role, ResourcePermissionPamResourceActions.LaunchSessions));