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
remove resourceType
Matheus Nogueirab502bf2e72e4
diff --git a/backend/src/ee/services/audit-log/audit-log-types.ts b/backend/src/ee/services/audit-log/audit-log-types.tsindex f1277eece8..b98590fbe7 100644--- a/backend/src/ee/services/audit-log/audit-log-types.ts+++ b/backend/src/ee/services/audit-log/audit-log-types.ts@@ -5650,7 +5650,6 @@ interface SecretScanningDataSourceScanEvent {scanId: string;resourceId: string;resourceName: string;- resourceType: string;dataSourceId: string;dataSourceName: string;dataSourceType: string;diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-enums.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-enums.tsindex b2ce9f2524..051b390c71 100644--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-enums.ts+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-enums.ts@@ -28,11 +28,6 @@ export enum SecretScanningFindingStatus {Ignore = "ignore"}-export enum SecretScanningResource {- Repository = "repository",- Project = "project"-}-export enum SecretScanningFindingSeverity {High = "high",Medium = "medium",diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-maps.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-maps.tsindex c514946dea..fd29e0b74f 100644--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-maps.ts+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-maps.ts@@ -1,7 +1,4 @@-import {- SecretScanningDataSource,- SecretScanningResource-} from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-enums";+import { SecretScanningDataSource } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-enums";import { AppConnection } from "@app/services/app-connection/app-connection-enums";export const SECRET_SCANNING_DATA_SOURCE_NAME_MAP: Record<SecretScanningDataSource, string> = {@@ -21,9 +18,3 @@ export const AUTO_SYNC_DESCRIPTION_HELPER: Record<SecretScanningDataSource, { ve[SecretScanningDataSource.Bitbucket]: { verb: "push", noun: "repositories" },[SecretScanningDataSource.GitLab]: { verb: "push", noun: "projects" }};--export const SECRET_SCANNING_DATA_SOURCE_RESOURCE_TYPE_MAP: Record<SecretScanningDataSource, SecretScanningResource> = {- [SecretScanningDataSource.GitHub]: SecretScanningResource.Repository,- [SecretScanningDataSource.Bitbucket]: SecretScanningResource.Repository,- [SecretScanningDataSource.GitLab]: SecretScanningResource.Project-};diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-queue.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-queue.tsindex 0342053b62..feb4e36b9f 100644--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-queue.ts+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-queue.ts@@ -35,13 +35,11 @@ import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";import { TSecretScanningV2DALFactory } from "./secret-scanning-v2-dal";import {SecretScanningDataSource,- SecretScanningResource,SecretScanningScanStatus,SecretScanningScanTrigger,SecretScanningScanType} from "./secret-scanning-v2-enums";import { SECRET_SCANNING_FACTORY_MAP } from "./secret-scanning-v2-factory";-import { SECRET_SCANNING_DATA_SOURCE_RESOURCE_TYPE_MAP } from "./secret-scanning-v2-maps";import {TFindingsPayload,TQueueSecretScanningDataSourceFullScan,@@ -296,8 +294,6 @@ export const secretScanningV2QueueServiceFactory = ({`secretScanningV2Queue: Full Scan Started ${logDetails} [scanType=${SecretScanningScanType.Historical}] [tempFolder=${tempFolder}]`);- const resourceType = SECRET_SCANNING_DATA_SOURCE_RESOURCE_TYPE_MAP[dataSource.type as SecretScanningDataSource];-let holdsLease = false;try {@@ -404,68 +400,63 @@ export const secretScanningV2QueueServiceFactory = ({let stillOwned = true;- switch (resourceType) {- case SecretScanningResource.Repository:- case SecretScanningResource.Project: {- const repoSizeMb = await assertClonedRepositoryWithinSizeLimit(resource.name, scanPath);-- logger.info(`secretScanningV2Queue: Full Scan Cloned ${logDetails} repoSizeMb=[${repoSizeMb ?? "unknown"}]`);+ const scanRepository = async () => {+ const repoSizeMb = await assertClonedRepositoryWithinSizeLimit(resource.name, scanPath);- // nothing to scan, and both git history commands fail on an unborn HEAD- if (!(await repositoryHasCommits(scanPath))) {- logger.info(`secretScanningV2Queue: Full Scan found no commits, completing ${logDetails}`);- break;- }+ logger.info(`secretScanningV2Queue: Full Scan Cloned ${logDetails} repoSizeMb=[${repoSizeMb ?? "unknown"}]`);- const { SECRET_SCANNING_COMMIT_BATCH_SIZE: batchSize } = getConfig();+ // nothing to scan, and both git history commands fail on an unborn HEAD+ if (!(await repositoryHasCommits(scanPath))) {+ logger.info(`secretScanningV2Queue: Full Scan found no commits, completing ${logDetails}`);+ return;+ }- if (!batchSize) {- const batchFindings = await scanGitRepositoryAndGetFindings(scanPath, findingsPath, configPath);- scannedFindingsCount += batchFindings.length;- stillOwned = await persistBatch(batchFindings);- break;- }+ const { SECRET_SCANNING_COMMIT_BATCH_SIZE: batchSize } = getConfig();- const plan = await planCommitBatches({- repoPath: scanPath,- batchSize,- resumeAfterCommit: scan.lastScannedCommit,- resumeAfterCommitDigest: scan.lastScannedCommitDigest- });+ if (!batchSize) {+ const batchFindings = await scanGitRepositoryAndGetFindings(scanPath, findingsPath, configPath);+ scannedFindingsCount += batchFindings.length;+ stillOwned = await persistBatch(batchFindings);+ return;+ }- logger.info(- `secretScanningV2Queue: Full Scan Planned ${logDetails} totalCommits=[${plan.totalCommits}] batches=[${plan.batches.length}] batchSize=[${batchSize}] resumed=[${plan.resumed}]`- );+ const plan = await planCommitBatches({+ repoPath: scanPath,+ batchSize,+ resumeAfterCommit: scan.lastScannedCommit,+ resumeAfterCommitDigest: scan.lastScannedCommitDigest+ });- for (const [index, batch] of plan.batches.entries()) {- // eslint-disable-next-line no-await-in-loop- const batchFindings = await scanGitRepositoryAndGetFindings(- scanPath,- join(tempFolder, `findings-${index}.json`),- configPath,- batch- );+ logger.info(+ `secretScanningV2Queue: Full Scan Planned ${logDetails} totalCommits=[${plan.totalCommits}] batches=[${plan.batches.length}] batchSize=[${batchSize}] resumed=[${plan.resumed}]`+ );- scannedFindingsCount += batchFindings.length;+ for (const [index, batch] of plan.batches.entries()) {+ // eslint-disable-next-line no-await-in-loop+ const batchFindings = await scanGitRepositoryAndGetFindings(+ scanPath,+ join(tempFolder, `findings-${index}.json`),+ configPath,+ batch+ );- // eslint-disable-next-line no-await-in-loop- stillOwned = await persistBatch(batchFindings, {- lastScannedCommit: batch.lastCommit,- lastScannedCommitDigest: batch.prefixDigest- });+ scannedFindingsCount += batchFindings.length;- if (!stillOwned) break;+ // eslint-disable-next-line no-await-in-loop+ stillOwned = await persistBatch(batchFindings, {+ lastScannedCommit: batch.lastCommit,+ lastScannedCommitDigest: batch.prefixDigest+ });- logger.info(- `secretScanningV2Queue: Full Scan Batch Complete ${logDetails} batch=[${index + 1}/${plan.batches.length}] findings=[${batchFindings.length}] durationMs=[${Date.now() - startedAt}]`- );- }+ if (!stillOwned) break;- break;+ logger.info(+ `secretScanningV2Queue: Full Scan Batch Complete ${logDetails} batch=[${index + 1}/${plan.batches.length}] findings=[${batchFindings.length}] durationMs=[${Date.now() - startedAt}]`+ );}- default:- throw new Error("Unhandled resource type");- }+ };++ await scanRepository();// Guarded on the state this run is finishing: if the reaper already gave up on this scan, the// row keeps its failure and this update matches nothing. Findings are still written — they@@ -522,7 +513,6 @@ export const secretScanningV2QueueServiceFactory = ({dataSourceType: dataSource.type,resourceId: resource.id,resourceName: resource.name,- resourceType,scanId,scanStatus: SecretScanningScanStatus.Completed,scanType: SecretScanningScanType.Historical,@@ -573,8 +563,7 @@ export const secretScanningV2QueueServiceFactory = ({dataSourceType: dataSource.type,resourceId: resource.id,resourceName: resource.name,- resourceType,- scanId,+ scanId,scanStatus: SecretScanningScanStatus.Failed,scanType: SecretScanningScanType.Historical}@@ -685,8 +674,6 @@ export const secretScanningV2QueueServiceFactory = ({appConnectionDAL});- const resourceType = SECRET_SCANNING_DATA_SOURCE_RESOURCE_TYPE_MAP[dataSource.type as SecretScanningDataSource];-const tempFolder = await createTempFolder();logger.info(@@ -798,7 +785,6 @@ export const secretScanningV2QueueServiceFactory = ({dataSourceType: dataSource.type,resourceId,resourceName: resource.name,- resourceType,scanId,scanStatus: SecretScanningScanStatus.Completed,scanType: SecretScanningScanType.Realtime,@@ -848,8 +834,7 @@ export const secretScanningV2QueueServiceFactory = ({dataSourceType: dataSource.type,resourceId: resource.id,resourceName: resource.name,- resourceType,- scanId,+ scanId,scanStatus: SecretScanningScanStatus.Failed,scanType: SecretScanningScanType.Realtime}@@ -1021,7 +1006,6 @@ export const secretScanningV2QueueServiceFactory = ({dataSourceType: dataSource.type,resourceId: scan.resourceId,resourceName: scan.resourceName,- resourceType: SECRET_SCANNING_DATA_SOURCE_RESOURCE_TYPE_MAP[dataSource.type as SecretScanningDataSource],scanId: scan.id,scanStatus: SecretScanningScanStatus.Failed,scanType: scan.type as SecretScanningScanTypediff --git a/frontend/src/hooks/api/secretScanningV2/enums.ts b/frontend/src/hooks/api/secretScanningV2/enums.tsindex b2ce9f2524..051b390c71 100644--- a/frontend/src/hooks/api/secretScanningV2/enums.ts+++ b/frontend/src/hooks/api/secretScanningV2/enums.ts@@ -28,11 +28,6 @@ export enum SecretScanningFindingStatus {Ignore = "ignore"}-export enum SecretScanningResource {- Repository = "repository",- Project = "project"-}-export enum SecretScanningFindingSeverity {High = "high",Medium = "medium",