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
small ui changes
Matheus Nogueiraffe273fac4b0
diff --git a/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-endpoints.ts b/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-endpoints.tsindex 35b4fb1772..b38b16a09c 100644--- a/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-endpoints.ts+++ b/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-endpoints.ts@@ -1,3 +1,4 @@+import { FastifyRequest } from "fastify";import { z } from "zod";import { EventType } from "@app/ee/services/audit-log/audit-log-types";@@ -62,6 +63,41 @@ export const registerSecretScanningEndpoints = <const sourceType = SECRET_SCANNING_DATA_SOURCE_NAME_MAP[type];const sourceTypeId = sourceType.replace(/\s+/g, "");+ // Discovery only picks up resources that push after it is turned on, so it starts from everything already+ // accessible. Best effort: the data source is saved either way, and the rest can be added from its resources tab.+ const addAllAccessibleResources = async (+ req: Pick<FastifyRequest, "auditLogInfo" | "permission">,+ dataSource: Pick<TSecretScanningDataSource, "id" | "projectId">+ ) => {+ try {+ const { resources, dataSourceName } = await server.services.secretScanningV2.addAllSecretScanningResources(+ { type, dataSourceId: dataSource.id },+ req.permission+ );++ if (!resources.length) return;++ await server.services.auditLog.createAuditLog({+ ...req.auditLogInfo,+ projectId: dataSource.projectId,+ event: {+ type: EventType.SECRET_SCANNING_RESOURCE_ADD,+ metadata: {+ type,+ dataSourceId: dataSource.id,+ dataSourceName,+ resources: resources.map((resource) => ({ resourceId: resource.id, resourceName: resource.name }))+ }+ }+ });+ } catch (error) {+ logger.error(+ error,+ `secretScanningV2: Failed to add accessible resources after enabling discovery [dataSourceId=${dataSource.id}] [projectId=${dataSource.projectId}]`+ );+ }+ };+server.route({method: "GET",url: `/`,@@ -262,37 +298,7 @@ export const registerSecretScanningEndpoints = <}).catch(() => {});- // Discovery only picks up resources that push after setup, so start from everything already accessible.- // Best effort: the data source exists either way, and the rest can be added from its resources tab.- if (dataSource.isDiscoveryEnabled) {- try {- const { resources, dataSourceName } = await server.services.secretScanningV2.addAllSecretScanningResources(- { type, dataSourceId: dataSource.id },- req.permission- );-- if (resources.length) {- await server.services.auditLog.createAuditLog({- ...req.auditLogInfo,- projectId: dataSource.projectId,- event: {- type: EventType.SECRET_SCANNING_RESOURCE_ADD,- metadata: {- type,- dataSourceId: dataSource.id,- dataSourceName,- resources: resources.map((resource) => ({ resourceId: resource.id, resourceName: resource.name }))- }- }- });- }- } catch (error) {- logger.error(- error,- `secretScanningV2: Failed to add resources to new data source [dataSourceId=${dataSource.id}] [projectId=${dataSource.projectId}]`- );- }- }+ if (dataSource.isDiscoveryEnabled) await addAllAccessibleResources(req, dataSource);return { dataSource };}@@ -321,10 +327,12 @@ export const registerSecretScanningEndpoints = <handler: async (req) => {const { dataSourceId } = req.params;- const dataSource = (await server.services.secretScanningV2.updateSecretScanningDataSource(- { ...req.body, dataSourceId, type },- req.permission- )) as T;+ const { dataSource: updatedDataSource, isDiscoveryNewlyEnabled } =+ await server.services.secretScanningV2.updateSecretScanningDataSource(+ { ...req.body, dataSourceId, type },+ req.permission+ );+ const dataSource = updatedDataSource as T;await server.services.auditLog.createAuditLog({...req.auditLogInfo,@@ -339,6 +347,8 @@ export const registerSecretScanningEndpoints = <}});+ if (isDiscoveryNewlyEnabled) await addAllAccessibleResources(req, dataSource);+return { dataSource };}});diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.tsindex f0d738122f..8cb20c877f 100644--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts@@ -581,7 +581,10 @@ export const secretScanningV2ServiceFactory = ({}}- return updatedDataSource;+ return {+ dataSource: updatedDataSource,+ isDiscoveryNewlyEnabled: !dataSource.isDiscoveryEnabled && Boolean(updatedDataSource.isDiscoveryEnabled)+ };};const $deleteSecretScanningDataSource = async (diff --git a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/SecretScanningDataSourceConfigFields.tsx b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/SecretScanningDataSourceConfigFields.tsxindex 5fde81e5e3..8a0a38ad3d 100644--- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/SecretScanningDataSourceConfigFields.tsx+++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/SecretScanningDataSourceConfigFields.tsx@@ -91,7 +91,7 @@ export const SecretScanningDataSourceScanFields = () => {const config = useWatch({ control, name: "config" });const { name: platform } = SECRET_SCANNING_DATA_SOURCE_MAP[type];- const { pluralNoun, pluralTitle } = RESOURCE_DESCRIPTION_HELPER[type];+ const { singularNoun, pluralNoun, pluralTitle } = RESOURCE_DESCRIPTION_HELPER[type];const supportsDiscovery = doesDataSourceSupportDiscovery({ type, config });return (@@ -112,7 +112,7 @@ export const SecretScanningDataSourceScanFields = () => {isDisabled={!supportsDiscovery}description={supportsDiscovery- ? `Automatically enable scanning for new ${pluralNoun} added to ${platform}.`+ ? `Add every ${singularNoun} the connection can access to this data source, and any created in ${platform} later.`: "Select a group in the previous step to enable this. GitLab only reports new projects through group webhooks."}/>diff --git a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsxindex fd31ca61a9..45b1afe64d 100644--- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx+++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx@@ -95,7 +95,7 @@ const CONNECTION_STEP_INFO: Record<SecretScanningDataSource, string> = {const getSteps = (type: SecretScanningDataSource, isEdit: boolean) => {const { name: platform } = SECRET_SCANNING_DATA_SOURCE_MAP[type];- const { pluralNoun, verb } = RESOURCE_DESCRIPTION_HELPER[type];+ const { singularNoun, pluralNoun, verb } = RESOURCE_DESCRIPTION_HELPER[type];return [{@@ -121,7 +121,7 @@ const getSteps = (type: SecretScanningDataSource, isEdit: boolean) => {description: "Scan behavior",title: "Configure Scanning",subtitle: "Decide when this data source gets scanned.",- info: `Historical scan checks existing history once ${pluralNoun} are enabled. Scan New Commits keeps watching each ${verb}. Discovery automatically enables newly added ${pluralNoun}.`,+ info: `Historical scan checks existing history once ${pluralNoun} are enabled. Scan New Commits keeps watching each ${verb}. Discovery adds every ${singularNoun} the connection can access, including ones created later.`,fields: ["isHistoricalScanEnabled","isScanNewCommitsEnabled",