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
move secret scanning to be a single project product
Matheus Nogueirae4404501249a
diff --git a/backend/src/@types/fastify.d.ts b/backend/src/@types/fastify.d.tsindex a4a231ce2c..9ed807b329 100644--- a/backend/src/@types/fastify.d.ts+++ b/backend/src/@types/fastify.d.ts@@ -72,6 +72,8 @@ import { TSecretApprovalPolicyServiceFactory } from "@app/ee/services/secret-appimport { TSecretApprovalRequestServiceFactory } from "@app/ee/services/secret-approval-request/secret-approval-request-service";import { TSecretRotationV2ServiceFactory } from "@app/ee/services/secret-rotation-v2/secret-rotation-v2-service";import { TSecretScanningServiceFactory } from "@app/ee/services/secret-scanning/secret-scanning-service";+import { TSecretScanningV2InstanceServiceFactory } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-instance-service";+import { TSecretScanningV2ProjectResolverFactory } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-project-resolver";import { TSecretScanningV2ServiceFactory } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-service";import { TSubOrgServiceFactory } from "@app/ee/services/sub-org/sub-org-service";import { TTrustedIpServiceFactory } from "@app/ee/services/trusted-ip/trusted-ip-types";@@ -376,6 +378,8 @@ declare module "fastify" {pkiApplicationEnrollment: TPkiApplicationEnrollmentServiceFactory;certManagerProjectResolver: TCertManagerProjectResolverFactory;pamProjectResolver: TPamProjectResolverFactory;+ secretScanningV2ProjectResolver: TSecretScanningV2ProjectResolverFactory;+ secretScanningV2Instance: TSecretScanningV2InstanceServiceFactory;agentVaultProjectResolver: TAgentVaultProjectResolverFactory;agentVaultAccessBundle: TAgentVaultAccessBundleServiceFactory;agentVaultProxy: TAgentVaultProxyServiceFactory;diff --git a/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts b/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.tsindex 6ad3ad6d5e..13f1c18eab 100644--- a/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts+++ b/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts@@ -32,6 +32,64 @@ const SecretScanningDataSourceOptionsSchema = z.discriminatedUnion("type", []);export const registerSecretScanningV2Router = async (server: FastifyZodProvider) => {+ server.route({+ method: "GET",+ url: "/project",+ config: {+ rateLimit: readLimit+ },+ schema: {+ hide: true,+ operationId: "getSecretScanningProject",+ tags: [ApiDocsTags.SecretScanning],+ description: "Resolve the organization's active Secret Scanning project, creating it on first access.",+ response: {+ 200: z.object({ projectId: z.string() })+ }+ },+ onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN, AuthMode.OAUTH]),+ handler: async (req) => {+ const projectId = await server.services.secretScanningV2ProjectResolver.resolve(req.permission.orgId);+ return { projectId };+ }+ });++ server.route({+ method: "GET",+ url: "/instance",+ config: {+ rateLimit: readLimit+ },+ schema: {+ hide: true,+ operationId: "getSecretScanningInstanceState",+ tags: [ApiDocsTags.SecretScanning],+ description: "Get the active Secret Scanning project and every Secret Scanning project in the organization.",+ response: {+ 200: z.object({+ activeProjectId: z.string().nullable(),+ projects: z+ .object({+ id: z.string(),+ name: z.string(),+ slug: z.string(),+ createdAt: z.date()+ })+ .array(),+ isMultiInstance: z.boolean()+ })+ }+ },+ onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN, AuthMode.OAUTH]),+ handler: async (req) =>+ server.services.secretScanningV2Instance.getInstanceState({+ actor: req.permission.type,+ actorId: req.permission.id,+ actorAuthMethod: req.permission.authMethod,+ actorOrgId: req.permission.orgId+ })+ });+server.route({method: "GET",url: "/data-sources/options",diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-instance-service.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-instance-service.tsnew file mode 100644index 0000000000..c2317e7ba4--- /dev/null+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-instance-service.ts@@ -0,0 +1,55 @@+import { OrganizationActionScope, ProjectType } from "@app/db/schemas";+import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";+import { ActorType } from "@app/services/auth/auth-type";+import { TProjectDALFactory } from "@app/services/project/project-dal";++type TSecretScanningV2InstanceServiceDeps = {+ projectDAL: Pick<TProjectDALFactory, "find">;+ permissionService: Pick<TPermissionServiceFactory, "getOrgPermission">;+};++type TActor = {+ actor: ActorType;+ actorId: string;+ actorAuthMethod: Parameters<TPermissionServiceFactory["getOrgPermission"]>[0]["actorAuthMethod"];+ actorOrgId: string;+};++export type TSecretScanningV2InstanceServiceFactory = ReturnType<typeof secretScanningV2InstanceServiceFactory>;++export const secretScanningV2InstanceServiceFactory = ({+ projectDAL,+ permissionService+}: TSecretScanningV2InstanceServiceDeps) => {+ const getInstanceState = async ({ actor, actorId, actorAuthMethod, actorOrgId }: TActor) => {+ await permissionService.getOrgPermission({+ actor,+ actorId,+ orgId: actorOrgId,+ actorAuthMethod,+ actorOrgId,+ scope: OrganizationActionScope.Any+ });++ // Newest first, matching the resolver: the newest project is the active one.+ const projects = await projectDAL.find(+ { orgId: actorOrgId, type: ProjectType.SecretScanning },+ { sort: [["createdAt", "desc"]] }+ );++ return {+ activeProjectId: projects.length ? projects[0].id : null,+ projects: projects.map((p) => ({+ id: p.id,+ name: p.name,+ slug: p.slug,+ createdAt: p.createdAt+ })),+ isMultiInstance: projects.length > 1+ };+ };++ return {+ getInstanceState+ };+};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.tsnew file mode 100644index 0000000000..823d0f8222--- /dev/null+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-project-resolver.ts@@ -0,0 +1,120 @@+import slugify from "@sindresorhus/slugify";+import { Knex } from "knex";++import {+ AccessScope,+ OrgMembershipRole,+ ProjectMembershipRole,+ ProjectType,+ ProjectVersion,+ TableName+} from "@app/db/schemas";+import { PgSqlLock } from "@app/keystore/keystore";+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";++type TResolverDeps = {+ db: Knex;+ projectDAL: Pick<TProjectDALFactory, "find" | "create">;+ membershipDAL: Pick<TMembershipDALFactory, "create">;+ membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create">;+};++type TOrgAdminRow = {+ actorUserId: string | null;+ actorIdentityId: string | null;+ actorGroupId: string | null;+};++export type TSecretScanningV2ProjectResolverFactory = ReturnType<typeof secretScanningV2ProjectResolverFactory>;++export const secretScanningV2ProjectResolverFactory = ({+ db,+ projectDAL,+ membershipDAL,+ membershipRoleDAL+}: TResolverDeps) => {+ // Orgs from before the one-project limit can have several; the newest one is the active project.+ const findDefaultProjectId = async (orgId: string, tx?: Knex): Promise<string | null> => {+ const projects = await projectDAL.find(+ { orgId, type: ProjectType.SecretScanning },+ { sort: [["createdAt", "desc"]], limit: 1, tx }+ );+ 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) => {+ // 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;++ const project = await projectDAL.create(+ {+ name: "Secret Scanning",+ slug: slugify(`secret-scanning-${alphaNumericNanoId(4)}`),+ type: ProjectType.SecretScanning,+ orgId,+ version: ProjectVersion.V3,+ pitVersionLimit: 10+ },+ 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+ );++ // eslint-disable-next-line no-await-in-loop+ await membershipRoleDAL.create({ membershipId: membership.id, role: ProjectMembershipRole.Admin }, tx);+ }++ return project.id;+ });++ return {+ resolve: async (actorOrgId: string): Promise<string> => {+ const existingId = await findDefaultProjectId(actorOrgId);+ if (existingId) return existingId;+ return ensureDefaultProject(actorOrgId);+ }+ };+};diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 3a9cd70be4..7da6c0c71c 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -213,6 +213,8 @@ import { secretScanningDALFactory } from "@app/ee/services/secret-scanning/secreimport { secretScanningQueueFactory } from "@app/ee/services/secret-scanning/secret-scanning-queue";import { secretScanningServiceFactory } from "@app/ee/services/secret-scanning/secret-scanning-service";import { secretScanningV2DALFactory } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-dal";+import { secretScanningV2InstanceServiceFactory } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-instance-service";+import { secretScanningV2ProjectResolverFactory } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-project-resolver";import { secretScanningV2QueueServiceFactory } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-queue";import { secretScanningV2ServiceFactory } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-service";import { subOrgServiceFactory } from "@app/ee/services/sub-org/sub-org-service";@@ -4371,6 +4373,18 @@ export const registerRoutes = async (notificationService});+ const secretScanningV2ProjectResolver = secretScanningV2ProjectResolverFactory({+ db,+ projectDAL,+ membershipDAL,+ membershipRoleDAL+ });++ const secretScanningV2InstanceService = secretScanningV2InstanceServiceFactory({+ projectDAL,+ permissionService+ });+const secretScanningV2Service = secretScanningV2ServiceFactory({permissionService,appConnectionService,@@ -4639,6 +4653,8 @@ export const registerRoutes = async (agentProxyCa: agentProxyCaService,folderCommit: folderCommitService,secretScanningV2: secretScanningV2Service,+ secretScanningV2ProjectResolver,+ secretScanningV2Instance: secretScanningV2InstanceService,reminder: reminderService,eventBus: eventBusService,projectEvents: projectEventsService,diff --git a/frontend/src/hooks/api/secretScanningV2/queries.tsx b/frontend/src/hooks/api/secretScanningV2/queries.tsxindex d500a5371d..14ed9cbdad 100644--- a/frontend/src/hooks/api/secretScanningV2/queries.tsx+++ b/frontend/src/hooks/api/secretScanningV2/queries.tsx@@ -21,6 +21,12 @@ import {TSecretScanningScanWithDetails} from "./types";+// Resolves the org's active Secret Scanning project, creating it on first access (lazy bootstrap on the backend).+export const fetchSecretScanningProjectId = async () => {+ const { data } = await apiRequest.get<{ projectId: string }>("/api/v2/secret-scanning/project");+ return data.projectId;+};+export const secretScanningV2Keys = {all: ["secret-scanning-v2"] as const,dataSource: () => [...secretScanningV2Keys.all, "data-source"] as const,@@ -46,9 +52,49 @@ export const secretScanningV2Keys = {[...secretScanningV2Keys.finding(), "count", projectId] as const,listFindings: (projectId: string) => [...secretScanningV2Keys.finding(), "list", projectId],configByProjectId: (projectId: string) =>- [...secretScanningV2Keys.all, "config", projectId] as const+ [...secretScanningV2Keys.all, "config", projectId] as const,+ activeProjectId: (orgId: string) => [...secretScanningV2Keys.all, "project", orgId] as const,+ instanceState: (orgId: string) => [...secretScanningV2Keys.all, "instance", orgId] as const};+export type TSecretScanningInstanceProject = {+ id: string;+ name: string;+ slug: string;+ createdAt: string;+};++export type TSecretScanningInstanceState = {+ activeProjectId: string | null;+ projects: TSecretScanningInstanceProject[];+ isMultiInstance: boolean;+};++export const useGetSecretScanningInstanceState = (orgId: string) =>+ useQuery({+ queryKey: secretScanningV2Keys.instanceState(orgId),+ queryFn: async () => {+ const { data } = await apiRequest.get<TSecretScanningInstanceState>(+ "/api/v2/secret-scanning/instance"+ );+ return data;+ },+ enabled: Boolean(orgId)+ });++export const useGetSecretScanningProjectId = (+ orgId: string,+ options?: Omit<+ UseQueryOptions<string, unknown, string, ReturnType<typeof secretScanningV2Keys.activeProjectId>>,+ "queryKey" | "queryFn"+ >+) =>+ useQuery({+ queryKey: secretScanningV2Keys.activeProjectId(orgId),+ queryFn: fetchSecretScanningProjectId,+ ...options+ });+export const useSecretScanningDataSourceOptions = (options?: Omit<UseQueryOptions<diff --git a/frontend/src/layouts/OrganizationLayout/OrganizationLayout.tsx b/frontend/src/layouts/OrganizationLayout/OrganizationLayout.tsxindex dbfef41916..a3191de620 100644--- a/frontend/src/layouts/OrganizationLayout/OrganizationLayout.tsx+++ b/frontend/src/layouts/OrganizationLayout/OrganizationLayout.tsx@@ -11,6 +11,7 @@ import { useFetchServerStatus } from "@app/hooks/api";import { useImplicitProduct } from "@app/hooks/useImplicitProduct";import { CertManagerInstanceBanner } from "@app/layouts/PkiManagerLayout/components/CertManagerInstanceBanner";import { AssumePrivilegeModeBanner } from "@app/layouts/ProjectLayout/components/AssumePrivilegeModeBanner";+import { SecretScanningInstanceBanner } from "@app/layouts/SecretScanningLayout/components/SecretScanningInstanceBanner";import { AuditLogBanner } from "./components/AuditLogBanner";import { InsecureConnectionBanner } from "./components/InsecureConnectionBanner";@@ -37,6 +38,15 @@ export const OrganizationLayout = () => {)});+ const isSecretScanningProject = useRouterState({+ select: (state) =>+ state.matches.some(+ (match) =>+ match.routeId ===+ "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-scanning/$projectId/_secret-scanning-layout"+ )+ });+const { popUp, handlePopUpToggle } = usePopUp(["createOrg"] as const);const containerHeight = config.pageFrameContent ? "h-[94vh]" : "h-screen";@@ -53,6 +63,7 @@ export const OrganizationLayout = () => {<PageBannerStack>{(isInsideProject || implicitProduct) && <AssumePrivilegeModeBanner />}{isCertManagerOverview && <CertManagerInstanceBanner />}+ {isSecretScanningProject && <SecretScanningInstanceBanner />}{!isLoading && !isInsideProject && !serverDetails?.redisConfigured && <RedisBanner />}{!isLoading && !isInsideProject && !serverDetails?.emailConfigured && <SmtpBanner />}{!isLoading && !isInsideProject && subscription.auditLogs && <AuditLogBanner />}diff --git a/frontend/src/layouts/SecretScanningLayout/components/SecretScanningInstanceBanner.tsx b/frontend/src/layouts/SecretScanningLayout/components/SecretScanningInstanceBanner.tsxnew file mode 100644index 0000000000..6a2c726b9e--- /dev/null+++ b/frontend/src/layouts/SecretScanningLayout/components/SecretScanningInstanceBanner.tsx@@ -0,0 +1,48 @@+import { faWarning } from "@fortawesome/free-solid-svg-icons";+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";+import { Link, useParams } from "@tanstack/react-router";++import { useOrganization } from "@app/context";+import { useGetSecretScanningInstanceState } from "@app/hooks/api/secretScanningV2";++export const SecretScanningInstanceBanner = () => {+ const { projectId } = useParams({ strict: false }) as { projectId?: string };+ const { currentOrg } = useOrganization();+ const { data, isPending } = useGetSecretScanningInstanceState(currentOrg.id);++ if (isPending || !data || !data.isMultiInstance || !data.activeProjectId) return null;++ const isViewingActive = data.activeProjectId === projectId;++ return (+ <div className="flex w-full items-start gap-x-2 border-b border-warning/50 bg-warning/30 px-4 py-2 text-sm text-warning">+ <FontAwesomeIcon icon={faWarning} className="mt-0.5 shrink-0 text-base text-warning" />+ {isViewingActive ? (+ <p>+ This is your organization's active Secret Scanning project, the most recently+ created one. Use this for all work going forward.{" "}+ <Link+ to="/organizations/$orgId/settings"+ params={{ orgId: currentOrg.id }}+ search={{ selectedTab: "product-settings" }}+ className="underline underline-offset-2 hover:text-warning"+ >+ View all projects+ </Link>+ </p>+ ) : (+ <p>+ You're viewing a Secret Scanning project that isn't your organization's+ active project.{" "}+ <Link+ to="/organizations/$orgId/projects/secret-scanning/$projectId/data-sources"+ params={{ orgId: currentOrg.id, projectId: data.activeProjectId }}+ className="underline underline-offset-2 hover:text-warning"+ >+ Switch to your active project →+ </Link>+ </p>+ )}+ </div>+ );+};diff --git a/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/ProjectTypePage.tsx b/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/ProjectTypePage.tsxindex 8030c268d9..c7e0bb3a28 100644--- a/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/ProjectTypePage.tsx+++ b/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/ProjectTypePage.tsx@@ -106,6 +106,7 @@ import {ProjectVersion,SearchProjectSortBy} from "@app/hooks/api/projects/types";+import { useGetSecretScanningProjectId } from "@app/hooks/api/secretScanningV2/queries";import { useUpdateUserProjectFavorites } from "@app/hooks/api/users/mutation";import { useGetUserProjectFavorites } from "@app/hooks/api/users/queries";import {@@ -253,6 +254,25 @@ export const ProjectTypePage = () => {}}, [projectType, certManagerInstance, orgId, navigate]);+ // Secret Scanning has one active project per org, so members skip the list and land in it. The list+ // stays the fallback for non-members, where they can request access.+ const isSecretScanning = projectType === ProjectType.SecretScanning;+ const { data: secretScanningProjectId, isPending: isSecretScanningProjectPending } =+ useGetSecretScanningProjectId(orgId, { enabled: isSecretScanning });+ const { data: userProjects = [], isPending: isUserProjectsPending } = useGetUserProjects();+ const isSecretScanningMember = Boolean(+ secretScanningProjectId && userProjects.some((p) => p.id === secretScanningProjectId)+ );++ useEffect(() => {+ if (isSecretScanning && secretScanningProjectId && isSecretScanningMember) {+ navigate({+ to: "/organizations/$orgId/projects/secret-scanning/$projectId/data-sources",+ params: { orgId, projectId: secretScanningProjectId }+ });+ }+ }, [isSecretScanning, secretScanningProjectId, isSecretScanningMember, orgId, navigate]);+useEffect(() => {if (projectType === ProjectType.PAM) {navigate({@@ -294,6 +314,13 @@ export const ProjectTypePage = () => {return null;}+ if (+ isSecretScanning &&+ (isSecretScanningProjectPending || isUserProjectsPending || isSecretScanningMember)+ ) {+ return null;+ }+return <ProjectTypeContent projectType={projectType} orgId={orgId} />;};diff --git a/frontend/src/pages/organization/ProjectsPage/components/ProjectCategoryOverview.tsx b/frontend/src/pages/organization/ProjectsPage/components/ProjectCategoryOverview.tsxindex d4615a0470..796ea85e5d 100644--- a/frontend/src/pages/organization/ProjectsPage/components/ProjectCategoryOverview.tsx+++ b/frontend/src/pages/organization/ProjectsPage/components/ProjectCategoryOverview.tsx@@ -37,6 +37,7 @@ import { fetchAgentVaultProjectId } from "@app/hooks/api/agentVault/queries";import { useCertManagerInstanceState } from "@app/hooks/api/certManagerInstance";import { useOrgAdminAccessProject } from "@app/hooks/api/orgAdmin/mutation";import { resolvePamProjectId } from "@app/hooks/api/pam/queries";+import { fetchSecretScanningProjectId } from "@app/hooks/api/secretScanningV2/queries";import { Project, ProjectType } from "@app/hooks/api/projects/types";type ActiveProducts = ProjectType;@@ -138,6 +139,11 @@ export const ProjectCategoryOverview = () => {const [pendingPamProjectId, setPendingPamProjectId] = useState<string | null>(null);const [isAgentVaultRequestAccessOpen, setIsAgentVaultRequestAccessOpen] = useState(false);const [pendingAgentVaultProjectId, setPendingAgentVaultProjectId] = useState<string | null>(null);+ const [isSecretScanningRequestAccessOpen, setIsSecretScanningRequestAccessOpen] =+ useState(false);+ const [pendingSecretScanningProjectId, setPendingSecretScanningProjectId] = useState<+ string | null+ >(null);const orgDefaultCertManagerProjectId = certManagerInstance?.activeProjectId ?? null;const cmInstances = useMemo(@@ -386,6 +392,51 @@ export const ProjectCategoryOverview = () => {});};+ const navigateToSecretScanning = (projectId: string) => {+ navigate({+ to: "/organizations/$orgId/projects/secret-scanning/$projectId/data-sources",+ params: { orgId: currentOrg?.id ?? "", projectId }+ });+ };++ const enterSecretScanningProject = async () => {+ // Also lazily bootstraps the Secret Scanning project for orgs that don't have one yet.+ let secretScanningProjectId: string;+ try {+ secretScanningProjectId = await fetchSecretScanningProjectId();+ } catch (err) {+ createNotification({+ type: "error",+ text: err instanceof Error ? err.message : "Failed to resolve the Secret Scanning project."+ });+ return;+ }++ const isMember = projects.some((p) => p.id === secretScanningProjectId);+ if (isMember) {+ navigateToSecretScanning(secretScanningProjectId);+ return;+ }++ setPendingSecretScanningProjectId(secretScanningProjectId);++ if (isOrgAdmin) {+ try {+ await orgAdminAccessProject.mutateAsync({ projectId: secretScanningProjectId });+ navigateToSecretScanning(secretScanningProjectId);+ } catch {+ // The global mutation error handler already reports the failure.+ }+ } else if (canRequestAccess) {+ setIsSecretScanningRequestAccessOpen(true);+ } else {+ createNotification({+ type: "error",+ text: "You don't have access to Secret Scanning."+ });+ }+ };+const handleTileClick = async (type: ProjectType) => {const orgId = currentOrg?.id || "";@@ -413,6 +464,11 @@ export const ProjectCategoryOverview = () => {return;}+ if (type === ProjectType.SecretScanning) {+ await enterSecretScanningProject();+ return;+ }+navigate({to: "/organizations/$orgId/projects/$type",params: { orgId, type: projectTypeToUrlSlug(type) }@@ -460,6 +516,13 @@ export const ProjectCategoryOverview = () => {} as Project): undefined;+ const secretScanningRequestAccessProject: Project | undefined = pendingSecretScanningProjectId+ ? ({+ id: pendingSecretScanningProjectId,+ name: "Secret Scanning"+ } as Project)+ : undefined;+const agentVaultRequestAccessProject: Project | undefined = pendingAgentVaultProjectId? ({id: pendingAgentVaultProjectId,@@ -543,12 +606,13 @@ export const ProjectCategoryOverview = () => {const tileClassName = `group h-auto cursor-pointer rounded-md transition-all duration-200 ease-out hover:scale-[1.01] ${cardClassName}`;- // Cert Manager and PAM resolve their destination asynchronously (instance picker,- // lazy project bootstrap, join-on-behalf), so they stay handler-driven.+ // These resolve their destination asynchronously (instance picker, lazy project+ // bootstrap, join-on-behalf), so they stay handler-driven.if (type === ProjectType.CertificateManager ||type === ProjectType.PAM ||- type === ProjectType.AgentVault+ type === ProjectType.AgentVault ||+ type === ProjectType.SecretScanning) {return (<Card@@ -596,6 +660,16 @@ export const ProjectCategoryOverview = () => {subTitle="Requesting access to Privileged Access Manager. You may include an optional note for admins to review your request."/>+ <RequestProjectAccessModal+ isOpen={isSecretScanningRequestAccessOpen}+ onOpenChange={(isOpen) => {+ setIsSecretScanningRequestAccessOpen(isOpen);+ if (!isOpen) setPendingSecretScanningProjectId(null);+ }}+ project={secretScanningRequestAccessProject}+ subTitle="Requesting access to Secret Scanning. You may include an optional note for admins to review your request."+ />+<RequestProjectAccessModalisOpen={isAgentVaultRequestAccessOpen}onOpenChange={(isOpen) => {diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgProductSettingsTab/OrgProductSettingsTab.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgProductSettingsTab/OrgProductSettingsTab.tsxindex 480ee168b4..ffcb77d924 100644--- a/frontend/src/pages/organization/SettingsPage/components/OrgProductSettingsTab/OrgProductSettingsTab.tsx+++ b/frontend/src/pages/organization/SettingsPage/components/OrgProductSettingsTab/OrgProductSettingsTab.tsx@@ -5,6 +5,7 @@ import { AlertDescription, AlertTitle, DismissableAlert } from "@app/components/import { useOrganization } from "@app/context";import { OrgCertManagerTab } from "../OrgCertManagerTab";+import { OrgSecretScanningTab } from "../OrgSecretScanningTab";export const OrgProductSettingsTab = () => {const { currentOrg } = useOrganization();@@ -30,6 +31,7 @@ export const OrgProductSettingsTab = () => {</AlertDescription></DismissableAlert><OrgCertManagerTab />+ <OrgSecretScanningTab /></div>);};diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgSecretScanningTab/OrgSecretScanningTab.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgSecretScanningTab/OrgSecretScanningTab.tsxnew file mode 100644index 0000000000..cd04320496--- /dev/null+++ b/frontend/src/pages/organization/SettingsPage/components/OrgSecretScanningTab/OrgSecretScanningTab.tsx@@ -0,0 +1,160 @@+import { useNavigate } from "@tanstack/react-router";+import { BoxIcon, ExternalLinkIcon, RadarIcon, TriangleAlertIcon } from "lucide-react";++import {+ Alert,+ AlertDescription,+ Badge,+ Card,+ CardContent,+ CardHeader,+ CardTitle,+ IconButton,+ PageLoader,+ Table,+ TableBody,+ TableCell,+ TableHead,+ TableHeader,+ TableRow,+ Tooltip,+ TooltipContent,+ TooltipTrigger+} from "@app/components/v3";+import { useOrganization, useOrgPermission } from "@app/context";+import {+ OrgPermissionAdminConsoleAction,+ OrgPermissionSubjects+} from "@app/context/OrgPermissionContext/types";+import { useGetUserProjects } from "@app/hooks/api";+import { useOrgAdminAccessProject } from "@app/hooks/api/orgAdmin/mutation";+import {+ TSecretScanningInstanceProject,+ useGetSecretScanningInstanceState+} from "@app/hooks/api/secretScanningV2";++export const OrgSecretScanningTab = () => {+ const navigate = useNavigate();+ const { currentOrg } = useOrganization();+ const { permission } = useOrgPermission();+ const isOrgAdmin = permission.can(+ OrgPermissionAdminConsoleAction.AccessAllProjects,+ OrgPermissionSubjects.AdminConsole+ );++ const { data: instanceState, isPending } = useGetSecretScanningInstanceState(currentOrg.id);+ const { data: userProjects = [] } = useGetUserProjects();+ const orgAdminAccessProject = useOrgAdminAccessProject();++ const projects = instanceState?.projects ?? [];++ if (isPending) {+ return (+ <Card>+ <CardHeader>+ <CardTitle>+ <RadarIcon className="size-4 text-accent" />+ Secret Scanning+ </CardTitle>+ </CardHeader>+ <CardContent>+ <div className="h-32">+ <PageLoader lottieClassName="w-16" />+ </div>+ </CardContent>+ </Card>+ );+ }+ if (projects.length <= 1) return null;++ const isMember = (projectId: string) => userProjects.some((p) => p.id === projectId);++ const handleOpen = async (project: TSecretScanningInstanceProject) => {+ if (!isMember(project.id)) {+ try {+ await orgAdminAccessProject.mutateAsync({ projectId: project.id });+ } catch {+ // The global mutation error handler already reports the failure.+ return;+ }+ }+ navigate({+ to: "/organizations/$orgId/projects/secret-scanning/$projectId/data-sources",+ params: { orgId: currentOrg.id, projectId: project.id }+ });+ };++ return (+ <Card>+ <CardHeader>+ <CardTitle>+ <RadarIcon className="size-4 text-accent" />+ Secret Scanning+ </CardTitle>+ </CardHeader>+ <CardContent>+ <Alert variant="warning" className="mb-4">+ <TriangleAlertIcon />+ <AlertDescription>+ <p>+ Your organization has multiple Secret Scanning projects. Going forward, only one+ project per organization is supported, and the most recently created project is the+ active one.+ </p>+ </AlertDescription>+ </Alert>+ <Table>+ <TableHeader>+ <TableRow>+ <TableHead className="w-full">Project</TableHead>+ <TableHead className="whitespace-nowrap">Status</TableHead>+ <TableHead className="w-5" />+ </TableRow>+ </TableHeader>+ <TableBody>+ {projects.map((project) => {+ const isActive = project.id === instanceState?.activeProjectId;+ const canOpen = isMember(project.id) || isOrgAdmin;++ return (+ <TableRow key={project.id}>+ <TableCell className="w-full">+ <div className="flex items-center gap-x-2">+ <BoxIcon className="size-4 shrink-0 text-project" />+ <span className="font-mono">{project.name}</span>+ <span className="font-mono text-xs text-accent">{project.slug}</span>+ </div>+ </TableCell>+ <TableCell className="whitespace-nowrap">+ {isActive ? <Badge variant="success">Active</Badge> : null}+ </TableCell>+ <TableCell>+ {canOpen ? (+ <Tooltip>+ <TooltipTrigger asChild>+ <IconButton+ variant="ghost"+ size="xs"+ aria-label={`Open ${project.name}`}+ isPending={+ orgAdminAccessProject.isPending &&+ orgAdminAccessProject.variables?.projectId === project.id+ }+ onClick={() => handleOpen(project)}+ >+ <ExternalLinkIcon />+ </IconButton>+ </TooltipTrigger>+ <TooltipContent>Open project</TooltipContent>+ </Tooltip>+ ) : null}+ </TableCell>+ </TableRow>+ );+ })}+ </TableBody>+ </Table>+ </CardContent>+ </Card>+ );+};diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgSecretScanningTab/index.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgSecretScanningTab/index.tsxnew file mode 100644index 0000000000..a2cd959229--- /dev/null+++ b/frontend/src/pages/organization/SettingsPage/components/OrgSecretScanningTab/index.tsx@@ -0,0 +1 @@+export { OrgSecretScanningTab } from "./OrgSecretScanningTab";