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
cleanups
Matheus Nogueira0e75d9401944
diff --git a/backend/src/db/migrations/20260929120000_reshape-secret-scanning-v2-tables.ts b/backend/src/db/migrations/20260929120000_reshape-secret-scanning-v2-tables.tsindex 7b3ca48942..f7a531fa3f 100644--- a/backend/src/db/migrations/20260929120000_reshape-secret-scanning-v2-tables.ts+++ b/backend/src/db/migrations/20260929120000_reshape-secret-scanning-v2-tables.ts@@ -30,23 +30,10 @@ export async function up(knex: Knex): Promise<void> {});}- if (await knex.schema.hasColumn(TableName.SecretScanningResource, "dataSourceId")) {+ if (await knex.schema.hasColumn(TableName.SecretScanningResource, "type")) {await knex.schema.alterTable(TableName.SecretScanningResource, (t) => {- t.renameColumn("dataSourceId", "sourceId");t.dropColumn("type");});- await renameConstraint(- knex,- TableName.SecretScanningResource,- "secret_scanning_resources_datasourceid_foreign",- "secret_scanning_resources_sourceid_foreign"- );- await renameConstraint(- knex,- TableName.SecretScanningResource,- "secret_scanning_resources_datasourceid_externalid_unique",- "secret_scanning_resources_sourceid_externalid_unique"- );}if (await knex.schema.hasColumn(TableName.SecretScanningScan, "scanningStartedAt")) {@@ -159,7 +146,7 @@ export async function down(knex: Knex): Promise<void> {"resourceName" = r.name,"resourceType" = CASE src.type WHEN 'gitlab' THEN 'project' ELSE 'repository' ENDFROM ?? AS r- JOIN ?? AS src ON src.id = r."sourceId"+ JOIN ?? AS src ON src.id = r."dataSourceId"WHERE r.id = f."resourceId"`,[TableName.SecretScanningFinding, TableName.SecretScanningResource, TableName.SecretScanningDataSource]);@@ -240,30 +227,15 @@ export async function down(knex: Knex): Promise<void> {});}- if (await knex.schema.hasColumn(TableName.SecretScanningResource, "sourceId")) {+ if (!(await knex.schema.hasColumn(TableName.SecretScanningResource, "type"))) {await knex.schema.alterTable(TableName.SecretScanningResource, (t) => {t.string("type").nullable();});await knex.raw(`UPDATE ?? AS r SET type = CASE src.type WHEN 'gitlab' THEN 'project' ELSE 'repository' END- FROM ?? AS src WHERE src.id = r."sourceId"`,+ FROM ?? AS src WHERE src.id = r."dataSourceId"`,[TableName.SecretScanningResource, TableName.SecretScanningDataSource]);- await renameConstraint(- knex,- TableName.SecretScanningResource,- "secret_scanning_resources_sourceid_foreign",- "secret_scanning_resources_datasourceid_foreign"- );- await renameConstraint(- knex,- TableName.SecretScanningResource,- "secret_scanning_resources_sourceid_externalid_unique",- "secret_scanning_resources_datasourceid_externalid_unique"- );- await knex.schema.alterTable(TableName.SecretScanningResource, (t) => {- t.renameColumn("sourceId", "dataSourceId");- });await knex.schema.alterTable(TableName.SecretScanningResource, (t) => {t.string("type").notNullable().alter();});diff --git a/backend/src/db/schemas/secret-scanning-resources.ts b/backend/src/db/schemas/secret-scanning-resources.tsindex fcce907e39..88d284c89e 100644--- a/backend/src/db/schemas/secret-scanning-resources.ts+++ b/backend/src/db/schemas/secret-scanning-resources.ts@@ -11,7 +11,7 @@ export const SecretScanningResourcesSchema = z.object({id: z.string().uuid(),externalId: z.string(),name: z.string(),- sourceId: z.string().uuid(),+ dataSourceId: z.string().uuid(),createdAt: z.date(),updatedAt: z.date()});diff --git a/backend/src/ee/services/secret-scanning-v2/bitbucket/bitbucket-secret-scanning-service.ts b/backend/src/ee/services/secret-scanning-v2/bitbucket/bitbucket-secret-scanning-service.tsindex bbe9f8adae..c565de2777 100644--- a/backend/src/ee/services/secret-scanning-v2/bitbucket/bitbucket-secret-scanning-service.ts+++ b/backend/src/ee/services/secret-scanning-v2/bitbucket/bitbucket-secret-scanning-service.ts@@ -1,4 +1,3 @@-import { TSecretScanningDataSources } from "@app/db/schemas";import { TSecretScanningV2DALFactory } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-dal";import { SecretScanningDataSource } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-enums";import { TSecretScanningV2QueueServiceFactory } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-queue";@@ -7,11 +6,8 @@ import { logger } from "@app/lib/logger";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { KmsDataKey } from "@app/services/kms/kms-types";-import {- TBitbucketDataSource,- TBitbucketDataSourceCredentials,- TBitbucketPushEvent-} from "./bitbucket-secret-scanning-types";+import { BitbucketDataSourceConfigSchema } from "./bitbucket-secret-scanning-schemas";+import { TBitbucketDataSourceCredentials, TBitbucketPushEvent } from "./bitbucket-secret-scanning-types";export const bitbucketSecretScanningService = (secretScanningV2DAL: TSecretScanningV2DALFactory,@@ -32,10 +28,10 @@ export const bitbucketSecretScanningService = (return;}- const dataSource = (await secretScanningV2DAL.dataSources.findOne({+ const dataSource = await secretScanningV2DAL.dataSources.findOne({id: payload.dataSourceId,type: SecretScanningDataSource.Bitbucket- })) as (TBitbucketDataSource & Pick<TSecretScanningDataSources, "encryptedCredentials">) | undefined;+ });if (!dataSource) {logger.error(@@ -44,12 +40,18 @@ export const bitbucketSecretScanningService = (return;}- const {- isAutoScanEnabled,- config: { includeRepos },- encryptedCredentials,- projectId- } = dataSource;+ const parsedConfig = BitbucketDataSourceConfigSchema.safeParse(dataSource.config);++ if (!parsedConfig.success) {+ logger.error(+ parsedConfig.error,+ `secretScanningV2PushEvent: Bitbucket - Invalid data source config [dataSourceId=${dataSource.id}] [workspaceUuid=${repository.workspace.uuid}]`+ );+ return;+ }++ const { isAutoScanEnabled, encryptedCredentials, projectId } = dataSource;+ const { includeRepos } = parsedConfig.data;if (!encryptedCredentials) {logger.info(diff --git a/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-service.ts b/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-service.tsindex 8e38e04c1a..bde557f895 100644--- a/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-service.ts+++ b/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-service.ts@@ -5,7 +5,7 @@ import { SecretScanningDataSource } from "@app/ee/services/secret-scanning-v2/seimport { TSecretScanningV2QueueServiceFactory } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-queue";import { logger } from "@app/lib/logger";-import { TGitHubDataSource } from "./github-secret-scanning-types";+import { GitHubDataSourceConfigSchema } from "./github-secret-scanning-schemas";export const githubSecretScanningService = (secretScanningV2DAL: TSecretScanningV2DALFactory,@@ -43,10 +43,10 @@ export const githubSecretScanningService = (return;}- const dataSource = (await secretScanningV2DAL.dataSources.findOne({+ const dataSource = await secretScanningV2DAL.dataSources.findOne({externalId: String(installation.id),type: SecretScanningDataSource.GitHub- })) as TGitHubDataSource | undefined;+ });if (!dataSource) {logger.error(@@ -55,10 +55,18 @@ export const githubSecretScanningService = (return;}- const {- isAutoScanEnabled,- config: { includeRepos }- } = dataSource;+ const parsedConfig = GitHubDataSourceConfigSchema.safeParse(dataSource.config);++ if (!parsedConfig.success) {+ logger.error(+ parsedConfig.error,+ `secretScanningV2PushEvent: GitHub - Invalid data source config [dataSourceId=${dataSource.id}] [installationId=${installation.id}]`+ );+ return;+ }++ const { isAutoScanEnabled } = dataSource;+ const { includeRepos } = parsedConfig.data;if (!isAutoScanEnabled) {logger.info(diff --git a/backend/src/ee/services/secret-scanning-v2/gitlab/gitlab-secret-scanning-service.ts b/backend/src/ee/services/secret-scanning-v2/gitlab/gitlab-secret-scanning-service.tsindex 528e8312ba..6860c47c20 100644--- a/backend/src/ee/services/secret-scanning-v2/gitlab/gitlab-secret-scanning-service.ts+++ b/backend/src/ee/services/secret-scanning-v2/gitlab/gitlab-secret-scanning-service.ts@@ -1,4 +1,3 @@-import { TSecretScanningDataSources } from "@app/db/schemas";import { GitLabDataSourceScope } from "@app/ee/services/secret-scanning-v2/gitlab/gitlab-secret-scanning-enums";import { TSecretScanningV2DALFactory } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-dal";import { SecretScanningDataSource } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-enums";@@ -8,11 +7,8 @@ import { logger } from "@app/lib/logger";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { KmsDataKey } from "@app/services/kms/kms-types";-import {- TGitLabDataSource,- TGitLabDataSourceCredentials,- THandleGitLabPushEvent-} from "./gitlab-secret-scanning-types";+import { GitLabDataSourceConfigSchema } from "./gitlab-secret-scanning-schemas";+import { TGitLabDataSourceCredentials, THandleGitLabPushEvent } from "./gitlab-secret-scanning-types";export const gitlabSecretScanningService = (secretScanningV2DAL: TSecretScanningV2DALFactory,@@ -29,10 +25,10 @@ export const gitlabSecretScanningService = (return;}- const dataSource = (await secretScanningV2DAL.dataSources.findOne({+ const dataSource = await secretScanningV2DAL.dataSources.findOne({id: dataSourceId,type: SecretScanningDataSource.GitLab- })) as (TGitLabDataSource & Pick<TSecretScanningDataSources, "encryptedCredentials">) | undefined;+ });if (!dataSource) {logger.error(@@ -41,7 +37,18 @@ export const gitlabSecretScanningService = (return;}- const { isAutoScanEnabled, config, encryptedCredentials, projectId } = dataSource;+ const parsedConfig = GitLabDataSourceConfigSchema.safeParse(dataSource.config);++ if (!parsedConfig.success) {+ logger.error(+ parsedConfig.error,+ `secretScanningV2PushEvent: GitLab - Invalid data source config [dataSourceId=${dataSource.id}] [projectId=${payload.project.id}]`+ );+ return;+ }++ const { isAutoScanEnabled, encryptedCredentials, projectId } = dataSource;+ const config = parsedConfig.data;if (!encryptedCredentials) {logger.info(diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-dal.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-dal.tsindex d879a84fdb..37014f317f 100644--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-dal.ts+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-dal.ts@@ -231,7 +231,7 @@ export const secretScanningV2DALFactory = (db: TDbClient) => {const dataSources = await baseSecretScanningDataSourceQuery({ filter, db, tx }).leftJoin(TableName.SecretScanningResource,- `${TableName.SecretScanningResource}.sourceId`,+ `${TableName.SecretScanningResource}.dataSourceId`,`${TableName.SecretScanningDataSource}.id`).leftJoin(@@ -400,7 +400,7 @@ export const secretScanningV2DALFactory = (db: TDbClient) => {`${TableName.SecretScanningResource}.id`,`${TableName.SecretScanningScan}.resourceId`)- .where(`${TableName.SecretScanningResource}.sourceId`, dataSourceId)+ .where(`${TableName.SecretScanningResource}.dataSourceId`, dataSourceId).leftJoin(TableName.SecretScanningFinding,`${TableName.SecretScanningFinding}.scanId`,@@ -478,7 +478,7 @@ export const secretScanningV2DALFactory = (db: TDbClient) => {.select(selectAllTableCols(TableName.SecretScanningScan)).select(db.ref("name").withSchema(TableName.SecretScanningResource).as("resourceName"),- db.ref("sourceId").withSchema(TableName.SecretScanningResource).as("dataSourceId")+ db.ref("dataSourceId").withSchema(TableName.SecretScanningResource)).orderBy(`${TableName.SecretScanningScan}.createdAt`, "asc").limit(limit);@@ -497,7 +497,7 @@ export const secretScanningV2DALFactory = (db: TDbClient) => {`${TableName.SecretScanningResource}.id`,`${TableName.SecretScanningScan}.resourceId`)- .where(`${TableName.SecretScanningResource}.sourceId`, dataSourceId)+ .where(`${TableName.SecretScanningResource}.dataSourceId`, dataSourceId).select(selectAllTableCols(TableName.SecretScanningScan));return scans;@@ -516,7 +516,7 @@ export const secretScanningV2DALFactory = (db: TDbClient) => {.join(TableName.SecretScanningDataSource,`${TableName.SecretScanningDataSource}.id`,- `${TableName.SecretScanningResource}.sourceId`+ `${TableName.SecretScanningResource}.dataSourceId`);const selectFindingWithDetails = <T extends Knex.QueryBuilder>(query: T) =>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 2bf5d2231d..0342053b62 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@@ -202,9 +202,9 @@ export const secretScanningV2QueueServiceFactory = ({const resources = await secretScanningV2DAL.resources.upsert(filteredRawResources.map((rawResource) => ({...rawResource,- sourceId: dataSource.id+ dataSourceId: dataSource.id})),- ["externalId", "sourceId"],+ ["externalId", "dataSourceId"],tx);@@ -612,10 +612,10 @@ export const secretScanningV2QueueServiceFactory = ({[{...resourcePayload,- sourceId: dataSourceId+ dataSourceId}],- ["externalId", "sourceId"],+ ["externalId", "dataSourceId"],tx);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 22cb4b3ff8..dc7626b15e 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@@ -540,10 +540,7 @@ export const secretScanningV2ServiceFactory = ({let resourceExternalId: string | undefined;if (resourceId) {- const resource = await secretScanningV2DAL.resources.findOne({- id: resourceId,- sourceId: dataSourceId- });+ const resource = await secretScanningV2DAL.resources.findOne({ id: resourceId, dataSourceId });if (!resource) {throw new NotFoundError({message: `Could not find Secret Scanning Resource with ID "${resourceId}" for Data Source with ID "${dataSourceId}"`@@ -602,7 +599,7 @@ export const secretScanningV2ServiceFactory = ({});const resources = await secretScanningV2DAL.resources.find({- sourceId: dataSourceId+ dataSourceId});return { resources, projectId: dataSource.projectId };@@ -689,7 +686,7 @@ export const secretScanningV2ServiceFactory = ({message: `Secret Scanning Data Source with ID "${dataSourceId}" is not configured for ${SECRET_SCANNING_DATA_SOURCE_NAME_MAP[type]}`});- const resources = await secretScanningV2DAL.resources.findWithDetails({ sourceId: dataSourceId });+ const resources = await secretScanningV2DAL.resources.findWithDetails({ dataSourceId });return { resources: resources as TSecretScanningResourceWithDetails[], projectId: dataSource.projectId };};diff --git a/backend/src/services/org-product-stats/org-product-stats-dal.ts b/backend/src/services/org-product-stats/org-product-stats-dal.tsindex 1e093bd3c8..ef2347c2a2 100644--- a/backend/src/services/org-product-stats/org-product-stats-dal.ts+++ b/backend/src/services/org-product-stats/org-product-stats-dal.ts@@ -160,7 +160,7 @@ export const orgProductStatsDALFactory = (db: TDbClient) => {const result = (await (tx || db.replicaNode())(TableName.SecretScanningResource).join(TableName.SecretScanningDataSource,- `${TableName.SecretScanningResource}.sourceId`,+ `${TableName.SecretScanningResource}.dataSourceId`,`${TableName.SecretScanningDataSource}.id`).join(TableName.Project, `${TableName.SecretScanningDataSource}.projectId`, `${TableName.Project}.id`)diff --git a/frontend/src/hooks/api/secretScanningV2/types/index.ts b/frontend/src/hooks/api/secretScanningV2/types/index.tsindex 262f272fa2..b1977f5132 100644--- a/frontend/src/hooks/api/secretScanningV2/types/index.ts+++ b/frontend/src/hooks/api/secretScanningV2/types/index.ts@@ -91,7 +91,7 @@ export type TGetSecretScanningDataSource = {export type TSecretScanningResourceWithDetails = {id: string;- sourceId: string;+ dataSourceId: string;externalId: string;name: string;createdAt: string;