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
refuse a restore that would exceed the secret sync limit
DimitrisStaratzisa4390f348690
diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 408e8de7cf..d695a47616 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -2562,7 +2562,8 @@ export const registerRoutes = async (dynamicSecretLeaseDAL,dynamicSecretQueueService,secretV2BridgeDAL,- honeyTokenDAL+ honeyTokenDAL,+ secretSyncDAL});const projectEnvQueue = projectEnvQueueFactory({diff --git a/backend/src/services/project/project-service.ts b/backend/src/services/project/project-service.tsindex 6027da2d90..6eaad93cb0 100644--- a/backend/src/services/project/project-service.ts+++ b/backend/src/services/project/project-service.ts@@ -70,6 +70,7 @@ import { OrgServiceActor, TProjectPermission } from "@app/lib/types";import { AgentVaultIdentities, PamIdentities, SecretIdentities } from "@app/services/license-client";import { TUsageMeteringServiceFactory } from "@app/services/license-client/usage";import { TPkiSubscriberDALFactory } from "@app/services/pki-subscriber/pki-subscriber-dal";+import { TSecretSyncDALFactory } from "@app/services/secret-sync/secret-sync-dal";import { TSecretV2BridgeDALFactory } from "@app/services/secret-v2-bridge/secret-v2-bridge-dal";import { TGroupDALFactory } from "../../ee/services/group/group-dal";@@ -219,6 +220,7 @@ type TProjectServiceFactoryDep = {>;secretV2BridgeDAL: Pick<TSecretV2BridgeDALFactory, "invalidateSecretCacheByProjectId">;honeyTokenDAL: Pick<THoneyTokenDALFactory, "countByOrgId" | "countByProjectId">;+ secretSyncDAL: Pick<TSecretSyncDALFactory, "countByOrgId" | "countByProjectId">;};export type TProjectServiceFactory = ReturnType<typeof projectServiceFactory>;@@ -273,7 +275,8 @@ export const projectServiceFactory = ({dynamicSecretLeaseDAL,dynamicSecretQueueService,secretV2BridgeDAL,- honeyTokenDAL+ honeyTokenDAL,+ secretSyncDAL}: TProjectServiceFactoryDep) => {// The (orgId, slug) unique index already refuses a taken slug; this only names the cause when the holder is// a project pending deletion.@@ -1035,7 +1038,8 @@ export const projectServiceFactory = ({// Read before the transaction: a plan cache miss queries on its own connection.const plan = await licenseService.getPlan(project.orgId);- // A deleted project's honey tokens don't count toward the limit, so restoring it can exceed it.+ // A deleted project's honey tokens and syncs don't count toward their limits, so restoring it can+ // exceed them.if (plan.honeyTokenLimit !== null) {const projectHoneyTokenCount = await honeyTokenDAL.countByProjectId(project.id);if (@@ -1049,6 +1053,19 @@ export const projectServiceFactory = ({}}+ if (typeof plan.secretSyncLimit === "number") {+ const projectSecretSyncCount = await secretSyncDAL.countByProjectId(project.id);+ if (+ projectSecretSyncCount &&+ (await secretSyncDAL.countByOrgId(project.orgId)) + projectSecretSyncCount > plan.secretSyncLimit+ ) {+ throw new BadRequestError({+ message:+ "Failed to restore project due to secret sync limit reached. Upgrade plan or remove an existing secret sync."+ });+ }+ }+const restored = await projectDAL.transaction(async (tx) => {await tx.raw("SELECT pg_advisory_xact_lock(?)", [PgSqlLock.CreateProject(project.orgId)]);diff --git a/backend/src/services/secret-sync/secret-sync-dal.ts b/backend/src/services/secret-sync/secret-sync-dal.tsindex a9d6b88272..a6089ce270 100644--- a/backend/src/services/secret-sync/secret-sync-dal.ts+++ b/backend/src/services/secret-sync/secret-sync-dal.ts@@ -305,6 +305,15 @@ export const secretSyncDALFactory = (}};+ const countByProjectId = async (projectId: string, tx?: Knex) => {+ try {+ const doc = await (tx || db.replicaNode())(TableName.SecretSync).where({ projectId }).count();+ return Number(doc?.[0]?.count ?? 0);+ } catch (error) {+ throw new DatabaseError({ error, name: "Count By Project ID - Secret Sync" });+ }+ };+const findByDestinationAndOrgId = async (destination: string, orgId: string, tx?: Knex) => {try {const response = await (tx || db.replicaNode())(TableName.SecretSync)@@ -329,6 +338,7 @@ export const secretSyncDALFactory = (findConnectionId,updateAndReturnIds,countByOrgId,+ countByProjectId,findByDestinationAndOrgId};};