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
count honey tokens in deleted environments when checking a restore
DimitrisStaratzisc5be8dd7320d
diff --git a/backend/src/ee/services/honey-token/honey-token-dal.ts b/backend/src/ee/services/honey-token/honey-token-dal.tsindex 7e73c62830..b7fec0dfa9 100644--- a/backend/src/ee/services/honey-token/honey-token-dal.ts+++ b/backend/src/ee/services/honey-token/honey-token-dal.ts@@ -155,6 +155,16 @@ export const honeyTokenDALFactory = (db: TDbClient) => {return Number(result?.count ?? 0);};+ // Unlike countByProjectId, includes tokens in deleted environments, matching countByOrgId.+ const countByProjectIdIncludingDeletedEnvironments = async (projectId: string, tx?: Knex) => {+ const [result] = await (tx || db.replicaNode())(TableName.HoneyToken)+ .where({ projectId })+ .whereNot("status", "revoked")+ .count<{ count: string | number }>({ count: "id" });++ return Number(result?.count ?? 0);+ };+return {...orm,findByFolderIds,@@ -163,6 +173,7 @@ export const honeyTokenDALFactory = (db: TDbClient) => {findOneByTokenIdentifier,countByOrgId,countByProjectId,+ countByProjectIdIncludingDeletedEnvironments,tryMarkTriggered,createSecretMappings,deleteSecretMappingsByHoneyTokenIddiff --git a/backend/src/services/project/project-service.ts b/backend/src/services/project/project-service.tsindex 6eaad93cb0..9e12132208 100644--- a/backend/src/services/project/project-service.ts+++ b/backend/src/services/project/project-service.ts@@ -219,7 +219,7 @@ type TProjectServiceFactoryDep = {"setLeaseRevocation" | "unsetRestoredLeaseRevocation">;secretV2BridgeDAL: Pick<TSecretV2BridgeDALFactory, "invalidateSecretCacheByProjectId">;- honeyTokenDAL: Pick<THoneyTokenDALFactory, "countByOrgId" | "countByProjectId">;+ honeyTokenDAL: Pick<THoneyTokenDALFactory, "countByOrgId" | "countByProjectIdIncludingDeletedEnvironments">;secretSyncDAL: Pick<TSecretSyncDALFactory, "countByOrgId" | "countByProjectId">;};@@ -1041,7 +1041,7 @@ export const projectServiceFactory = ({// 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);+ const projectHoneyTokenCount = await honeyTokenDAL.countByProjectIdIncludingDeletedEnvironments(project.id);if (projectHoneyTokenCount &&(await honeyTokenDAL.countByOrgId(project.orgId)) + projectHoneyTokenCount > plan.honeyTokenLimit