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
emit for identity removal
Thiago Araujo da Silva64d1c37b8328
diff --git a/backend/CLAUDE.md b/backend/CLAUDE.mdindex 8ceb0abf30..32fb4d9768 100644--- a/backend/CLAUDE.md+++ b/backend/CLAUDE.md@@ -893,7 +893,8 @@ itself whether the actor still reaches the org.- `group-link`: `orgId`, `groupId`, the group's `members`. From `membershipGroupService.detachGroupFromOrg`.- `group`: `groupId`, `orgIds`, all `members`. From owned and SCIM group deletes, read with`groupDAL.findGroupActorsAndOrgs` before the cascade.- - `membership`: `orgId` + actor. From `deleteOrgMembershipsFn` and the sweep.+ - `membership`: `orgId` + actor. From `deleteOrgMembershipsFn` (users), the org branch of+ `membershipIdentityService.deleteMembership` (identities) and the sweep.Group events snapshot orgs and members at removal time, since a later removal can wipe those rows beforethe consumer runs. Both lists are paged at 100 (one event per org page x member page) because the outboxdiff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex b15e697aae..c9f91dc1bd 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -1263,7 +1263,8 @@ export const registerRoutes = async (keyStore,usageMeteringService,alertService,- identityAccessTokenService+ identityAccessTokenService,+ eventEmitter: eventOutboxService});const auditLogStreamService = auditLogStreamServiceFactory({diff --git a/backend/src/services/membership-identity/membership-identity-service.test.ts b/backend/src/services/membership-identity/membership-identity-service.test.tsindex cbdd0aede9..697e9f3940 100644--- a/backend/src/services/membership-identity/membership-identity-service.test.ts+++ b/backend/src/services/membership-identity/membership-identity-service.test.ts@@ -48,6 +48,7 @@ const createService = ({const insertOrgMembershipRevocationMarker = vi.fn().mockResolvedValue(undefined);const removeOrgMembershipRevocationMarkers = vi.fn().mockResolvedValue(undefined);const deleteAlertsForResource = vi.fn().mockResolvedValue(0);+ const emit = vi.fn().mockResolvedValue(undefined);const membershipIdentityDAL = {findOne: vi.fn().mockResolvedValue(existingMembership),@@ -102,7 +103,8 @@ const createService = ({insertOrgMembershipRevocationMarker,removeOrgMembershipRevocationMarkers,bumpIdentityRevocationVersion- } as never+ } as never,+ eventEmitter: { emit }});return {@@ -111,7 +113,8 @@ const createService = ({bumpIdentityRevocationVersion,insertOrgMembershipRevocationMarker,removeOrgMembershipRevocationMarkers,- deleteAlertsForResource+ deleteAlertsForResource,+ emit};};@@ -224,6 +227,37 @@ describe("deleteMembership alert cleanup", () => {});});+describe("deleteMembership org access reconcile", () => {+ beforeEach(() => vi.clearAllMocks());++ test("removing an org membership emits the removal in the same transaction", async () => {+ const tx = { marker: "tx" } as unknown as Knex;+ const { service, emit } = createService({ tx });++ await service.deleteMembership(buildDto());++ expect(emit).toHaveBeenCalledTimes(1);+ expect(emit).toHaveBeenCalledWith(+ {+ eventType: "com.infisical.organization.membership.removed.v1",+ payload: { orgId: SUB_ORG_ID, actorType: "identity", actorId: IDENTITY_ID }+ },+ tx+ );+ });++ test("removing a project membership emits nothing, the identity still reaches the org", async () => {+ const { service, emit } = createService();++ await service.deleteMembership({+ ...buildDto(),+ scopeData: { scope: AccessScope.Project, orgId: SUB_ORG_ID, projectId: PROJECT_ID }+ });++ expect(emit).not.toHaveBeenCalled();+ });+});+const buildCreateDto = (): TCreateMembershipIdentityDTO => ({permission: buildDto().permission,scopeData: { scope: AccessScope.Organization, orgId: SUB_ORG_ID },diff --git a/backend/src/services/membership-identity/membership-identity-service.ts b/backend/src/services/membership-identity/membership-identity-service.tsindex 4466758582..587981b079 100644--- a/backend/src/services/membership-identity/membership-identity-service.ts+++ b/backend/src/services/membership-identity/membership-identity-service.ts@@ -10,6 +10,7 @@ import { ms } from "@app/lib/ms";import { SearchResourceOperators } from "@app/lib/search-resource/search";import { TAlertServiceFactory } from "@app/services/alert/alert-service";import { IDENTITY_AUTHENTICATION_RESOURCE_TYPE } from "@app/services/alert/providers/identity-credential-alert-provider";+import { TEventEmitter } from "@app/services/event-outbox/event-outbox-types";import { getIdentityActiveLockoutAuthMethods } from "@app/services/identity/identity-fns";import { AgentVaultIdentities, PamIdentities, SecretIdentities } from "@app/services/license-client";import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";@@ -21,6 +22,7 @@ import { TApplicationMembershipCleanupServiceFactory } from "../membership/appliimport { assertProductWillRetainAdmin, assertSecretsTemporaryAccessAllowed } from "../membership/membership-fns";import { TMembershipRoleDALFactory } from "../membership/membership-role-dal";import { TOrgDALFactory } from "../org/org-dal";+import { emitOrgMembershipRemoved, toOrgMembershipActors } from "../org/org-membership-events";import { ApplicationMemberKind } from "../pki-application/pki-application-types";import { TProjectDALFactory } from "../project/project-dal";import { TRoleDALFactory } from "../role/role-dal";@@ -59,6 +61,7 @@ type TMembershipIdentityServiceFactoryDep = {TIdentityAccessTokenServiceFactory,"insertOrgMembershipRevocationMarker" | "removeOrgMembershipRevocationMarkers" | "bumpIdentityRevocationVersion">;+ eventEmitter: TEventEmitter;};export type TMembershipIdentityServiceFactory = ReturnType<typeof membershipIdentityServiceFactory>;@@ -77,7 +80,8 @@ export const membershipIdentityServiceFactory = ({keyStore,usageMeteringService,alertService,- identityAccessTokenService+ identityAccessTokenService,+ eventEmitter}: TMembershipIdentityServiceFactoryDep) => {const scopeFactory = {[AccessScope.Organization]: newOrgMembershipIdentityFactory({@@ -461,13 +465,19 @@ export const membershipIdentityServiceFactory = ({}}- // Durable deny atomic with the org-membership removal.+ // Durable deny atomic with the org-membership removal. The identity's project rows in this org+ // and its sub-orgs are left to the reconcile consumer, which the event triggers.if (scopeData.scope === AccessScope.Organization) {await identityAccessTokenService.insertOrgMembershipRevocationMarker({identityId: dto.selector.identityId,orgId: scopeData.orgId,tx});+ await emitOrgMembershipRemoved(+ eventEmitter,+ { orgId: scopeData.orgId, actors: toOrgMembershipActors({ identityIds: [dto.selector.identityId] }) },+ tx+ );}await alertService.deleteAlertsForResource(