Skip to content

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

PR comments

Matheus Nogueira949742298f25
diff --git a/backend/src/@types/fastify.d.ts b/backend/src/@types/fastify.d.ts
index 9ed807b329..313c98abf4 100644
--- a/backend/src/@types/fastify.d.ts
+++ b/backend/src/@types/fastify.d.ts
@@ -73,7 +73,6 @@ import { TSecretApprovalRequestServiceFactory } from "@app/ee/services/secret-ap
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";
@@ -378,7 +377,6 @@ declare module "fastify" {
pkiApplicationEnrollment: TPkiApplicationEnrollmentServiceFactory;
certManagerProjectResolver: TCertManagerProjectResolverFactory;
pamProjectResolver: TPamProjectResolverFactory;
- secretScanningV2ProjectResolver: TSecretScanningV2ProjectResolverFactory;
secretScanningV2Instance: TSecretScanningV2InstanceServiceFactory;
agentVaultProjectResolver: TAgentVaultProjectResolverFactory;
agentVaultAccessBundle: TAgentVaultAccessBundleServiceFactory;
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.ts
index 13f1c18eab..a045aa6be9 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
@@ -49,7 +49,12 @@ export const registerSecretScanningV2Router = async (server: FastifyZodProvider)
},
onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN, AuthMode.OAUTH]),
handler: async (req) => {
- const projectId = await server.services.secretScanningV2ProjectResolver.resolve(req.permission.orgId);
+ const projectId = await server.services.secretScanningV2Instance.resolveActiveProjectId({
+ actor: req.permission.type,
+ actorId: req.permission.id,
+ actorAuthMethod: req.permission.authMethod,
+ actorOrgId: req.permission.orgId
+ });
return { projectId };
}
});
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.ts
index c2317e7ba4..fb189db8cd 100644
--- 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.ts
@@ -3,9 +3,12 @@ import { TPermissionServiceFactory } from "@app/ee/services/permission/permissio
import { ActorType } from "@app/services/auth/auth-type";
import { TProjectDALFactory } from "@app/services/project/project-dal";
+import { TSecretScanningV2ProjectResolverFactory } from "./secret-scanning-v2-project-resolver";
+
type TSecretScanningV2InstanceServiceDeps = {
projectDAL: Pick<TProjectDALFactory, "find">;
permissionService: Pick<TPermissionServiceFactory, "getOrgPermission">;
+ secretScanningV2ProjectResolver: Pick<TSecretScanningV2ProjectResolverFactory, "resolve">;
};
type TActor = {
@@ -19,9 +22,12 @@ export type TSecretScanningV2InstanceServiceFactory = ReturnType<typeof secretSc
export const secretScanningV2InstanceServiceFactory = ({
projectDAL,
- permissionService
+ permissionService,
+ secretScanningV2ProjectResolver
}: TSecretScanningV2InstanceServiceDeps) => {
- const getInstanceState = async ({ actor, actorId, actorAuthMethod, actorOrgId }: TActor) => {
+ // Token validation only checks membership, so this is what applies SSO enforcement and the other
+ // org access rules before anything is read or lazily created.
+ const $assertOrgAccess = async ({ actor, actorId, actorAuthMethod, actorOrgId }: TActor) => {
await permissionService.getOrgPermission({
actor,
actorId,
@@ -30,6 +36,16 @@ export const secretScanningV2InstanceServiceFactory = ({
actorOrgId,
scope: OrganizationActionScope.Any
});
+ };
+
+ const resolveActiveProjectId = async (actorDetails: TActor) => {
+ await $assertOrgAccess(actorDetails);
+ return secretScanningV2ProjectResolver.resolve(actorDetails.actorOrgId);
+ };
+
+ const getInstanceState = async (actorDetails: TActor) => {
+ await $assertOrgAccess(actorDetails);
+ const { actorOrgId } = actorDetails;
// Newest first, matching the resolver: the newest project is the active one.
const projects = await projectDAL.find(
@@ -50,6 +66,7 @@ export const secretScanningV2InstanceServiceFactory = ({
};
return {
+ resolveActiveProjectId,
getInstanceState
};
};
diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts
index e9d1ea3224..7f339518e7 100644
--- a/backend/src/server/routes/index.ts
+++ b/backend/src/server/routes/index.ts
@@ -4383,7 +4383,8 @@ export const registerRoutes = async (
const secretScanningV2InstanceService = secretScanningV2InstanceServiceFactory({
projectDAL,
- permissionService
+ permissionService,
+ secretScanningV2ProjectResolver
});
const secretScanningV2Service = secretScanningV2ServiceFactory({
@@ -4654,7 +4655,6 @@ export const registerRoutes = async (
agentProxyCa: agentProxyCaService,
folderCommit: folderCommitService,
secretScanningV2: secretScanningV2Service,
- secretScanningV2ProjectResolver,
secretScanningV2Instance: secretScanningV2InstanceService,
reminder: reminderService,
eventBus: eventBusService,
diff --git a/frontend/src/hooks/api/secretScanningV2/queries.tsx b/frontend/src/hooks/api/secretScanningV2/queries.tsx
index 14ed9cbdad..acc11f778e 100644
--- a/frontend/src/hooks/api/secretScanningV2/queries.tsx
+++ b/frontend/src/hooks/api/secretScanningV2/queries.tsx
@@ -82,19 +82,6 @@ export const useGetSecretScanningInstanceState = (orgId: string) =>
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/pages/organization/ProjectsPage/ProjectTypePage/ProjectTypePage.tsx b/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/ProjectTypePage.tsx
index c7e0bb3a28..8030c268d9 100644
--- a/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/ProjectTypePage.tsx
+++ b/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/ProjectTypePage.tsx
@@ -106,7 +106,6 @@ 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 {
@@ -254,25 +253,6 @@ 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({
@@ -314,13 +294,6 @@ 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/ProjectTypePage/route.tsx b/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/route.tsx
index 0dfcc32e09..039d69d57d 100644
--- a/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/route.tsx
+++ b/frontend/src/pages/organization/ProjectsPage/ProjectTypePage/route.tsx
@@ -1,6 +1,13 @@
import { createFileRoute, redirect } from "@tanstack/react-router";
import { urlSlugToProjectType } from "@app/helpers/project";
+import { projectKeys } from "@app/hooks/api";
+import { ProjectType } from "@app/hooks/api/projects/types";
+import { fetchUserProjectPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
+import {
+ fetchSecretScanningProjectId,
+ secretScanningV2Keys
+} from "@app/hooks/api/secretScanningV2/queries";
import { ProjectTypePage } from "./ProjectTypePage";
@@ -15,12 +22,48 @@ export const Route = createFileRoute(
}
]
}),
- beforeLoad: ({ params }) => {
- if (!urlSlugToProjectType(params.type)) {
+ beforeLoad: async ({ params, context }) => {
+ const projectType = urlSlugToProjectType(params.type);
+ if (!projectType) {
throw redirect({
to: "/organizations/$orgId/projects",
params: { orgId: params.orgId }
});
}
+
+ 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.
+ let projectId: string;
+ try {
+ projectId = await context.queryClient.fetchQuery({
+ queryKey: secretScanningV2Keys.activeProjectId(params.orgId),
+ queryFn: fetchSecretScanningProjectId
+ });
+ } catch {
+ return;
+ }
+
+ let isMember = true;
+ try {
+ await context.queryClient.ensureQueryData({
+ queryKey: roleQueryKeys.getUserProjectPermissions({ projectId }),
+ queryFn: () => fetchUserProjectPermissions({ projectId })
+ });
+ } catch {
+ isMember = false;
+ }
+
+ 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() });
}
});