Skip to content

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

batch admin membership creation

Matheus Nogueiraac58fe0aaf97
diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-project-resolver.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-project-resolver.ts
index 823d0f8222..79ff42f799 100644
--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-project-resolver.ts
+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-project-resolver.ts
@@ -10,18 +10,24 @@ import {
TableName
} from "@app/db/schemas";
import { PgSqlLock } from "@app/keystore/keystore";
+import { chunkArray } from "@app/lib/fn";
+import { logger } from "@app/lib/logger";
import { alphaNumericNanoId } from "@app/lib/nanoid";
import { TMembershipDALFactory } from "@app/services/membership/membership-dal";
import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";
import { TProjectDALFactory } from "@app/services/project/project-dal";
+const ADMIN_MEMBERSHIP_BATCH_SIZE = 500;
+
type TResolverDeps = {
db: Knex;
projectDAL: Pick<TProjectDALFactory, "find" | "create">;
- membershipDAL: Pick<TMembershipDALFactory, "create">;
- membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create">;
+ membershipDAL: Pick<TMembershipDALFactory, "insertMany">;
+ membershipRoleDAL: Pick<TMembershipRoleDALFactory, "insertMany">;
};
+type TAdminActor = { actorUserId: string } | { actorIdentityId: string } | { actorGroupId: string };
+
type TOrgAdminRow = {
actorUserId: string | null;
actorIdentityId: string | null;
@@ -45,14 +51,73 @@ export const secretScanningV2ProjectResolverFactory = ({
return projects.length ? projects[0].id : null;
};
- // Seeded with the current org admins, since the caller may be a member who then has to request access.
- const ensureDefaultProject = async (orgId: string): Promise<string> =>
- db.transaction(async (tx) => {
+ const listOrgAdminActors = async (orgId: string): Promise<TAdminActor[]> => {
+ const adminRows = (await db(TableName.Membership)
+ .join(TableName.MembershipRole, `${TableName.MembershipRole}.membershipId`, `${TableName.Membership}.id`)
+ .where(`${TableName.Membership}.scope`, AccessScope.Organization)
+ .where(`${TableName.Membership}.scopeOrgId`, orgId)
+ .where(`${TableName.Membership}.isActive`, true)
+ .where(`${TableName.MembershipRole}.role`, OrgMembershipRole.Admin)
+ .where(`${TableName.MembershipRole}.isTemporary`, false)
+ .select(
+ `${TableName.Membership}.actorUserId`,
+ `${TableName.Membership}.actorIdentityId`,
+ `${TableName.Membership}.actorGroupId`
+ )) as TOrgAdminRow[];
+
+ const adminActors = new Map<string, TAdminActor>();
+ for (const row of adminRows) {
+ if (row.actorUserId) adminActors.set(`user:${row.actorUserId}`, { actorUserId: row.actorUserId });
+ if (row.actorIdentityId)
+ adminActors.set(`identity:${row.actorIdentityId}`, { actorIdentityId: row.actorIdentityId });
+ if (row.actorGroupId) adminActors.set(`group:${row.actorGroupId}`, { actorGroupId: row.actorGroupId });
+ }
+ return [...adminActors.values()];
+ };
+
+ // Org admins become project admins so access requests have someone to go to. The admin count is
+ // tenant-sized, so they are added in bounded batches after the project commits rather than inside the
+ // locked creation transaction. A failed batch leaves those admins out; they can still join through
+ // grant-admin-access, which is idempotent.
+ const addOrgAdminsAsProjectAdmins = async (orgId: string, projectId: string) => {
+ const adminActors = await listOrgAdminActors(orgId);
+
+ for (const batch of chunkArray(adminActors, ADMIN_MEMBERSHIP_BATCH_SIZE)) {
+ try {
+ // eslint-disable-next-line no-await-in-loop
+ await db.transaction(async (tx) => {
+ const memberships = await membershipDAL.insertMany(
+ batch.map((actor) => ({
+ scope: AccessScope.Project,
+ scopeOrgId: orgId,
+ scopeProjectId: projectId,
+ ...actor,
+ isActive: true
+ })),
+ tx
+ );
+
+ await membershipRoleDAL.insertMany(
+ memberships.map((membership) => ({ membershipId: membership.id, role: ProjectMembershipRole.Admin })),
+ tx
+ );
+ });
+ } catch (error) {
+ logger.error(
+ { error },
+ `Failed to add org admins to the Secret Scanning project [orgId=${orgId}] [projectId=${projectId}] [batchSize=${batch.length}]`
+ );
+ }
+ }
+ };
+
+ const ensureDefaultProject = async (orgId: string): Promise<string> => {
+ const { projectId, created } = await db.transaction(async (tx) => {
// The lock createProject takes, so a lazy create and a manual one cannot both pass the one-per-org check.
await tx.raw("SELECT pg_advisory_xact_lock(?)", [PgSqlLock.CreateProject(orgId)]);
const existingId = await findDefaultProjectId(orgId, tx);
- if (existingId) return existingId;
+ if (existingId) return { projectId: existingId, created: false };
const project = await projectDAL.create(
{
@@ -66,49 +131,13 @@ export const secretScanningV2ProjectResolverFactory = ({
tx
);
- const adminRows = (await tx(TableName.Membership)
- .join(TableName.MembershipRole, `${TableName.MembershipRole}.membershipId`, `${TableName.Membership}.id`)
- .where(`${TableName.Membership}.scope`, AccessScope.Organization)
- .where(`${TableName.Membership}.scopeOrgId`, orgId)
- .where(`${TableName.Membership}.isActive`, true)
- .where(`${TableName.MembershipRole}.role`, OrgMembershipRole.Admin)
- .where(`${TableName.MembershipRole}.isTemporary`, false)
- .select(
- `${TableName.Membership}.actorUserId`,
- `${TableName.Membership}.actorIdentityId`,
- `${TableName.Membership}.actorGroupId`
- )) as TOrgAdminRow[];
-
- const adminActors = new Map<
- string,
- { actorUserId: string } | { actorIdentityId: string } | { actorGroupId: string }
- >();
- for (const row of adminRows) {
- if (row.actorUserId) adminActors.set(`user:${row.actorUserId}`, { actorUserId: row.actorUserId });
- if (row.actorIdentityId)
- adminActors.set(`identity:${row.actorIdentityId}`, { actorIdentityId: row.actorIdentityId });
- if (row.actorGroupId) adminActors.set(`group:${row.actorGroupId}`, { actorGroupId: row.actorGroupId });
- }
-
- for (const actor of adminActors.values()) {
- // eslint-disable-next-line no-await-in-loop
- const membership = await membershipDAL.create(
- {
- scope: AccessScope.Project,
- scopeOrgId: orgId,
- scopeProjectId: project.id,
- ...actor,
- isActive: true
- },
- tx
- );
+ return { projectId: project.id, created: true };
+ });
- // eslint-disable-next-line no-await-in-loop
- await membershipRoleDAL.create({ membershipId: membership.id, role: ProjectMembershipRole.Admin }, tx);
- }
+ if (created) await addOrgAdminsAsProjectAdmins(orgId, projectId);
- return project.id;
- });
+ return projectId;
+ };
return {
resolve: async (actorOrgId: string): Promise<string> => {
diff --git a/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/route.tsx b/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/route.tsx
index 039d69d57d..4c7ad53427 100644
--- a/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/route.tsx
+++ b/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/route.tsx
@@ -1,9 +1,22 @@
+import { createMongoAbility, MongoAbility, RawRuleOf } from "@casl/ability";
+import { unpackRules } from "@casl/ability/extra";
import { createFileRoute, redirect } from "@tanstack/react-router";
+import {
+ OrgPermissionAdminConsoleAction,
+ OrgPermissionSet,
+ OrgPermissionSubjects
+} from "@app/context/OrgPermissionContext/types";
import { urlSlugToProjectType } from "@app/helpers/project";
import { projectKeys } from "@app/hooks/api";
+import { grantOrgAdminProjectAccess } from "@app/hooks/api/orgAdmin";
import { ProjectType } from "@app/hooks/api/projects/types";
-import { fetchUserProjectPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
+import { conditionsMatcher } from "@app/hooks/api/roles/permission-matcher";
+import {
+ fetchUserOrgPermissions,
+ fetchUserProjectPermissions,
+ roleQueryKeys
+} from "@app/hooks/api/roles/queries";
import {
fetchSecretScanningProjectId,
secretScanningV2Keys
@@ -33,9 +46,9 @@ export const Route = createFileRoute(
if (projectType !== ProjectType.SecretScanning) return;
- // Secret Scanning has one active project per org, so members skip the list. Resolving can create
- // the project and its memberships, which the cached project list cannot know about yet, so access
- // is decided by loading the user's permissions on it, as the PAM layout does.
+ // Secret Scanning has one active project per org, so members skip the list. Resolving can create the
+ // project, which the cached project list cannot know about yet, so access is decided by loading the
+ // user's permissions on it, as the PAM layout does.
let projectId: string;
try {
projectId = await context.queryClient.fetchQuery({
@@ -56,14 +69,40 @@ export const Route = createFileRoute(
isMember = false;
}
+ if (!isMember) {
+ // The project is created with no members, so org admins join it here, as the home card does.
+ const orgPermissions = await context.queryClient.ensureQueryData({
+ queryKey: roleQueryKeys.getUserOrgPermissions({ orgId: params.orgId }),
+ queryFn: () => fetchUserOrgPermissions({ orgId: params.orgId })
+ });
+ const orgAbility = createMongoAbility<OrgPermissionSet>(
+ unpackRules<RawRuleOf<MongoAbility<OrgPermissionSet>>>(orgPermissions.permissions),
+ { conditionsMatcher }
+ );
+
+ if (
+ orgAbility.can(
+ OrgPermissionAdminConsoleAction.AccessAllProjects,
+ OrgPermissionSubjects.AdminConsole
+ )
+ ) {
+ try {
+ await grantOrgAdminProjectAccess({ projectId });
+ isMember = true;
+ } catch {
+ // Fall through to the list, where the admin can still join from All Projects.
+ }
+ }
+
+ // The cached project list predates this join or a project created just now.
+ await context.queryClient.invalidateQueries({ queryKey: projectKeys.allProjectQueries() });
+ }
+
if (isMember) {
throw redirect({
to: "/organizations/$orgId/projects/secret-scanning/$projectId/data-sources",
params: { orgId: params.orgId, projectId }
});
}
-
- // Non-members land on the list to request access, which has to include a project created just now.
- await context.queryClient.invalidateQueries({ queryKey: projectKeys.allProjectQueries() });
}
});