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
fix(pki): name the certificate profiles blocking a CA delete
Claude3907c72ea87a
diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 194a5fbd6a..1f53aa2a75 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -3499,6 +3499,7 @@ export const registerRoutes = async (certificateAuthoritySecretDAL,certificateAuthorityCrlDAL,certificateTemplateDAL,+ certificateProfileDAL,certificateAuthorityQueue,certificateDAL,certificateBodyDAL,@@ -3554,6 +3555,7 @@ export const registerRoutes = async (projectDAL,pkiSyncDAL,pkiSyncQueue,+ certificateProfileDAL,certificateRequestDAL,resourceMetadataDAL,gatewayV2Service,diff --git a/backend/src/services/certificate-authority/certificate-authority-fns.ts b/backend/src/services/certificate-authority/certificate-authority-fns.tsindex 611d313dc7..d86092c507 100644--- a/backend/src/services/certificate-authority/certificate-authority-fns.ts+++ b/backend/src/services/certificate-authority/certificate-authority-fns.ts@@ -18,6 +18,7 @@ import {TAltNameType} from "../certificate/certificate-types";import { CERT_CLOCK_SKEW_MS, DEFAULT_CRL_VALIDITY_DAYS } from "../certificate-common/certificate-constants";+import { TCertificateProfileDALFactory } from "../certificate-profile/certificate-profile-dal";import { buildHsmCaSigner, buildLocalCaSigner, caKeyAlgorithmToHsmShape, TCaSigner } from "./ca-signer";import { TCertificateAuthorityDALFactory } from "./certificate-authority-dal";import {@@ -743,6 +744,21 @@ export const buildCrlDistributionPointUrls = (}, []);};+export const assertNoCertificateProfilesUsingCa = async (+ certificateProfileDAL: Pick<TCertificateProfileDALFactory, "find">,+ caId: string,+ caName: string+) => {+ const profiles = await certificateProfileDAL.find({ caId });+ if (profiles.length > 0) {+ const profileNames = profiles.map((profile) => profile.slug || profile.id).join(", ");++ throw new BadRequestError({+ message: `Cannot delete CA '${caName}' as it is currently in use by the following certificate profiles: ${profileNames}. Please remove this CA from these profiles before deleting it.`+ });+ }+};+export const rethrowCaDeleteError = (error: unknown): never => {if (error instanceof DatabaseError) {const { code, constraint } = error.error as { code?: string; constraint?: string };diff --git a/backend/src/services/certificate-authority/certificate-authority-service.ts b/backend/src/services/certificate-authority/certificate-authority-service.tsindex b54fa4f695..e25b7919e0 100644--- a/backend/src/services/certificate-authority/certificate-authority-service.ts+++ b/backend/src/services/certificate-authority/certificate-authority-service.ts@@ -83,7 +83,7 @@ import {} from "./azure-ad-cs/azure-ad-cs-certificate-authority-types";import { TCertificateAuthorityDALFactory } from "./certificate-authority-dal";import { CaType } from "./certificate-authority-enums";-import { rethrowCaDeleteError } from "./certificate-authority-fns";+import { assertNoCertificateProfilesUsingCa, rethrowCaDeleteError } from "./certificate-authority-fns";import { CERTIFICATE_AUTHORITIES_TYPE_MAP } from "./certificate-authority-maps";import { assertCertificateAuthorityQuota, resolveEffectiveMaxCas } from "./certificate-authority-quota-fns";import { TCertificateAuthoritySecretDALFactory } from "./certificate-authority-secret-dal";@@ -155,7 +155,7 @@ type TCertificateAuthorityServiceFactoryDep = {pkiSubscriberDAL: Pick<TPkiSubscriberDALFactory, "findById">;pkiSyncDAL: Pick<TPkiSyncDALFactory, "find">;pkiSyncQueue: Pick<TPkiSyncQueueFactory, "queuePkiSyncSyncCertificatesById">;- certificateProfileDAL?: Pick<TCertificateProfileDALFactory, "findById" | "findByIdWithConfigs">;+ certificateProfileDAL: Pick<TCertificateProfileDALFactory, "find" | "findById" | "findByIdWithConfigs">;pkiApplicationDAL: Pick<TPkiApplicationDALFactory, "findById">;certificateRequestDAL: Pick<TCertificateRequestDALFactory,@@ -945,6 +945,8 @@ export const certificateAuthorityServiceFactory = ({});}+ await assertNoCertificateProfilesUsingCa(certificateProfileDAL, certificateAuthority.id, certificateAuthority.name);+await certificateAuthorityDAL.deleteById(certificateAuthority.id).catch(rethrowCaDeleteError);if (type === CaType.INTERNAL) {@@ -1177,6 +1179,8 @@ export const certificateAuthorityServiceFactory = ({});}+ await assertNoCertificateProfilesUsingCa(certificateProfileDAL, certificateAuthority.id, certificateAuthority.name);+await certificateAuthorityDAL.deleteById(certificateAuthority.id).catch(rethrowCaDeleteError);if (type === CaType.INTERNAL) {diff --git a/backend/src/services/certificate-authority/internal/internal-certificate-authority-service.ts b/backend/src/services/certificate-authority/internal/internal-certificate-authority-service.tsindex ca017290b1..417d6c97f8 100644--- a/backend/src/services/certificate-authority/internal/internal-certificate-authority-service.ts+++ b/backend/src/services/certificate-authority/internal/internal-certificate-authority-service.ts@@ -64,6 +64,7 @@ import {} from "../../certificate-common/certificate-constants";import { appendCustomExtensions } from "../../certificate-common/certificate-extension-fns";import { validatePqcLicense } from "../../certificate-common/certificate-utils";+import { TCertificateProfileDALFactory } from "../../certificate-profile/certificate-profile-dal";import { TCertificateTemplateDALFactory } from "../../certificate-template/certificate-template-dal";import { validateCertificateDetailsAgainstTemplate } from "../../certificate-template/certificate-template-fns";import { buildHsmCaSigner, buildLocalCaSigner, caKeyAlgorithmToHsmShape, TCaSigner } from "../ca-signer";@@ -73,6 +74,7 @@ import { TCertificateAuthorityCertDALFactory } from "../certificate-authority-ceimport { TCertificateAuthorityDALFactory, TCertificateAuthorityWithAssociatedCa } from "../certificate-authority-dal";import { CaStatus, InternalCaType } from "../certificate-authority-enums";import {+ assertNoCertificateProfilesUsingCa,buildCrlDistributionPointUrls,createDistinguishedName,createSerialNumber,@@ -135,6 +137,7 @@ type TInternalCertificateAuthorityServiceFactoryDep = {certificateAuthoritySecretDAL: Pick<TCertificateAuthoritySecretDALFactory, "create" | "findOne">;certificateAuthorityCrlDAL: Pick<TCertificateAuthorityCrlDALFactory, "create" | "findOne" | "update">;certificateTemplateDAL: Pick<TCertificateTemplateDALFactory, "getById" | "find">;+ certificateProfileDAL: Pick<TCertificateProfileDALFactory, "find">;certificateAuthorityQueue: TCertificateAuthorityQueueFactory; // TODO: PickcertificateDAL: Pick<TCertificateDALFactory, "transaction" | "create" | "find">;certificateSecretDAL: Pick<TCertificateSecretDALFactory, "create">;@@ -161,6 +164,7 @@ export const internalCertificateAuthorityServiceFactory = ({certificateAuthoritySecretDAL,certificateAuthorityCrlDAL,certificateTemplateDAL,+ certificateProfileDAL,certificateDAL,certificateBodyDAL,certificateSecretDAL,@@ -750,6 +754,8 @@ export const internalCertificateAuthorityServiceFactory = ({subject(ProjectPermissionSub.CertificateAuthorities, { name: ca.name }));+ await assertNoCertificateProfilesUsingCa(certificateProfileDAL, ca.id, ca.name);+await certificateAuthorityDAL.deleteById(ca.id).catch(rethrowCaDeleteError);return expandInternalCa(ca);