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
Address greptile comments
Carlos Monastyrski2584c4e5cebb
diff --git a/backend/src/services/certificate-authority/certificate-issuance-queue.test.ts b/backend/src/services/certificate-authority/certificate-issuance-queue.test.tsindex f12c2190c5..bd3a63b4cd 100644--- a/backend/src/services/certificate-authority/certificate-issuance-queue.test.ts+++ b/backend/src/services/certificate-authority/certificate-issuance-queue.test.ts@@ -1,3 +1,5 @@+import { BadRequestError, InternalServerError } from "@app/lib/errors";+import { CertificateRequestStatus } from "../certificate-request/certificate-request-types";import { CaType } from "./certificate-authority-enums";import { certificateIssuanceQueueFactory, TIssueCertificateFromProfileJobData } from "./certificate-issuance-queue";@@ -145,4 +147,35 @@ describe("certificate issuance queue, DigiCert renewals", () => {expect(runJob.certificateRequestDAL.transitionToPendingValidation).toHaveBeenCalledTimes(1);});++ test("leaves a handed-off reissue pending when DigiCert's answer is lost", async () => {+ const runJob = buildQueue();+ digicertFns.reissueCertificate.mockImplementation(+ async ({ onBeforeSubmit }: { onBeforeSubmit: (prepared: object) => Promise<void> }) => {+ await onBeforeSubmit({ metadata: digicertResult.metadata, privateKey: "" });+ throw new InternalServerError({ message: "DigiCert reissue for order 7001 failed (no response)" });+ }+ );++ await expect(runJob({ externalConfiguration: { reissue: true }, csr: "csr" })).resolves.toBeUndefined();++ expect(runJob.certificateRequestDAL.setPendingMessage).toHaveBeenCalledWith(+ CERTIFICATE_REQUEST_ID,+ expect.stringContaining("didn't confirm the reissue")+ );+ });++ test("fails a reissue that DigiCert rejected", async () => {+ const runJob = buildQueue();+ digicertFns.reissueCertificate.mockImplementation(+ async ({ onBeforeSubmit }: { onBeforeSubmit: (prepared: object) => Promise<void> }) => {+ await onBeforeSubmit({ metadata: digicertResult.metadata, privateKey: "" });+ throw new BadRequestError({ message: "DigiCert reissue for order 7001 failed: invalid_order_status" });+ }+ );++ await expect(runJob({ externalConfiguration: { reissue: true }, csr: "csr" })).rejects.toThrow(+ "invalid_order_status"+ );+ });});diff --git a/backend/src/services/certificate-authority/certificate-issuance-queue.ts b/backend/src/services/certificate-authority/certificate-issuance-queue.tsindex 53f246622f..283158d823 100644--- a/backend/src/services/certificate-authority/certificate-issuance-queue.ts+++ b/backend/src/services/certificate-authority/certificate-issuance-queue.ts@@ -929,29 +929,51 @@ export const certificateIssuanceQueueFactory = ({externalConfiguration?.reissue && renewalOfOrderId !== undefined && originalCertificateId);let encryptedPrivateKey: Buffer | undefined;+ let isReissueHandedOff = false;const digicertResult =isReissue && renewalOfOrderId !== undefined && originalCertificateId- ? await digicertFns.reissueCertificate({- ...digicertRequest,- orderId: renewalOfOrderId,- ttl,- originalCertificateId,- onBeforeSubmit: async ({ metadata, privateKey }) => {- encryptedPrivateKey = privateKey ? await encryptPrivateKey(privateKey) : undefined;- const transitioned = await certificateRequestDAL.transitionToPendingValidation(certificateRequestId, {- metadata: JSON.stringify(withRenewalMetadata(metadata)),- ...(encryptedPrivateKey && { encryptedPrivateKey })- });- if (!transitioned) throw new CertificateRequestCancelledError();- }- })+ ? await digicertFns+ .reissueCertificate({+ ...digicertRequest,+ orderId: renewalOfOrderId,+ ttl,+ originalCertificateId,+ onBeforeSubmit: async ({ metadata, privateKey }) => {+ encryptedPrivateKey = privateKey ? await encryptPrivateKey(privateKey) : undefined;+ const transitioned = await certificateRequestDAL.transitionToPendingValidation(+ certificateRequestId,+ {+ metadata: JSON.stringify(withRenewalMetadata(metadata)),+ ...(encryptedPrivateKey && { encryptedPrivateKey })+ }+ );+ if (!transitioned) throw new CertificateRequestCancelledError();+ isReissueHandedOff = true;+ }+ })+ .catch(async (error: unknown) => {+ if (!isReissueHandedOff || error instanceof BadRequestError) throw error;+ logger.warn(+ error,+ `DigiCert did not confirm the reissue, leaving it to the order poller [certificateRequestId=${certificateRequestId}] [orderId=${renewalOfOrderId}]`+ );+ await setPending(+ `DigiCert didn't confirm the reissue on order #${renewalOfOrderId}. Checking the order for the result.`+ );+ return null;+ }): await digicertFns.orderCertificate({...digicertRequest,ttl,...(renewalOfOrderId !== undefined && { renewalOfOrderId })});+ if (!digicertResult) {+ certificateExistsAfterThisJob = false;+ return;+ }+if (await isCancelled()) {logger.info(`Cancelled after DigiCert order — order placed at CA but will not be tracked locally [certificateRequestId=${certificateRequestId}]`diff --git a/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-enums.ts b/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-enums.tsindex ccee485c7a..d592b6abb2 100644--- a/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-enums.ts+++ b/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-enums.ts@@ -31,3 +31,5 @@ export enum CodeSigningOrderStatus {Expired = "expired",Revoked = "revoked"}++export const DIGICERT_MAX_CERTIFICATE_VALIDITY_DAYS = 199;diff --git a/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-fns.ts b/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-fns.tsindex 237c55bcd3..9d658e0bca 100644--- a/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-fns.ts+++ b/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-fns.ts@@ -35,6 +35,7 @@ import { TExternalCertificateAuthorityDALFactory } from "../external-certificateimport { createDigiCertApiClient, TDigiCertApiClient } from "./digicert-api-client";import {DIGICERT_FINAL_ISSUED_STATUSES,+ DIGICERT_MAX_CERTIFICATE_VALIDITY_DAYS,DigiCertOrderStatus,DigiCertPollOutcome} from "./digicert-certificate-authority-enums";@@ -89,8 +90,6 @@ const assertPurposeMatchesProduct = (purpose: DigiCertCaPurpose | undefined, pro}};-const DIGICERT_MAX_CERTIFICATE_VALIDITY_DAYS = 199;-const TTL_RE2 = new RE2("^(\\d+)([dhm])$");const parseTtlToDays = (ttl: string): number => {const match = ttl.match(TTL_RE2);diff --git a/backend/src/services/certificate-authority/digicert/digicert-revocation-sync-queue.test.ts b/backend/src/services/certificate-authority/digicert/digicert-revocation-sync-queue.test.tsindex e5c07da266..537a359608 100644--- a/backend/src/services/certificate-authority/digicert/digicert-revocation-sync-queue.test.ts+++ b/backend/src/services/certificate-authority/digicert/digicert-revocation-sync-queue.test.ts@@ -9,6 +9,7 @@ import { digicertRevocationSyncQueueFactory } from "./digicert-revocation-sync-qconst getCertificateOcspStatus = vi.fn<(...args: unknown[]) => Promise<unknown>>();const listOrderStatusChanges = vi.fn();+const downloadCertificatePem = vi.fn();vi.mock("@app/lib/logger", () => ({ logger: { info: vi.fn(), error: vi.fn(), warn: vi.fn(), debug: vi.fn() } }));vi.mock("@app/lib/config/env", () => ({ getConfig: () => ({ isSecondaryInstance: false }) }));@@ -18,7 +19,9 @@ vi.mock("@app/services/certificate/certificate-ocsp-client", () => ({vi.mock("@app/services/project/project-fns", () => ({getProjectKmsCertificateKeyId: vi.fn().mockResolvedValue("kms-1")}));-vi.mock("./digicert-api-client", () => ({ createDigiCertApiClient: () => ({ listOrderStatusChanges }) }));+vi.mock("./digicert-api-client", () => ({+ createDigiCertApiClient: () => ({ listOrderStatusChanges, downloadCertificatePem })+}));vi.mock("./digicert-certificate-authority-fns", () => ({castDbEntryToDigiCertCertificateAuthority: () => ({ id: "ca-1", configuration: { appConnectionId: "connection-1" } }),getDigiCertClientCredentials: vi.fn().mockResolvedValue({ apiKey: "key", baseUrl: "https://digicert.example" })@@ -41,6 +44,7 @@ const replacedCertificate = (id: string) => ({});let certificateBody: { encryptedCertificate: Buffer; encryptedCertificateChain: Buffer };+let digicertPemBundle: string;beforeAll(async () => {x509.cryptoProvider.set(webcrypto as unknown as Crypto);@@ -64,6 +68,7 @@ beforeAll(async () => {publicKey: leafKeys.publicKey,signingAlgorithm: RSA_ALG});+ digicertPemBundle = `${leafCertificate.toString("pem")}\n${caCertificate.toString("pem")}`;certificateBody = {encryptedCertificate: Buffer.from(leafCertificate.rawData),encryptedCertificateChain: Buffer.from(caCertificate.toString("pem"))@@ -72,10 +77,12 @@ beforeAll(async () => {const runSync = async ({replaced,- revokedOrderCertificates = []+ revokedOrderCertificates = [],+ storedBody = certificateBody}: {- replaced: ReturnType<typeof replacedCertificate>[];+ replaced: (ReturnType<typeof replacedCertificate> & { externalMetadata?: unknown })[];revokedOrderCertificates?: ReturnType<typeof replacedCertificate>[];+ storedBody?: typeof certificateBody | null;}) => {let handler: (() => Promise<void>) | undefined;const certificateDAL = {@@ -95,7 +102,7 @@ const runSync = async ({},certificateAuthorityDAL: { findWithAssociatedCa: vi.fn().mockResolvedValue([{ id: "ca-1" }]) },certificateDAL,- certificateBodyDAL: { findOne: vi.fn().mockResolvedValue(certificateBody) },+ certificateBodyDAL: { findOne: vi.fn().mockResolvedValue(storedBody) },projectDAL: {},appConnectionDAL: {},kmsService: {@@ -155,4 +162,25 @@ describe("DigiCert revocation sync, certificates replaced on their order", () =>expect(getCertificateOcspStatus).not.toHaveBeenCalled();expect(certificateDAL.updateById).toHaveBeenCalledTimes(1);});++ test("downloads a deleted certificate from DigiCert to check it", async () => {+ downloadCertificatePem.mockResolvedValue(digicertPemBundle);+ getCertificateOcspStatus.mockResolvedValue({ status: OcspCertStatus.Revoked, revokedAt: REVOKED_AT });++ const certificateDAL = await runSync({+ replaced: [+ {+ ...replacedCertificate("cert-1"),+ externalMetadata: { type: "digicert", orderId: 7001, certificateId: 50001 }+ }+ ],+ storedBody: null+ });++ expect(downloadCertificatePem).toHaveBeenCalledWith(50001);+ expect(certificateDAL.updateById).toHaveBeenCalledWith(+ "cert-1",+ expect.objectContaining({ status: CertStatus.REVOKED, revokedAt: REVOKED_AT })+ );+ });});diff --git a/backend/src/services/certificate-authority/digicert/digicert-revocation-sync-queue.ts b/backend/src/services/certificate-authority/digicert/digicert-revocation-sync-queue.tsindex a9af672c04..37d430aa55 100644--- a/backend/src/services/certificate-authority/digicert/digicert-revocation-sync-queue.ts+++ b/backend/src/services/certificate-authority/digicert/digicert-revocation-sync-queue.ts@@ -9,6 +9,7 @@ import { CronJobName, TCronJobFactory } from "@app/lib/cron/cron-job";import { logger } from "@app/lib/logger";import { TAppConnectionDALFactory } from "@app/services/app-connection/app-connection-dal";import { ActorType } from "@app/services/auth/auth-type";+import { DigiCertExternalMetadataSchema } from "@app/services/certificate-common/external-metadata-schemas";import {CertificateApplicationAlertEvent,TCertificateAlertEventEmitter@@ -26,11 +27,12 @@ import { getProjectKmsCertificateKeyId } from "@app/services/project/project-fnsimport { TCertificateAuthorityDALFactory } from "../certificate-authority-dal";import { CaStatus, CaType } from "../certificate-authority-enums";-import { createDigiCertApiClient } from "./digicert-api-client";+import { createDigiCertApiClient, TDigiCertApiClient } from "./digicert-api-client";import {castDbEntryToDigiCertCertificateAuthority,getDigiCertClientCredentials} from "./digicert-certificate-authority-fns";+import { extractLeafAndChain } from "./digicert-certificate-authority-shared";// 03:00 UTC: off-peak and one hour after the existing daily certificate-cleanup cron (02:00 UTC).const REVOCATION_SYNC_CRON_SCHEDULE = "0 3 * * *";@@ -125,24 +127,37 @@ export const digicertRevocationSyncQueueFactory = ({};const loadCertificateAndIssuer = async (- cert: { id: string; projectId: string },+ cert: { id: string; projectId: string; externalMetadata?: unknown },+ digicertClient: TDigiCertApiClient,getKmsDecryptor: (projectId: string) => Promise<(args: { cipherTextBlob: Buffer }) => Promise<Buffer>>) => {const certBody = await certificateBodyDAL.findOne({ certId: cert.id });- if (!certBody?.encryptedCertificateChain) return null;- const kmsDecryptor = await getKmsDecryptor(cert.projectId);- const certificate = new x509.X509Certificate(- new Uint8Array(await kmsDecryptor({ cipherTextBlob: certBody.encryptedCertificate }))- );- const chain = parsePemCertificateChain(- (await kmsDecryptor({ cipherTextBlob: certBody.encryptedCertificateChain })).toString()- );- const issuer = chain?.find((chainCert) => chainCert.subject === certificate.issuer);+ let certificate: x509.X509Certificate;+ let chainPem: string;+ if (certBody?.encryptedCertificateChain) {+ const kmsDecryptor = await getKmsDecryptor(cert.projectId);+ certificate = new x509.X509Certificate(+ new Uint8Array(await kmsDecryptor({ cipherTextBlob: certBody.encryptedCertificate }))+ );+ chainPem = (await kmsDecryptor({ cipherTextBlob: certBody.encryptedCertificateChain })).toString();+ } else {+ const digicertCertificateId = DigiCertExternalMetadataSchema.safeParse(cert.externalMetadata).data?.certificateId;+ if (!digicertCertificateId) return null;+ const { leaf, chain } = extractLeafAndChain(await digicertClient.downloadCertificatePem(digicertCertificateId));+ certificate = new x509.X509Certificate(leaf);+ chainPem = chain;+ }++ const issuer = parsePemCertificateChain(chainPem)?.find((chainCert) => chainCert.subject === certificate.issuer);return issuer ? { certificate, issuer } : null;};- const syncReplacedCertificateRevocations = async (caId: string, alreadyRevokedIds: Set<string>) => {+ const syncReplacedCertificateRevocations = async (+ caId: string,+ digicertClient: TDigiCertApiClient,+ alreadyRevokedIds: Set<string>+ ) => {const replacedCertificates = await certificateDAL.findActiveDigiCertCertsReplacedOnOrder(caId);const kmsDecryptorsByProjectId = new Map<string, (args: { cipherTextBlob: Buffer }) => Promise<Buffer>>();@@ -158,7 +173,7 @@ export const digicertRevocationSyncQueueFactory = ({let revokedCount = 0;for (const cert of replacedCertificates.filter(({ id }) => !alreadyRevokedIds.has(id))) {try {- const certificateAndIssuer = await loadCertificateAndIssuer(cert, getKmsDecryptor);+ const certificateAndIssuer = await loadCertificateAndIssuer(cert, digicertClient, getKmsDecryptor);if (!certificateAndIssuer) {throw new Error("No issuer certificate stored for the certificate");}@@ -224,7 +239,7 @@ export const digicertRevocationSyncQueueFactory = ({`digicert-revocation-sync: CA done [caId=${ca.id}] [upstreamRevoked=${upstreamRevokedOrderIds.length}] [reconciled=${reconciledCertificateIds.size}]`);- await syncReplacedCertificateRevocations(ca.id, reconciledCertificateIds);+ await syncReplacedCertificateRevocations(ca.id, digicertClient, reconciledCertificateIds);};const init = () => {diff --git a/backend/src/services/certificate-common/external-metadata-schemas.ts b/backend/src/services/certificate-common/external-metadata-schemas.tsindex 87c487adfa..be4bf7dca6 100644--- a/backend/src/services/certificate-common/external-metadata-schemas.ts+++ b/backend/src/services/certificate-common/external-metadata-schemas.ts@@ -3,6 +3,7 @@ import { z } from "zod";import { AWSRegion } from "@app/services/app-connection/app-connection-enums";import { AwsAcmValidationMethod } from "@app/services/certificate-authority/aws-acm-public-ca/aws-acm-public-ca-certificate-authority-enums";import { CaType } from "@app/services/certificate-authority/certificate-authority-enums";+import { DIGICERT_MAX_CERTIFICATE_VALIDITY_DAYS } from "@app/services/certificate-authority/digicert/digicert-certificate-authority-enums";export const AwsAcmPublicCaExternalMetadataSchema = z.object({type: z.literal(CaType.AWS_ACM_PUBLIC_CA),@@ -71,8 +72,11 @@ export const CertificateImportLinkageMap: Partial<Record<CaType, TCertificateImp}};-export const CertificateReissueOrderSchemaMap: Partial<Record<CaType, z.ZodTypeAny>> = {- [CaType.DIGICERT]: DigiCertExternalMetadataSchema+export const CertificateReissueMap: Partial<Record<CaType, { orderSchema: z.ZodTypeAny; maxValidityDays: number }>> = {+ [CaType.DIGICERT]: {+ orderSchema: DigiCertExternalMetadataSchema,+ maxValidityDays: DIGICERT_MAX_CERTIFICATE_VALIDITY_DAYS+ }};export const CA_TYPE_LABEL: Record<CaType, string> = {diff --git a/backend/src/services/certificate-v3/certificate-renewal-service.ts b/backend/src/services/certificate-v3/certificate-renewal-service.tsindex a90b5b93d1..e521796101 100644--- a/backend/src/services/certificate-v3/certificate-renewal-service.ts+++ b/backend/src/services/certificate-v3/certificate-renewal-service.ts@@ -84,7 +84,7 @@ import {validateCertificateRequestLicense,validatePqcLicense} from "../certificate-common/certificate-utils";-import { CertificateReissueOrderSchemaMap } from "../certificate-common/external-metadata-schemas";+import { CertificateReissueMap } from "../certificate-common/external-metadata-schemas";import { TCertificateRequest } from "../certificate-policy/certificate-policy-types";import { TCertificateRequestDALFactory } from "../certificate-request/certificate-request-dal";import {@@ -757,7 +757,8 @@ export const certificateRenewalServiceFactory = ({keySource,originalSignatureAlgorithm,originalKeyAlgorithm,- profileCustomExtensions+ profileCustomExtensions,+ maxTtlDays}: {originalCert: TCertificates;policy: Parameters<TCertificatePolicyServiceFactory["validateRequestAgainstPolicy"]>[0];@@ -768,6 +769,7 @@ export const certificateRenewalServiceFactory = ({originalSignatureAlgorithm?: CertSignatureAlgorithm;originalKeyAlgorithm?: CertKeyAlgorithm;profileCustomExtensions?: TProfileCustomExtension[] | null;+ maxTtlDays?: number;}) => {const originalTtl = certificateSpanToTtl(originalCert.notBefore, originalCert.notAfter);@@ -809,7 +811,8 @@ export const certificateRenewalServiceFactory = ({});}- const ttl = mergedRequest.validity?.ttl || originalTtl;+ const requestedTtl = mergedRequest.validity?.ttl || originalTtl;+ const ttl = maxTtlDays && ms(requestedTtl) > ms(`${maxTtlDays}d`) ? `${maxTtlDays}d` : requestedTtl;const certificateRequest = { ...mergedRequest, validity: { ttl } };const validationResult = certificatePolicyService.validateRequestAgainstPolicy(policy, certificateRequest, {@@ -1161,8 +1164,7 @@ export const certificateRenewalServiceFactory = ({if (attributes?.ttl) {throw new BadRequestError({ message: "Remove the TTL. It can't be set on a reissue." });}- const reissueOrderSchema = CertificateReissueOrderSchemaMap[caType];- if (!reissueOrderSchema?.safeParse(originalCert.externalMetadata).success) {+ if (!CertificateReissueMap[caType]?.orderSchema.safeParse(originalCert.externalMetadata).success) {throw new BadRequestError({message: "This certificate has no order with its CA to reissue. Place a new order instead."});@@ -1178,7 +1180,9 @@ export const certificateRenewalServiceFactory = ({keySource,originalSignatureAlgorithm,originalKeyAlgorithm,- profileCustomExtensions: profile?.defaults?.customExtensions+ profileCustomExtensions: profile?.defaults?.customExtensions,+ maxTtlDays:+ externalConfiguration?.reissue && caType ? CertificateReissueMap[caType]?.maxValidityDays : undefined});changedAttributes = buildRenewalAuditChanges(replayedRequest, { ...certificateRequest, validity: { ttl } });diff --git a/backend/src/services/certificate/certificate-dal.ts b/backend/src/services/certificate/certificate-dal.tsindex 913793a539..7192d28b7a 100644--- a/backend/src/services/certificate/certificate-dal.ts+++ b/backend/src/services/certificate/certificate-dal.ts@@ -147,7 +147,7 @@ export const certificateDALFactory = (db: TDbClient) => {.whereRaw(`newer."externalMetadata"->>'orderId' = ${TableName.Certificate}."externalMetadata"->>'orderId'`).whereRaw(`newer."createdAt" > ${TableName.Certificate}."createdAt"`);})- .select("id", "commonName", "serialNumber", "projectId", "applicationId", "deletedAt");+ .select("id", "commonName", "serialNumber", "projectId", "applicationId", "deletedAt", "externalMetadata");return certs;} catch (error) {diff --git a/backend/src/services/certificate/certificate-ocsp-client.test.ts b/backend/src/services/certificate/certificate-ocsp-client.test.tsindex 0a5a58b833..d4d9dfcb9d 100644--- a/backend/src/services/certificate/certificate-ocsp-client.test.ts+++ b/backend/src/services/certificate/certificate-ocsp-client.test.ts@@ -51,15 +51,18 @@ let issuingCa: Awaited<ReturnType<typeof createCa>>;let otherCa: Awaited<ReturnType<typeof createCa>>;let leafCertificate: x509.X509Certificate;-const respondWith = (status: TOcspCertStatus, responder = issuingCa) =>+const respondWith = (+ status: TOcspCertStatus,+ responder = issuingCa,+ window = { thisUpdate: new Date(), nextUpdate: new Date(Date.now() + 3_600_000) }+) =>post.mockImplementation(async (_url: string, body: Buffer) => {const parsed = parseOcspRequest(body);const data = await buildSignedOcspResponse({signer: responder.signer,caCertificate: responder.certificate,statuses: parsed!.entries.map((entry) => ({ entry, status })),- thisUpdate: new Date(),- nextUpdate: new Date(Date.now() + 3_600_000)+ ...window});return { data: new Uint8Array(data).buffer };});@@ -121,4 +124,15 @@ describe("getCertificateOcspStatus", () => {).rejects.toThrow("has no OCSP responder URL");expect(post).not.toHaveBeenCalled();});++ test("rejects a response whose validity window has passed", async () => {+ respondWith({ kind: OcspCertStatus.Good }, issuingCa, {+ thisUpdate: new Date(Date.now() - 14 * 86_400_000),+ nextUpdate: new Date(Date.now() - 7 * 86_400_000)+ });++ await expect(+ getCertificateOcspStatus({ certificate: leafCertificate, issuer: issuingCa.certificate })+ ).rejects.toThrow("outside its validity window");+ });});diff --git a/backend/src/services/certificate/certificate-ocsp-client.ts b/backend/src/services/certificate/certificate-ocsp-client.tsindex b220eeae8d..6b3abedb11 100644--- a/backend/src/services/certificate/certificate-ocsp-client.ts+++ b/backend/src/services/certificate/certificate-ocsp-client.ts@@ -8,9 +8,12 @@ import {OcspResponseStatus} from "@app/ee/services/certificate-authority-ocsp/certificate-authority-ocsp-enums";import { BadRequestError } from "@app/lib/errors";+import { sanitizeUrlForLog } from "@app/lib/logger/sanitize-url";import { safeRequest } from "@app/lib/validator/safe-request";const OCSP_CLIENT_TIMEOUT_MS = 10_000;+const OCSP_CLOCK_SKEW_MS = 5 * 60 * 1000;+const OCSP_MAX_AGE_WITHOUT_NEXT_UPDATE_MS = 7 * 24 * 60 * 60 * 1000;const PKIJS_CERT_STATUS: Record<number, OcspCertStatus> = {0: OcspCertStatus.Good,1: OcspCertStatus.Revoked,@@ -25,12 +28,21 @@ export const getCertificateOcspUrl = (cert: x509.X509Certificate) => {return authorityInfoAccess?.ocsp.find((name) => name.type === "url")?.value;};-const getRevocationTime = (basicResponse: pkijs.BasicOCSPResponse, certificate: pkijs.Certificate) => {+const findSingleResponse = (basicResponse: pkijs.BasicOCSPResponse, certificate: pkijs.Certificate) => {const serialHex = Buffer.from(certificate.serialNumber.valueBlock.valueHexView).toString("hex");- const singleResponse = basicResponse.tbsResponseData.responses.find(+ return basicResponse.tbsResponseData.responses.find((response) => Buffer.from(response.certID.serialNumber.valueBlock.valueHexView).toString("hex") === serialHex);- const revokedInfo = singleResponse?.certStatus as asn1js.Constructed | undefined;+};++const isWithinValidityWindow = (singleResponse: pkijs.SingleResponse, now: number) => {+ if (singleResponse.thisUpdate.getTime() > now + OCSP_CLOCK_SKEW_MS) return false;+ if (singleResponse.nextUpdate) return singleResponse.nextUpdate.getTime() >= now - OCSP_CLOCK_SKEW_MS;+ return singleResponse.thisUpdate.getTime() >= now - OCSP_MAX_AGE_WITHOUT_NEXT_UPDATE_MS;+};++const getRevocationTime = (singleResponse: pkijs.SingleResponse) => {+ const revokedInfo = singleResponse.certStatus as asn1js.Constructed | undefined;const revocationTime = revokedInfo?.valueBlock?.value?.[0];return revocationTime instanceof asn1js.GeneralizedTime ? revocationTime.toDate() : undefined;};@@ -47,6 +59,7 @@ export const getCertificateOcspStatus = async ({throw new BadRequestError({ message: `Certificate ${certificate.serialNumber} has no OCSP responder URL` });}+ const responderUrl = sanitizeUrlForLog(ocspUrl);const pkijsCertificate = toPkijsCertificate(certificate);const pkijsIssuer = toPkijsCertificate(issuer);@@ -62,7 +75,7 @@ export const getCertificateOcspStatus = async ({const ocspResponse = pkijs.OCSPResponse.fromBER(new Uint8Array(data).buffer);const responseStatus = ocspResponse.responseStatus.valueBlock.valueDec;if (responseStatus !== OcspResponseStatus.Successful || !ocspResponse.responseBytes) {- throw new BadRequestError({ message: `OCSP responder ${ocspUrl} returned status ${responseStatus}` });+ throw new BadRequestError({ message: `OCSP responder ${responderUrl} returned status ${responseStatus}` });}const basicResponse = pkijs.BasicOCSPResponse.fromBER(@@ -82,16 +95,23 @@ export const getCertificateOcspStatus = async ({(Boolean(basicResponse.certs?.length) &&(await basicResponse.verify({ trustedCerts: [pkijsIssuer] }).catch(() => false)));if (!isSignatureValid) {- throw new BadRequestError({ message: `OCSP response from ${ocspUrl} failed signature verification` });+ throw new BadRequestError({ message: `OCSP response from ${responderUrl} failed signature verification` });}const { isForCertificate, status } = await basicResponse.getCertificateStatus(pkijsCertificate, pkijsIssuer);if (!isForCertificate) {- throw new BadRequestError({ message: `OCSP response from ${ocspUrl} does not cover the requested certificate` });+ throw new BadRequestError({+ message: `OCSP response from ${responderUrl} does not cover the requested certificate`+ });+ }++ const singleResponse = findSingleResponse(basicResponse, pkijsCertificate);+ if (!singleResponse || !isWithinValidityWindow(singleResponse, Date.now())) {+ throw new BadRequestError({ message: `OCSP response from ${responderUrl} is outside its validity window` });}const certStatus = PKIJS_CERT_STATUS[status] ?? OcspCertStatus.Unknown;return certStatus === OcspCertStatus.Revoked- ? { status: certStatus, revokedAt: getRevocationTime(basicResponse, pkijsCertificate) }+ ? { status: certStatus, revokedAt: getRevocationTime(singleResponse) }: { status: certStatus };};diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsx b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsxindex 34836d4084..fbe5c825bb 100644--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsx+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRenewalModal.tsx@@ -10,7 +10,6 @@ import {Alert,AlertDescription,AlertDialog,- AlertDialogAction,AlertDialogCancel,AlertDialogContent,AlertDialogDescription,@@ -18,6 +17,7 @@ import {AlertDialogHeader,AlertDialogTitle,AlertTitle,+ Button,Field,FieldContent,FieldDescription,@@ -67,6 +67,7 @@ import { buildPolicyRules, withRequiredRows } from "./certificatePolicyGuidance"import {buildRenewalFormDefaults,buildRenewalRequestAttributes,+ capTtlToDays,getRemovedCertificateNames,unionUsageOptions} from "./certificateRenewalUtils";@@ -337,8 +338,9 @@ const ChoiceCards = <T extends string>({);};-const REISSUE_VALIDITY_DESCRIPTION =- "Same as the current certificate. DigiCert caps it at 199 days and at the end of the order.";+const REISSUE_MAX_VALIDITY_DAYS = 199;++const REISSUE_VALIDITY_DESCRIPTION = `Same as the current certificate, up to ${REISSUE_MAX_VALIDITY_DAYS} days. DigiCert also caps it at the end of the order.`;enum DigiCertOrderChoice {NewOrder = "new-order",@@ -687,6 +689,7 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpTogconst [isSeeded, setIsSeeded] = useState(false);const seededCertificateIdRef = useRef<string | null>(null);+ const seededTtlRef = useRef("");useEffect(() => {if (!isOpen) {seededCertificateIdRef.current = null;@@ -703,6 +706,7 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpTogseededCertificateIdRef.current = certificate.id;const renewalDefaults = buildRenewalFormDefaults(certificate, constraints, renewalPreview);+ seededTtlRef.current = renewalDefaults.ttl ?? "";// Seed the rows the policy requires so they are visible as fields from the start.const seeded = withRequiredRows(buildPolicyRules(policyData),@@ -729,6 +733,16 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpToggetValues]);+ useEffect(() => {+ if (!isSeeded || !seededTtlRef.current) return;+ setValue(+ "ttl",+ isReissuing+ ? capTtlToDays(seededTtlRef.current, REISSUE_MAX_VALIDITY_DAYS)+ : seededTtlRef.current+ );+ }, [isSeeded, isReissuing, setValue]);+const closeWizard = () => {handlePopUpToggle("renewCertificate", false);reset();@@ -858,7 +872,7 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpTogonSubmit={handleSubmit(onFormSubmit, onFormInvalid)}onBack={goBack}onContinue={goNext}- isSubmitting={isSubmitting}+ isSubmitting={isSubmitting || isConfirmingNameRemoval}isSubmitDisabled={!certificate || !isSeeded}isContinueDisabled={!certificate || !isSeeded}>@@ -1088,8 +1102,9 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpTog)}<AlertDialogopen={pendingNameRemovalRenewal !== null}+ isPending={isConfirmingNameRemoval}onOpenChange={(open) => {- if (!open && !isConfirmingNameRemoval) setPendingNameRemovalRenewal(null);+ if (!open) setPendingNameRemovalRenewal(null);}}><AlertDialogContent>@@ -1101,14 +1116,15 @@ export const CertificateRenewalModal = ({ popUp, applicationName, handlePopUpTog</AlertDialogDescription></AlertDialogHeader><AlertDialogFooter>- <AlertDialogCancel isDisabled={isConfirmingNameRemoval}>Cancel</AlertDialogCancel>- <AlertDialogAction+ <AlertDialogCancel>Cancel</AlertDialogCancel>+ <Buttonvariant="danger"- isDisabled={isConfirmingNameRemoval}+ size="sm"+ isPending={isConfirmingNameRemoval}onClick={confirmNameRemoval}>Reissue Certificate- </AlertDialogAction>+ </Button></AlertDialogFooter></AlertDialogContent></AlertDialog>diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.test.ts b/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.test.tsindex 10806ca58b..d5faa28259 100644--- a/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.test.ts+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.test.ts@@ -9,6 +9,7 @@ import {import {buildRenewalFormDefaults,buildRenewalRequestAttributes,+ capTtlToDays,getRemovedCertificateNames} from "./certificateRenewalUtils";@@ -155,3 +156,14 @@ describe("buildRenewalRequestAttributes", () => {expect(attributes.extendedKeyUsages).toEqual(["client_auth"]);});});++describe("capTtlToDays", () => {+ it("caps a longer lifetime at the limit", () => {+ expect(capTtlToDays("365d", 199)).toBe("199d");+ });++ it("keeps a lifetime within the limit", () => {+ expect(capTtlToDays("85d", 199)).toBe("85d");+ expect(capTtlToDays("12h", 199)).toBe("12h");+ });+});diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.ts b/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.tsindex f9f7d0d686..1699596662 100644--- a/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.ts+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/certificateRenewalUtils.ts@@ -301,3 +301,8 @@ export const getRemovedCertificateNames = ({(name) => !requestedNames.has(name));};++export const capTtlToDays = (ttl: string, maxDays: number) => {+ const days = /^(\d+)d$/.exec(ttl)?.[1];+ return days && Number(days) > maxDays ? `${maxDays}d` : ttl;+};