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
improvement(pki): block certificate deletion until expiry
Carlos Monastyrskiae51beae9166
diff --git a/backend/src/ee/services/audit-log/audit-log-types.ts b/backend/src/ee/services/audit-log/audit-log-types.tsindex 190a0d4d43..69e1f7dffe 100644--- a/backend/src/ee/services/audit-log/audit-log-types.ts+++ b/backend/src/ee/services/audit-log/audit-log-types.ts@@ -1,6 +1,7 @@import { ProjectType } from "@app/db/schemas";import { GatewayTransport } from "@app/ee/services/gateway-v2/gateway-v2-constants";import { HoneyTokenType } from "@app/ee/services/honey-token/honey-token-enums";+import { CertificateSource } from "@app/ee/services/pki-discovery/pki-discovery-types";import { ScepChallengeType } from "@app/ee/services/pki-scep/challenge";import { ScepEnrollmentStatus } from "@app/ee/services/pki-scep/pki-scep-types";import {@@ -36,6 +37,7 @@ import { TApprovalRequestSubjectMetadata } from "@app/services/approval-policy/aimport { ActorType } from "@app/services/auth/auth-type";import {CertExtendedKeyUsage,+ CertificateDeletionEligibility,CertKeyAlgorithm,CertKeyUsage,CrlReason@@ -3182,7 +3184,11 @@ interface DeleteCert {metadata: {certId: string;cn: string;+ friendlyName?: string | null;serialNumber: string;+ notAfter: string;+ source: CertificateSource;+ deletionAllowedReason: CertificateDeletionEligibility;applicationId?: string | null;applicationName?: string | null;};diff --git a/backend/src/server/routes/v1/certificate-router.ts b/backend/src/server/routes/v1/certificate-router.tsindex d32a78417f..67b4158084 100644--- a/backend/src/server/routes/v1/certificate-router.ts+++ b/backend/src/server/routes/v1/certificate-router.ts@@ -3,6 +3,7 @@ import RE2 from "re2";import { z } from "zod";import { EventType } from "@app/ee/services/audit-log/audit-log-types";+import { CertificateSource } from "@app/ee/services/pki-discovery/pki-discovery-types";import { ApiDocsTags, CERTIFICATES } from "@app/lib/api-docs";import { BadRequestError } from "@app/lib/errors";import { ms } from "@app/lib/ms";@@ -1841,7 +1842,7 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {hide: false,operationId: "deleteCertificate",tags: [ApiDocsTags.PkiCertificates],- description: "Delete certificate",+ description: "Delete certificate. Only expired, discovered and imported certificates can be deleted.",params: z.object({id: z.string().trim().uuid().describe(CERTIFICATES.DELETE.id)}),@@ -1852,7 +1853,7 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {}},handler: async (req) => {- const { deletedCert, applicationName } = await server.services.certificate.deleteCert({+ const { deletedCert, applicationName, deletionEligibility } = await server.services.certificate.deleteCert({id: req.params.id,actor: req.permission.type,actorId: req.permission.id,@@ -1869,7 +1870,11 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {metadata: {certId: deletedCert.id,cn: deletedCert.commonName,+ friendlyName: deletedCert.friendlyName,serialNumber: deletedCert.serialNumber,+ notAfter: deletedCert.notAfter.toISOString(),+ source: (deletedCert.source as CertificateSource | null) ?? CertificateSource.Issued,+ deletionAllowedReason: deletionEligibility,applicationId: deletedCert.applicationId,applicationName}diff --git a/backend/src/server/routes/v1/deprecated-certificate-router.ts b/backend/src/server/routes/v1/deprecated-certificate-router.tsindex f499c184a9..769f47cd93 100644--- a/backend/src/server/routes/v1/deprecated-certificate-router.ts+++ b/backend/src/server/routes/v1/deprecated-certificate-router.ts@@ -3,6 +3,7 @@ import RE2 from "re2";import { z } from "zod";import { EventType } from "@app/ee/services/audit-log/audit-log-types";+import { CertificateSource } from "@app/ee/services/pki-discovery/pki-discovery-types";import { ApiDocsTags, CERTIFICATE_AUTHORITIES, CERTIFICATES } from "@app/lib/api-docs";import { ms } from "@app/lib/ms";import { readLimit, writeLimit } from "@app/server/config/rateLimiter";@@ -539,7 +540,8 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =schema: {hide: false,tags: [ApiDocsTags.PkiCertificates],- description: "Delete certificate",+ description:+ "Delete certificate. Only expired, discovered and imported certificates can be deleted.",params: z.object({serialNumber: z.string().trim().describe(CERTIFICATES.DELETE.serialNumber)}),@@ -550,7 +552,7 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =}},handler: async (req) => {- const { deletedCert, applicationName } = await server.services.certificate.deleteCert({+ const { deletedCert, applicationName, deletionEligibility } = await server.services.certificate.deleteCert({serialNumber: req.params.serialNumber,actor: req.permission.type,actorId: req.permission.id,@@ -567,7 +569,11 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =metadata: {certId: deletedCert.id,cn: deletedCert.commonName,+ friendlyName: deletedCert.friendlyName,serialNumber: deletedCert.serialNumber,+ notAfter: deletedCert.notAfter.toISOString(),+ source: (deletedCert.source as CertificateSource | null) ?? CertificateSource.Issued,+ deletionAllowedReason: deletionEligibility,applicationId: deletedCert.applicationId,applicationName}diff --git a/backend/src/services/certificate/certificate-fns.ts b/backend/src/services/certificate/certificate-fns.tsindex b1a47d41d6..627a62e098 100644--- a/backend/src/services/certificate/certificate-fns.ts+++ b/backend/src/services/certificate/certificate-fns.ts@@ -3,6 +3,7 @@ import { Knex } from "knex";import forge from "node-forge";import RE2 from "re2";+import { CertificateSource } from "@app/ee/services/pki-discovery/pki-discovery-types";import { crypto } from "@app/lib/crypto/cryptography";import { BadRequestError, NotFoundError } from "@app/lib/errors";import {@@ -16,6 +17,7 @@ import type { TCertificateDALFactory } from "./certificate-dal";import {CertExtendedKeyUsage,CertExtendedKeyUsageOIDToName,+ CertificateDeletionEligibility,CertKeyAlgorithm,CertKeyUsage,CertSignatureAlgorithm,@@ -427,3 +429,14 @@ export const linkRenewedCertificate = async (await certificateDAL.updateById(originalCertificateId, { renewedByCertificateId: renewedCertificateId }, tx);};++export const resolveCertificateDeletionEligibility = (certificate: {+ notAfter: Date;+ source?: string | null;+}): CertificateDeletionEligibility | null => {+ if (certificate.source === CertificateSource.Discovered) return CertificateDeletionEligibility.Discovered;+ if (certificate.source === CertificateSource.Imported) return CertificateDeletionEligibility.Imported;+ if (new Date(certificate.notAfter).getTime() <= Date.now()) return CertificateDeletionEligibility.Expired;++ return null;+};diff --git a/backend/src/services/certificate/certificate-service.ts b/backend/src/services/certificate/certificate-service.tsindex beb69ce95a..72f6f18bf3 100644--- a/backend/src/services/certificate/certificate-service.ts+++ b/backend/src/services/certificate/certificate-service.ts@@ -90,6 +90,7 @@ import {getCertificateCredentials,normalizeThumbprint,parseCertificateBody,+ resolveCertificateDeletionEligibility,revocationReasonToCrlCode,splitPemChain} from "./certificate-fns";@@ -498,6 +499,21 @@ export const certificateServiceFactory = ({);}+ const deletionEligibility = resolveCertificateDeletionEligibility(cert);+ if (!deletionEligibility) {+ const certName = cert.friendlyName || cert.commonName || cert.serialNumber;+ const expiresAt = cert.notAfter.toISOString();++ let message = `Certificate '${certName}' is still valid until ${expiresAt} and cannot be deleted. Delete it once it has expired.`;+ if (cert.status === CertStatus.REVOKED) {+ message = `Certificate '${certName}' was revoked but does not expire until ${expiresAt}. Delete it once it has expired.`;+ } else if (cert.caId) {+ message = `Certificate '${certName}' is still valid until ${expiresAt} and cannot be deleted. Revoke it to retire it early, then delete it once it has expired.`;+ }++ throw new BadRequestError({ message });+ }+const pkiSyncIdsHoldingCertificate = await findPkiSyncIdsHoldingCertificate(cert.id, { certificateSyncDAL });let deletedCert;@@ -549,6 +565,7 @@ export const certificateServiceFactory = ({return {deletedCert,+ deletionEligibility,applicationName: await $resolveApplicationName(deletedCert.applicationId)};};diff --git a/backend/src/services/certificate/certificate-types.ts b/backend/src/services/certificate/certificate-types.tsindex a0020dd50f..dc641281c4 100644--- a/backend/src/services/certificate/certificate-types.ts+++ b/backend/src/services/certificate/certificate-types.ts@@ -20,6 +20,12 @@ export enum CertStatus {RENEWED = "renewed"}+export enum CertificateDeletionEligibility {+ Expired = "expired",+ Discovered = "discovered",+ Imported = "imported"+}+export enum CertKeyAlgorithm {RSA_2048 = "RSA_2048",RSA_3072 = "RSA_3072",diff --git a/docs/documentation/platform/pki/concepts/certificate-lifecycle.mdx b/docs/documentation/platform/pki/concepts/certificate-lifecycle.mdxindex 6b176972fd..4ae0a3136d 100644--- a/docs/documentation/platform/pki/concepts/certificate-lifecycle.mdx+++ b/docs/documentation/platform/pki/concepts/certificate-lifecycle.mdx@@ -43,6 +43,6 @@ Invalidate a certificate when it's compromised, misconfigured, or no longer need## Retirement-Remove a certificate from the system when it's no longer needed or has expired. Certificate Cleanup can automate the removal of expired certificates to keep your inventory clean.+Remove a certificate from the inventory once it has expired. Discovered and imported certificates can be removed at any time. Certificate Cleanup can automate the removal of expired certificates to keep your inventory clean.[Learn more about Certificate Cleanup →](/documentation/platform/pki/settings/certificate-cleanup)diff --git a/frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsx b/frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsxindex 771697107e..2e132929b4 100644--- a/frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsx+++ b/frontend/src/pages/cert-manager/CertificateDetailsByIDPage/CertificateDetailsByIDPage.tsx@@ -57,6 +57,7 @@ import { CertificateManageRenewalModal } from "../CertificatesPage/components/Ceimport { CertificateRenewalModal } from "../CertificatesPage/components/CertificateRenewalModal";import { CertificateRevocationModal } from "../CertificatesPage/components/CertificateRevocationModal";import {+ getCertificateDeletionBlockReason,isExpiringWithinOneDay,isManagedCertificate,RENEWAL_UNAVAILABLE_NO_PROFILE@@ -468,15 +469,33 @@ const Page = () => {Revoke Certificate</DropdownMenuItem>)}- {!(isInventoryView && certificate.applicationId) && (- <DropdownMenuItem- variant="danger"- isDisabled={!canDeleteCertificate}- onClick={() => handlePopUpOpen("deleteCertificate")}- >- Delete Certificate- </DropdownMenuItem>- )}+ {!(isInventoryView && certificate.applicationId) &&+ (() => {+ const deletionBlockReason = getCertificateDeletionBlockReason(certificate);++ const item = (+ <DropdownMenuItem+ variant="danger"+ isDisabled={!canDeleteCertificate || Boolean(deletionBlockReason)}+ onClick={() => handlePopUpOpen("deleteCertificate")}+ >+ Delete Certificate+ </DropdownMenuItem>+ );++ if (!deletionBlockReason) return item;++ return (+ <Tooltip>+ <TooltipTrigger asChild>+ <div>{item}</div>+ </TooltipTrigger>+ <TooltipContent side="left" sideOffset={20} className="max-w-72">+ {deletionBlockReason}+ </TooltipContent>+ </Tooltip>+ );+ })()}</DropdownMenuContent></DropdownMenu></PageHeader>diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsxindex 25a1431a5f..0b794e3001 100644--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx@@ -217,6 +217,7 @@ export const CertificatesSection = ({title={`Are you sure you want to remove the certificate ${(popUp?.deleteCertificate?.data as { commonName: string })?.commonName || ""}?`}+ subTitle="This action cannot be undone."onChange={(isOpen) => handlePopUpToggle("deleteCertificate", isOpen)}deleteKey="confirm"onDeleteApproved={() =>diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesTable.tsx b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesTable.tsxindex ed1146a0f6..25b4523358 100644--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesTable.tsx+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesTable.tsx@@ -95,6 +95,7 @@ import { UsePopUpState } from "@app/hooks/usePopUp";import { ActiveFilterChips } from "./ActiveFilterChips";import { AssignCertificateToApplicationModal } from "./AssignCertificateToApplicationModal";import {+ getCertificateDeletionBlockReason,getCertificateDisplayStatus,getCertSourceLabel,getCertValidUntilBadgeDetails,@@ -1325,22 +1326,47 @@ export const CertificatesTable = ({</DropdownMenuItem>);})()}- {!(isInventoryView && certificate.applicationId) && (- <DropdownMenuItem- variant="danger"- isDisabled={!canDeleteCertificate}- onClick={(e) => {- e.stopPropagation();- handlePopUpOpen("deleteCertificate", {- certificateId: certificate.id,- commonName: certificate.commonName- });- }}- >- <Trash2Icon />- Delete Certificate- </DropdownMenuItem>- )}+ {!(isInventoryView && certificate.applicationId) &&+ (() => {+ const deletionBlockReason =+ getCertificateDeletionBlockReason(certificate);++ const item = (+ <DropdownMenuItem+ variant="danger"+ isDisabled={+ !canDeleteCertificate || Boolean(deletionBlockReason)+ }+ onClick={(e) => {+ e.stopPropagation();+ handlePopUpOpen("deleteCertificate", {+ certificateId: certificate.id,+ commonName: certificate.commonName+ });+ }}+ >+ <Trash2Icon />+ Delete Certificate+ </DropdownMenuItem>+ );++ if (!deletionBlockReason) return item;++ return (+ <Tooltip>+ <TooltipTrigger asChild>+ <div>{item}</div>+ </TooltipTrigger>+ <TooltipContent+ side="left"+ sideOffset={20}+ className="max-w-72"+ >+ {deletionBlockReason}+ </TooltipContent>+ </Tooltip>+ );+ })()}</DropdownMenuContent></DropdownMenu></div>diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesTable.utils.ts b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesTable.utils.tsindex 1496391d04..bbc63d2ffa 100644--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesTable.utils.ts+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesTable.utils.ts@@ -48,6 +48,33 @@ export const getCertificateDisplayStatus = (certificate: TCertificateStatusSourcreturn { status: CertStatus.ACTIVE, label: "Active", variant: "success" as const };};+const DELETION_BLOCKED_NOT_EXPIRED =+ "This certificate has not expired yet. Revoke it to retire it early, then delete it once it has expired.";++const DELETION_BLOCKED_NOT_EXPIRED_NO_ISSUER =+ "This certificate has not expired yet. Delete it once it has expired.";++const DELETION_BLOCKED_REVOKED_NOT_EXPIRED =+ "This certificate was revoked but has not expired yet. Delete it once it has expired.";++type TCertificateDeletionSource = {+ status?: string | null;+ notAfter: string;+ source?: string | null;+ caId?: string | null;+};++export const getCertificateDeletionBlockReason = (certificate: TCertificateDeletionSource) => {+ const source = certificate.source ?? CertSource.Issued;++ if (source === CertSource.Discovered || source === CertSource.Imported) return null;+ if (new Date(certificate.notAfter) <= new Date()) return null;++ if (certificate.status === CertStatus.REVOKED) return DELETION_BLOCKED_REVOKED_NOT_EXPIRED;++ return certificate.caId ? DELETION_BLOCKED_NOT_EXPIRED : DELETION_BLOCKED_NOT_EXPIRED_NO_ISSUER;+};+export const isExpiringWithinOneDay = (notAfter: string): boolean => {const expiryDate = new Date(notAfter);const now = new Date();