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): address issuance failure audit review
bernie-gc3c16bb20c32
diff --git a/backend/CLAUDE.md b/backend/CLAUDE.mdindex e1bbf40d9c..89b7a2b02a 100644--- a/backend/CLAUDE.md+++ b/backend/CLAUDE.md@@ -1056,12 +1056,16 @@ for. To collapse another event, call it instead of `createAuditLog` and add`TAuditLogCollapseSummary` to that event's metadata type so the summary fields are typed.`CERTIFICATE_ISSUANCE_FAILED` is recorded by `recordCertificateIssuanceFailure`-(`services/certificate-common/certificate-issuance-audit-fns.ts`), collapsed the same way. The-synchronous paths record it only when the caller passes `auditLogInfo` to+(`services/certificate-common/certificate-issuance-audit-fns.ts`), collapsed the same way, and it+never throws. The synchronous paths record it only when the caller passes `auditLogInfo` to`issueCertificateFromProfile`, `signCertificateFromProfile`, `orderCertificate` or `renewCertificate`,-so a new route or protocol handler that issues certificates must pass it. Asynchronous failures are-recorded where the request leaves pending, in `certificateRequestService.updateCertificateRequestStatus`,-with a `PLATFORM` actor, so write a failed request through it rather than through the DAL.+so a new route that issues certificates must pass it. ACME and SCEP record their own failures with+their own actor, so they must not pass `auditLogInfo` to those methods. When code that created a+certificate request rethrows, `tagErrorWithCertificateRequest` links the event to that request.+Asynchronous failures are recorded by `recordCertificateRequestFailure`+(`services/certificate-request/certificate-request-fns.ts`) with a `PLATFORM` actor. Mark a request+failed through `certificateRequestService.updateCertificateRequestStatus`, which records it once on+the transition out of pending, or call `recordIssuanceFailure` if you write the status yourself.### Server Pluginsdiff --git a/backend/src/ee/services/audit-log/audit-log-types.ts b/backend/src/ee/services/audit-log/audit-log-types.tsindex df7006159e..75fa2e5278 100644--- a/backend/src/ee/services/audit-log/audit-log-types.ts+++ b/backend/src/ee/services/audit-log/audit-log-types.ts@@ -3573,6 +3573,7 @@ interface CertificateIssuanceFailedEvent {certificateProfileId?: string;profileName?: string;caId?: string;+ caName?: string;certificateRequestId?: string;originalCertificateId?: string;commonName?: string;diff --git a/backend/src/ee/services/pki-acme/pki-acme-service.ts b/backend/src/ee/services/pki-acme/pki-acme-service.tsindex 8f0bc5c9ae..2376927aa7 100644--- a/backend/src/ee/services/pki-acme/pki-acme-service.ts+++ b/backend/src/ee/services/pki-acme/pki-acme-service.ts@@ -63,6 +63,7 @@ import { TCertificateV3ServiceFactory } from "@app/services/certificate-v3/certiimport { TAcmeEnrollmentConfigDALFactory } from "@app/services/enrollment-config/acme-enrollment-config-dal";import { TKmsServiceFactory } from "@app/services/kms/kms-service";import { TUsageCounterDALFactory } from "@app/services/license-client/usage/usage-counter-dal";+import { TPkiApplicationDALFactory } from "@app/services/pki-application/pki-application-dal";import { TPkiApplicationProfileDALFactory } from "@app/services/pki-application/pki-application-profile-dal";import { TProjectDALFactory } from "@app/services/project/project-dal";import { getProjectKmsCertificateKeyId } from "@app/services/project/project-fns";@@ -192,6 +193,7 @@ type TPkiAcmeServiceFactoryDep = {approvalPolicyService: Pick<TApprovalPolicyServiceFactory, "createRequestFromPolicy" | "matchPolicy">;certificateRequestDAL: Pick<TCertificateRequestDALFactory, "create" | "updateById" | "transitionFromPending">;pkiApplicationProfileDAL: Pick<TPkiApplicationProfileDALFactory, "findOneByApplicationAndProfile">;+ pkiApplicationDAL: Pick<TPkiApplicationDALFactory, "findById">;acmeEnrollmentConfigDAL: Pick<TAcmeEnrollmentConfigDALFactory, "findById">;};@@ -221,6 +223,7 @@ export const pkiAcmeServiceFactory = ({approvalPolicyService,certificateRequestDAL,pkiApplicationProfileDAL,+ pkiApplicationDAL,acmeEnrollmentConfigDAL}: TPkiAcmeServiceFactoryDep): TPkiAcmeServiceFactory => {const validateAcmeProfile = async (@@ -1220,7 +1223,7 @@ export const pkiAcmeServiceFactory = ({const finalizeCaType = (ca.externalCa?.type as CaType) ?? CaType.INTERNAL;const $recordFinalizeFailure = (error: unknown, applicationId?: string | null) =>- recordCertificateIssuanceFailure(auditLogService, {+ recordCertificateIssuanceFailure({ auditLogService, pkiApplicationDAL }, {auditLogInfo: {...auditLogInfo,actor: { type: ActorType.ACME_ACCOUNT, metadata: { profileId, accountId } }@@ -1235,8 +1238,9 @@ export const pkiAcmeServiceFactory = ({enrollmentType: EnrollmentType.ACME,certificateProfileId: profileId,profileName: profile.slug,- ...(profile.caId && { caId: profile.caId }),- commonName: certificateRequest.commonName || undefined,+ caId: ca.id,+ caName: ca.name,+ ...(certificateRequest.commonName && { commonName: certificateRequest.commonName }),...(applicationId && { applicationId })}});@@ -1329,7 +1333,7 @@ export const pkiAcmeServiceFactory = ({{ profileCustomExtensions: profile.defaults?.customExtensions });if (!validationResult.isValid) {- throw await $rejectCsr(`Invalid CSR: ${validationResult.errors.join(", ")}`, accountApplicationId);+ throw new AcmeBadCSRError({ message: `Invalid CSR: ${validationResult.errors.join(", ")}` });}assertAcmeCaSupportsCustomExtensions(finalizeCaType,@@ -1342,7 +1346,10 @@ export const pkiAcmeServiceFactory = ({resolvedCustomExtensions: validationResult.resolvedCustomExtensions,policySteps: await approvalPolicyDAL.findStepsByPolicyId(matchedApprovalPolicy.id)};- })()+ })().catch(async (error: unknown) => {+ await $recordFinalizeFailure(error, accountApplicationId);+ throw error;+ }): undefined;// Claims the order under a row lock and asserts it is still finalizable. The approval path@@ -1491,6 +1498,9 @@ export const pkiAcmeServiceFactory = ({},"ACME certificate request requires approval");+ }).catch(async (error: unknown) => {+ if (!(error instanceof AcmeOrderNotReadyError)) await $recordFinalizeFailure(error, accountApplicationId);+ throw error;});} else {// Commit the claim on its own so the connection is released before signing starts.diff --git a/backend/src/ee/services/pki-scep/pki-scep-service.ts b/backend/src/ee/services/pki-scep/pki-scep-service.tsindex 94319407cb..21760b92d7 100644--- a/backend/src/ee/services/pki-scep/pki-scep-service.ts+++ b/backend/src/ee/services/pki-scep/pki-scep-service.ts@@ -1060,7 +1060,7 @@ export const pkiScepServiceFactory = ({commonName = undefined;}- await recordCertificateIssuanceFailure(auditLogService, {+ await recordCertificateIssuanceFailure({ auditLogService, certificateAuthorityDAL, pkiApplicationDAL }, {auditLogInfo: {ipAddress: clientIp,actor: { type: ActorType.SCEP_ACCOUNT, metadata: { profileId: params.profile.id } }@@ -1073,7 +1073,7 @@ export const pkiScepServiceFactory = ({certificateProfileId: params.profile.id,profileName: params.profile.slug,...(params.profile.caId && { caId: params.profile.caId }),- commonName,+ ...(commonName && { commonName }),...(params.applicationId && { applicationId: params.applicationId })}});diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 8abc50e0d5..95e0dbd3d7 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -3537,7 +3537,8 @@ export const registerRoutes = async (telemetryService,keyStore,pkiAlertV2Queue,- certificateAlertEventEmitter+ certificateAlertEventEmitter,+ auditLogService});const certificateEstService = certificateEstServiceFactory({@@ -3648,6 +3649,7 @@ export const registerRoutes = async (userDAL,identityDAL,certificateProfileDAL,+ certificateAuthorityDAL,auditLogService});@@ -4079,6 +4081,7 @@ export const registerRoutes = async (approvalPolicyService,certificateRequestDAL,pkiApplicationProfileDAL,+ pkiApplicationDAL,acmeEnrollmentConfigDAL});diff --git a/backend/src/services/approval-policy/cert-request/cert-request-policy-factory.test.ts b/backend/src/services/approval-policy/cert-request/cert-request-policy-factory.test.tsnew file mode 100644index 0000000000..b5b0e765e7--- /dev/null+++ b/backend/src/services/approval-policy/cert-request/cert-request-policy-factory.test.ts@@ -0,0 +1,48 @@+import { describe, expect, it, vi } from "vitest";++import { CertificateRequestStatus } from "@app/services/certificate-request/certificate-request-types";++import { certRequestApprovalResourceFactory } from "./cert-request-policy-factory";++vi.mock("@app/lib/logger", () => ({+ logger: { info: vi.fn(), error: vi.fn(), warn: vi.fn(), debug: vi.fn() }+}));++describe("certRequestApprovalResourceFactory.postApprovalRoutine", () => {+ const request = {+ id: "approval-1",+ requestData: { requestData: { certificateRequestId: "cert-req-1" } }+ } as never;++ const setup = (issueCertificate: () => Promise<unknown>) => {+ const failedRequest = { id: "cert-req-1", status: CertificateRequestStatus.FAILED };+ const deps = {+ approvalPolicyDAL: { findByProjectId: vi.fn() },+ certificateApprovalService: { issueCertificate: vi.fn(issueCertificate) },+ certificateRequestDAL: { updateById: vi.fn().mockResolvedValue(failedRequest), findById: vi.fn() },+ certificateRequestService: { recordIssuanceFailure: vi.fn() }+ };+ return { deps, failedRequest, resource: certRequestApprovalResourceFactory(deps as never) };+ };++ it("records the issuance failure with the original error and lets the operation be derived", async () => {+ const error = new Error("CA is disabled");+ const { deps, failedRequest, resource } = setup(() => Promise.reject(error));++ await resource.postApprovalRoutine!(request);++ expect(deps.certificateRequestDAL.updateById).toHaveBeenLastCalledWith("cert-req-1", {+ status: CertificateRequestStatus.FAILED,+ errorMessage: "CA is disabled"+ });+ expect(deps.certificateRequestService.recordIssuanceFailure).toHaveBeenCalledWith(failedRequest, { error });+ });++ it("records nothing when issuance succeeds", async () => {+ const { deps, resource } = setup(() => Promise.resolve());++ await resource.postApprovalRoutine!(request);++ expect(deps.certificateRequestService.recordIssuanceFailure).not.toHaveBeenCalled();+ });+});diff --git a/backend/src/services/approval-policy/cert-request/cert-request-policy-factory.ts b/backend/src/services/approval-policy/cert-request/cert-request-policy-factory.tsindex 767e694ba6..c832720609 100644--- a/backend/src/services/approval-policy/cert-request/cert-request-policy-factory.ts+++ b/backend/src/services/approval-policy/cert-request/cert-request-policy-factory.ts@@ -1,6 +1,5 @@import { getConfig } from "@app/lib/config/env";import { logger } from "@app/lib/logger";-import { CertificateIssuanceOperation } from "@app/services/certificate-common/certificate-constants";import { TCertificateRequestDALFactory } from "@app/services/certificate-request/certificate-request-dal";import { TCertificateRequestServiceFactory } from "@app/services/certificate-request/certificate-request-service";import { CertificateRequestStatus } from "@app/services/certificate-request/certificate-request-types";@@ -116,11 +115,7 @@ export const certRequestApprovalResourceFactory = ({status: CertificateRequestStatus.FAILED,errorMessage});- await certificateRequestService.recordIssuanceFailure(- failedRequest,- failedRequest.csr ? CertificateIssuanceOperation.SIGN : CertificateIssuanceOperation.ISSUE,- error- );+ await certificateRequestService.recordIssuanceFailure(failedRequest, { error });logger.error({ error, certificateRequestId: certReqId, approvalRequestId: request.id },`Failed to issue certificate after approval [certificateRequestId=${certReqId}]`diff --git a/backend/src/services/certificate-authority/certificate-authority-service.ts b/backend/src/services/certificate-authority/certificate-authority-service.tsindex 8a4d820c39..037660af11 100644--- a/backend/src/services/certificate-authority/certificate-authority-service.ts+++ b/backend/src/services/certificate-authority/certificate-authority-service.ts@@ -25,7 +25,9 @@ import { TCertificateDALFactory } from "../certificate/certificate-dal";import { TCertificateSecretDALFactory } from "../certificate/certificate-secret-dal";import { CrlReason } from "../certificate/certificate-types";import { TCertificateProfileDALFactory } from "../certificate-profile/certificate-profile-dal";+import { TAuditLogServiceFactory } from "@app/ee/services/audit-log/audit-log-types";import { TCertificateRequestDALFactory } from "../certificate-request/certificate-request-dal";+import { recordCertificateRequestFailure } from "../certificate-request/certificate-request-fns";import {CertificateRequestStatus,TAttachCertificateToRequestDTO,@@ -172,6 +174,7 @@ type TCertificateAuthorityServiceFactoryDep = {licenseService: Pick<TLicenseServiceFactory, "getPlan">;pkiAlertV2Queue?: Pick<TPkiAlertV2QueueServiceFactory, "queueCertificateEvent">;certificateAlertEventEmitter: Pick<TCertificateAlertEventEmitter, "notify">;+ auditLogService: Pick<TAuditLogServiceFactory, "createCollapsedAuditLog">;};export type TCertificateAuthorityServiceFactory = ReturnType<typeof certificateAuthorityServiceFactory>;@@ -204,7 +207,8 @@ export const certificateAuthorityServiceFactory = ({certificateAuthoritySecretDAL,licenseService,pkiAlertV2Queue,- certificateAlertEventEmitter+ certificateAlertEventEmitter,+ auditLogService}: TCertificateAuthorityServiceFactoryDep) => {const acmeFns = AcmeCertificateAuthorityFns({appConnectionDAL,@@ -1471,8 +1475,20 @@ export const certificateAuthorityServiceFactory = ({updateCertificateRequestStatus: async ({certificateRequestId: id,status,- errorMessage- }: TUpdateCertificateRequestStatusDTO) => certificateRequestDAL.transitionFromPending(id, status, errorMessage),+ errorMessage,+ operation,+ originalCertificateId,+ error+ }: TUpdateCertificateRequestStatusDTO) => {+ const updated = await certificateRequestDAL.transitionFromPending(id, status, errorMessage);+ if (updated && status === CertificateRequestStatus.FAILED) {+ await recordCertificateRequestFailure(+ { auditLogService, certificateAuthorityDAL, certificateProfileDAL, pkiApplicationDAL },+ { certificateRequest: updated, operation, originalCertificateId, error }+ );+ }+ return updated;+ },attachCertificateToRequest: async ({ certificateRequestId: id, certificateId }: TAttachCertificateToRequestDTO) =>certificateRequestDAL.attachCertificate(id, certificateId)};diff --git a/backend/src/services/certificate-authority/certificate-issuance-queue.ts b/backend/src/services/certificate-authority/certificate-issuance-queue.tsindex 085e955a65..1990f11f12 100644--- a/backend/src/services/certificate-authority/certificate-issuance-queue.ts+++ b/backend/src/services/certificate-authority/certificate-issuance-queue.ts@@ -552,6 +552,8 @@ export const certificateIssuanceQueueFactory = ({certificateRequestId,status: CertificateRequestStatus.FAILED,operation: issuanceOperation,+ originalCertificateId,+ error: attachError,errorMessage: `Failed to attach certificate: ${attachError instanceof Error ? attachError.message : String(attachError)}`});} catch (statusUpdateError) {@@ -619,6 +621,8 @@ export const certificateIssuanceQueueFactory = ({certificateRequestId,status: CertificateRequestStatus.FAILED,operation: issuanceOperation,+ originalCertificateId,+ error: attachError,errorMessage: `Failed to attach certificate: ${attachError instanceof Error ? attachError.message : String(attachError)}`});} catch (statusUpdateError) {@@ -691,6 +695,8 @@ export const certificateIssuanceQueueFactory = ({certificateRequestId,status: CertificateRequestStatus.FAILED,operation: issuanceOperation,+ originalCertificateId,+ error: attachError,errorMessage: `Failed to attach certificate: ${attachError instanceof Error ? attachError.message : String(attachError)}`});} catch (statusUpdateError) {@@ -761,6 +767,8 @@ export const certificateIssuanceQueueFactory = ({certificateRequestId,status: CertificateRequestStatus.FAILED,operation: issuanceOperation,+ originalCertificateId,+ error: attachError,errorMessage: `Failed to attach certificate: ${attachError instanceof Error ? attachError.message : String(attachError)}`});} catch (statusUpdateError) {@@ -833,6 +841,8 @@ export const certificateIssuanceQueueFactory = ({certificateRequestId,status: CertificateRequestStatus.FAILED,operation: issuanceOperation,+ originalCertificateId,+ error: attachError,errorMessage: `Failed to attach certificate: ${attachError instanceof Error ? attachError.message : String(attachError)}`});} catch (statusUpdateError) {@@ -1112,6 +1122,8 @@ export const certificateIssuanceQueueFactory = ({certificateRequestId,status: CertificateRequestStatus.FAILED,operation: issuanceOperation,+ originalCertificateId,+ error: attachError,errorMessage: `Failed to attach certificate: ${attachError instanceof Error ? attachError.message : String(attachError)}`});} catch (statusUpdateError) {@@ -1268,6 +1280,8 @@ export const certificateIssuanceQueueFactory = ({certificateRequestId,status: CertificateRequestStatus.FAILED,operation: issuanceOperation,+ originalCertificateId,+ error,errorMessage: isAcmeTerminal ? errorMessage : `Certificate issuance failed: ${errorMessage}`});logger.info(`Updated certificate request ${certificateRequestId} status to failed due to issuance error`);@@ -1312,6 +1326,8 @@ export const certificateIssuanceQueueFactory = ({certificateRequestId,status: CertificateRequestStatus.FAILED,operation: job.data.isRenewal ? CertificateIssuanceOperation.RENEW : CertificateIssuanceOperation.ORDER,+ originalCertificateId: job.data.originalCertificateId,+ error,errorMessage: `AWS ACM DNS validation did not complete after ${maxAttempts} attempts: ${error.message}`});logger.info(diff --git a/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-processor.ts b/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-processor.tsindex 2ef1159b80..350684998f 100644--- a/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-processor.ts+++ b/backend/src/services/certificate-authority/digicert/digicert-certificate-authority-processor.ts@@ -143,6 +143,7 @@ export const processDigiCertPendingValidationRequest = async (certificateRequestId: request.id,status: CertificateRequestStatus.FAILED,operation: parsed.digicert.isRenewal ? CertificateIssuanceOperation.RENEW : CertificateIssuanceOperation.ORDER,+ originalCertificateId: parsed.digicert.originalCertificateId,errorMessage: "Validation timed out after 24h"});logger.info(`DigiCert validation timed out [certificateRequestId=${request.id}]`);@@ -241,6 +242,7 @@ export const processDigiCertPendingValidationRequest = async (certificateRequestId: request.id,status: CertificateRequestStatus.FAILED,operation: parsed.digicert.isRenewal ? CertificateIssuanceOperation.RENEW : CertificateIssuanceOperation.ORDER,+ originalCertificateId: parsed.digicert.originalCertificateId,errorMessage: `DigiCert order ${orderStatus}`});logger.info(`DigiCert order terminal state [certificateRequestId=${request.id}] [status=${orderStatus}]`);diff --git a/backend/src/services/certificate-authority/godaddy/godaddy-certificate-authority-processor.ts b/backend/src/services/certificate-authority/godaddy/godaddy-certificate-authority-processor.tsindex af6595edba..fde6510be1 100644--- a/backend/src/services/certificate-authority/godaddy/godaddy-certificate-authority-processor.ts+++ b/backend/src/services/certificate-authority/godaddy/godaddy-certificate-authority-processor.ts@@ -146,6 +146,7 @@ export const processGoDaddyPendingValidationRequest = async (certificateRequestId: request.id,status: CertificateRequestStatus.FAILED,operation: parsed.godaddy.isRenewal ? CertificateIssuanceOperation.RENEW : CertificateIssuanceOperation.ORDER,+ originalCertificateId: parsed.godaddy.originalCertificateId,errorMessage: "Validation timed out after 24h"});logger.info(`GoDaddy validation timed out [certificateRequestId=${request.id}]`);@@ -240,6 +241,7 @@ export const processGoDaddyPendingValidationRequest = async (certificateRequestId: request.id,status: CertificateRequestStatus.FAILED,operation: parsed.godaddy.isRenewal ? CertificateIssuanceOperation.RENEW : CertificateIssuanceOperation.ORDER,+ originalCertificateId: parsed.godaddy.originalCertificateId,errorMessage: `GoDaddy certificate ${orderStatus}`});logger.info(`GoDaddy certificate terminal state [certificateRequestId=${request.id}] [status=${orderStatus}]`);diff --git a/backend/src/services/certificate-common/certificate-issuance-audit-fns.test.ts b/backend/src/services/certificate-common/certificate-issuance-audit-fns.test.tsnew file mode 100644index 0000000000..cb37438801--- /dev/null+++ b/backend/src/services/certificate-common/certificate-issuance-audit-fns.test.ts@@ -0,0 +1,126 @@+import { ForbiddenError } from "@casl/ability";+import { describe, expect, it, vi } from "vitest";++import { EventType } from "@app/ee/services/audit-log/audit-log-types";+import { BadRequestError, ForbiddenRequestError } from "@app/lib/errors";+import { ActorType } from "@app/services/auth/auth-type";++import { CertificateIssuanceOperation } from "./certificate-constants";+import { recordCertificateIssuanceFailure, tagErrorWithCertificateRequest } from "./certificate-issuance-audit-fns";++vi.mock("@app/lib/logger", () => ({+ logger: { info: vi.fn(), error: vi.fn(), warn: vi.fn(), debug: vi.fn() }+}));++describe("recordCertificateIssuanceFailure", () => {+ const auditLogInfo = {+ actor: { type: ActorType.USER as const, metadata: { userId: "user-1", email: "[email protected]", username: "[email protected]" } }+ };++ const setup = () => {+ const deps = {+ auditLogService: { createCollapsedAuditLog: vi.fn() },+ certificateAuthorityDAL: { findById: vi.fn().mockResolvedValue({ id: "ca-1", name: "internal-ca" }) },+ pkiApplicationDAL: { findById: vi.fn().mockResolvedValue({ id: "app-1", name: "checkout-api" }) }+ };+ const record = (error: unknown, metadata: Record<string, unknown> = {}) =>+ recordCertificateIssuanceFailure(deps as never, {+ auditLogInfo,+ projectId: "project-1",+ error,+ metadata: { operation: CertificateIssuanceOperation.ISSUE, ...metadata }+ });+ return { deps, record };+ };++ it("resolves CA and application names and builds a collapse key from the failure", async () => {+ const { deps, record } = setup();++ await record(new BadRequestError({ message: "TTL too long" }), {+ caId: "ca-1",+ applicationId: "app-1",+ commonName: "a.example.com"+ });++ expect(deps.auditLogService.createCollapsedAuditLog).toHaveBeenCalledWith({+ ...auditLogInfo,+ projectId: "project-1",+ event: {+ type: EventType.CERTIFICATE_ISSUANCE_FAILED,+ metadata: {+ operation: CertificateIssuanceOperation.ISSUE,+ caId: "ca-1",+ caName: "internal-ca",+ applicationId: "app-1",+ applicationName: "checkout-api",+ commonName: "a.example.com",+ errorName: "BadRequest",+ error: "TTL too long"+ }+ },+ collapseKeyParts: [+ "project-1",+ ActorType.USER,+ "user-1",+ CertificateIssuanceOperation.ISSUE,+ null,+ "app-1",+ "a.example.com",+ null,+ null,+ "BadRequest",+ "TTL too long"+ ]+ });+ });++ it("does not look up names it was already given", async () => {+ const { deps, record } = setup();++ await record(new Error("x"), { caId: "ca-1", caName: "given" });++ expect(deps.certificateAuthorityDAL.findById).not.toHaveBeenCalled();+ });++ it("links the event to the certificate request tagged on the error", async () => {+ const { deps, record } = setup();+ const error = new Error("signing failed");+ tagErrorWithCertificateRequest(error, "cert-req-1");++ await record(error);++ const [call] = deps.auditLogService.createCollapsedAuditLog.mock.calls[0] as [+ { event: { metadata: { certificateRequestId?: string } } }+ ];+ expect(call.event.metadata.certificateRequestId).toBe("cert-req-1");+ });++ it("truncates long error messages", async () => {+ const { deps, record } = setup();++ await record(new Error("e".repeat(5000)));++ const [call] = deps.auditLogService.createCollapsedAuditLog.mock.calls[0] as [+ { event: { metadata: { error: string } } }+ ];+ expect(call.event.metadata.error).toHaveLength(1000);+ });++ it.each([new ForbiddenError(undefined as never), new ForbiddenRequestError({ message: "denied" })])(+ "skips permission denials",+ async (error) => {+ const { deps, record } = setup();++ await record(error);++ expect(deps.auditLogService.createCollapsedAuditLog).not.toHaveBeenCalled();+ }+ );++ it("never throws when recording fails", async () => {+ const { deps, record } = setup();+ deps.auditLogService.createCollapsedAuditLog.mockRejectedValueOnce(new Error("redis down"));++ await expect(record(new Error("x"))).resolves.toBeUndefined();+ });+});diff --git a/backend/src/services/certificate-common/certificate-issuance-audit-fns.ts b/backend/src/services/certificate-common/certificate-issuance-audit-fns.tsindex a603b13325..ab34cabe96 100644--- a/backend/src/services/certificate-common/certificate-issuance-audit-fns.ts+++ b/backend/src/services/certificate-common/certificate-issuance-audit-fns.ts@@ -10,6 +10,8 @@ import {} from "@app/ee/services/audit-log/audit-log-types";import { ForbiddenRequestError } from "@app/lib/errors";import { logger } from "@app/lib/logger";+import { TCertificateAuthorityDALFactory } from "@app/services/certificate-authority/certificate-authority-dal";+import { TPkiApplicationDALFactory } from "@app/services/pki-application/pki-application-dal";const MAX_ERROR_MESSAGE_LENGTH = 1000;@@ -18,6 +20,12 @@ type TCertificateIssuanceFailedMetadata = Omit<"errorName" | "error" | keyof TAuditLogCollapseSummary>;+export type TRecordCertificateIssuanceFailureDeps = {+ auditLogService: Pick<TAuditLogServiceFactory, "createCollapsedAuditLog">;+ certificateAuthorityDAL?: Pick<TCertificateAuthorityDALFactory, "findById">;+ pkiApplicationDAL?: Pick<TPkiApplicationDALFactory, "findById">;+};+export type TRecordCertificateIssuanceFailureDTO = {auditLogInfo: AuditLogInfo;projectId: string;@@ -25,9 +33,20 @@ export type TRecordCertificateIssuanceFailureDTO = {metadata: TCertificateIssuanceFailedMetadata;};+// Lets the code that created a certificate request attach its id to the error it rethrows, so the+// recorder further up can link the event to that request.+const certificateRequestIdByError = new WeakMap<object, string>();++export const tagErrorWithCertificateRequest = (error: unknown, certificateRequestId: string) => {+ if (error && typeof error === "object") certificateRequestIdByError.set(error, certificateRequestId);+};++const getTaggedCertificateRequestId = (error: unknown) =>+ error && typeof error === "object" ? certificateRequestIdByError.get(error) : undefined;+// Never throws, so callers can rethrow the original error untouched.export const recordCertificateIssuanceFailure = async (- auditLogService: Pick<TAuditLogServiceFactory, "createCollapsedAuditLog">,+ { auditLogService, certificateAuthorityDAL, pkiApplicationDAL }: TRecordCertificateIssuanceFailureDeps,{ auditLogInfo, projectId, error, metadata }: TRecordCertificateIssuanceFailureDTO) => {// An access refusal is not an issuance failure; CASL denials get their own permission-denied event.@@ -40,12 +59,27 @@ export const recordCertificateIssuanceFailure = async (const actorId = actorIdKey ? (auditLogInfo.actor.metadata as Record<string, unknown>)[actorIdKey] : undefined;try {+ const certificateRequestId = metadata.certificateRequestId ?? getTaggedCertificateRequestId(error);+ const [ca, application] = await Promise.all([+ metadata.caId && !metadata.caName ? certificateAuthorityDAL?.findById(metadata.caId) : undefined,+ metadata.applicationId && !metadata.applicationName+ ? pkiApplicationDAL?.findById(metadata.applicationId)+ : undefined+ ]);+await auditLogService.createCollapsedAuditLog({...auditLogInfo,projectId,event: {type: EventType.CERTIFICATE_ISSUANCE_FAILED,- metadata: { ...metadata, errorName, error: errorMessage }+ metadata: {+ ...metadata,+ ...(certificateRequestId && { certificateRequestId }),+ ...(ca?.name && { caName: ca.name }),+ ...(application?.name && { applicationName: application.name }),+ errorName,+ error: errorMessage+ }},collapseKeyParts: [projectId,@@ -53,7 +87,10 @@ export const recordCertificateIssuanceFailure = async (actorId ?? null,metadata.operation,metadata.certificateProfileId ?? null,- metadata.certificateRequestId ?? null,+ metadata.applicationId ?? null,+ metadata.commonName ?? null,+ metadata.originalCertificateId ?? null,+ certificateRequestId ?? null,errorName,errorMessage]diff --git a/backend/src/services/certificate-est-v3/certificate-est-v3-service.ts b/backend/src/services/certificate-est-v3/certificate-est-v3-service.tsindex 9de11b8fea..b2788d9e00 100644--- a/backend/src/services/certificate-est-v3/certificate-est-v3-service.ts+++ b/backend/src/services/certificate-est-v3/certificate-est-v3-service.ts@@ -14,6 +14,7 @@ import {getCaCertChain,getCaCertChains} from "@app/services/certificate-authority/certificate-authority-fns";+import { CertificateIssuanceOperation } from "@app/services/certificate-common/certificate-constants";import { TCertificateProfileDALFactory } from "@app/services/certificate-profile/certificate-profile-dal";import { EnrollmentType } from "@app/services/certificate-profile/certificate-profile-types";import { CertificateRequestStatus } from "@app/services/certificate-request/certificate-request-types";@@ -347,6 +348,7 @@ export const certificateEstV3ServiceFactory = ({validity: { ttl },enrollmentType: EnrollmentType.EST,applicationId,+ issuanceOperation: CertificateIssuanceOperation.RENEW,auditLogInfo: auditLogInfo && {...auditLogInfo,actor: { type: ActorType.EST_ACCOUNT, metadata: { profileId } }diff --git a/backend/src/services/certificate-request/certificate-request-fns.ts b/backend/src/services/certificate-request/certificate-request-fns.tsindex f2ff63565c..f2d91ee5a8 100644--- a/backend/src/services/certificate-request/certificate-request-fns.ts+++ b/backend/src/services/certificate-request/certificate-request-fns.ts@@ -1,9 +1,21 @@import { Knex } from "knex";+import { TCertificateRequests } from "@app/db/schemas";import { InternalServerError } from "@app/lib/errors";import { logger } from "@app/lib/logger";+import { ActorType } from "../auth/auth-type";+import { TCertificateAuthorityDALFactory } from "../certificate-authority/certificate-authority-dal";+import { CaType } from "../certificate-authority/certificate-authority-enums";+import { caUsesExternalIssuanceQueue } from "../certificate-authority/certificate-authority-maps";import { CertificateIssuanceOperation } from "../certificate-common/certificate-constants";+import { extractCertificateRequestFromCSR } from "../certificate-common/certificate-csr-utils";+import {+ recordCertificateIssuanceFailure,+ TRecordCertificateIssuanceFailureDeps+} from "../certificate-common/certificate-issuance-audit-fns";+import { TCertificateProfileDALFactory } from "../certificate-profile/certificate-profile-dal";+import { EnrollmentType } from "../certificate-profile/certificate-profile-types";import { TCertificateRequestDALFactory } from "./certificate-request-dal";import { CertificateRequestStatus } from "./certificate-request-types";@@ -60,3 +72,81 @@ export const markPendingRequestFailed = async ();}};++export type TRecordCertificateRequestFailureDeps = Omit<+ TRecordCertificateIssuanceFailureDeps,+ "certificateAuthorityDAL"+> & {+ certificateAuthorityDAL: Pick<TCertificateAuthorityDALFactory, "findById" | "findByIdWithAssociatedCa">;+ certificateProfileDAL: Pick<TCertificateProfileDALFactory, "findById">;+};++const $resolveRequestOperation = async (+ certificateAuthorityDAL: TRecordCertificateRequestFailureDeps["certificateAuthorityDAL"],+ certificateRequest: TCertificateRequests+) => {+ const ca = certificateRequest.caId+ ? await certificateAuthorityDAL.findByIdWithAssociatedCa(certificateRequest.caId).catch(() => undefined)+ : undefined;+ if (ca?.externalCa?.type && caUsesExternalIssuanceQueue(ca.externalCa.type as CaType)) {+ return CertificateIssuanceOperation.ORDER;+ }+ return certificateRequest.csr ? CertificateIssuanceOperation.SIGN : CertificateIssuanceOperation.ISSUE;+};++// Records a certificate-issuance-failed event for a request that failed outside the request that+// created it (a background job or an approval), so the actor is the platform. Never throws.+export const recordCertificateRequestFailure = async (+ deps: TRecordCertificateRequestFailureDeps,+ {+ certificateRequest,+ operation,+ originalCertificateId,+ error+ }: {+ certificateRequest: TCertificateRequests;+ operation?: CertificateIssuanceOperation;+ originalCertificateId?: string;+ error?: unknown;+ }+) => {+ try {+ const [profile, resolvedOperation] = await Promise.all([+ certificateRequest.profileId ? deps.certificateProfileDAL.findById(certificateRequest.profileId) : undefined,+ operation ?? $resolveRequestOperation(deps.certificateAuthorityDAL, certificateRequest)+ ]);++ let commonName = certificateRequest.commonName || undefined;+ if (!commonName && certificateRequest.csr) {+ try {+ commonName = extractCertificateRequestFromCSR(certificateRequest.csr).commonName || undefined;+ } catch {+ commonName = undefined;+ }+ }++ await recordCertificateIssuanceFailure(deps, {+ auditLogInfo: { actor: { type: ActorType.PLATFORM, metadata: {} } },+ projectId: certificateRequest.projectId,+ error: error ?? new Error(certificateRequest.errorMessage || "Certificate issuance failed"),+ metadata: {+ operation: resolvedOperation,+ ...(certificateRequest.enrollmentType && {+ enrollmentType: certificateRequest.enrollmentType as EnrollmentType+ }),+ certificateRequestId: certificateRequest.id,+ ...(certificateRequest.profileId && { certificateProfileId: certificateRequest.profileId }),+ ...(profile && { profileName: profile.slug }),+ ...(certificateRequest.caId && { caId: certificateRequest.caId }),+ ...(commonName && { commonName }),+ ...(originalCertificateId && { originalCertificateId }),+ ...(certificateRequest.applicationId && { applicationId: certificateRequest.applicationId })+ }+ });+ } catch (auditError) {+ logger.warn(+ auditError,+ `Failed to record certificate issuance failure [certificateRequestId=${certificateRequest.id}]`+ );+ }+};diff --git a/backend/src/services/certificate-request/certificate-request-service.test.ts b/backend/src/services/certificate-request/certificate-request-service.test.tsindex a1846050f0..2cc72175db 100644--- a/backend/src/services/certificate-request/certificate-request-service.test.ts+++ b/backend/src/services/certificate-request/certificate-request-service.test.ts@@ -19,7 +19,9 @@ import { NotFoundError } from "@app/lib/errors";import { ActorType, AuthMethod } from "@app/services/auth/auth-type";import { TCertificateDALFactory } from "@app/services/certificate/certificate-dal";import { TCertificateServiceFactory } from "@app/services/certificate/certificate-service";+import { CaType } from "@app/services/certificate-authority/certificate-authority-enums";import { CertificateIssuanceOperation } from "@app/services/certificate-common/certificate-constants";+import { EnrollmentType } from "@app/services/certificate-profile/certificate-profile-types";import { TCertificateRequestDALFactory } from "./certificate-request-dal";import { certificateRequestServiceFactory, TCertificateRequestServiceFactory } from "./certificate-request-service";@@ -64,6 +66,7 @@ describe("CertificateRequestService", () => {const mockUserDAL = { findById: vi.fn() };const mockIdentityDAL = { findById: vi.fn() };const mockCertificateProfileDAL = { findById: vi.fn() };+ const mockCertificateAuthorityDAL = { findById: vi.fn(), findByIdWithAssociatedCa: vi.fn() };const mockAuditLogService = { createCollapsedAuditLog: vi.fn() };beforeEach(() => {@@ -80,6 +83,7 @@ describe("CertificateRequestService", () => {userDAL: mockUserDAL as any,identityDAL: mockIdentityDAL as any,certificateProfileDAL: mockCertificateProfileDAL as any,+ certificateAuthorityDAL: mockCertificateAuthorityDAL as any,auditLogService: mockAuditLogService});});@@ -652,13 +656,14 @@ describe("CertificateRequestService", () => {})).rejects.toThrow(NotFoundError);});+it("records a certificate-issuance-failed event when the request moves to failed", async () => {const failedRequest = {id: "550e8400-e29b-41d4-a716-446655440014",projectId: "project-1",status: CertificateRequestStatus.FAILED,errorMessage: "Certificate issuance failed: DigiCert rejected the order",- enrollmentType: "api",+ enrollmentType: EnrollmentType.API,profileId: "profile-1",caId: "ca-1",commonName: "app.example.com"@@ -666,12 +671,14 @@ describe("CertificateRequestService", () => {(mockCertificateRequestDAL.findById as any).mockResolvedValue({ ...failedRequest, status: "pending" });(mockCertificateRequestDAL.transitionFromPending as any).mockResolvedValue(failedRequest);mockCertificateProfileDAL.findById.mockResolvedValue({ id: "profile-1", slug: "public-web" });+ mockCertificateAuthorityDAL.findById.mockResolvedValue({ id: "ca-1", name: "digicert-ca" });await service.updateCertificateRequestStatus({certificateRequestId: failedRequest.id,status: CertificateRequestStatus.FAILED,errorMessage: failedRequest.errorMessage,- operation: CertificateIssuanceOperation.RENEW+ operation: CertificateIssuanceOperation.RENEW,+ originalCertificateId: "cert-0"});expect(mockAuditLogService.createCollapsedAuditLog).toHaveBeenCalledWith(@@ -682,12 +689,14 @@ describe("CertificateRequestService", () => {type: EventType.CERTIFICATE_ISSUANCE_FAILED,metadata: {operation: CertificateIssuanceOperation.RENEW,- enrollmentType: "api",+ enrollmentType: EnrollmentType.API,certificateRequestId: failedRequest.id,certificateProfileId: "profile-1",profileName: "public-web",caId: "ca-1",+ caName: "digicert-ca",commonName: "app.example.com",+ originalCertificateId: "cert-0",errorName: "Error",error: "Certificate issuance failed: DigiCert rejected the order"}@@ -711,6 +720,44 @@ describe("CertificateRequestService", () => {expect(mockAuditLogService.createCollapsedAuditLog).not.toHaveBeenCalled();});++ it.each([+ { caType: CaType.DIGICERT, csr: null, expected: CertificateIssuanceOperation.ORDER },+ { caType: undefined, csr: "csr-pem", expected: CertificateIssuanceOperation.SIGN },+ { caType: undefined, csr: null, expected: CertificateIssuanceOperation.ISSUE }+ ])("derives $expected from the request when no operation is given", async ({ caType, csr, expected }) => {+ const failedRequest = {+ id: "550e8400-e29b-41d4-a716-446655440016",+ projectId: "project-1",+ status: CertificateRequestStatus.FAILED,+ errorMessage: "boom",+ caId: "ca-1",+ commonName: "app.example.com",+ csr+ };+ (mockCertificateRequestDAL.findById as any).mockResolvedValue({ ...failedRequest, status: "pending" });+ (mockCertificateRequestDAL.transitionFromPending as any).mockResolvedValue(failedRequest);+ mockCertificateAuthorityDAL.findByIdWithAssociatedCa.mockResolvedValue({+ id: "ca-1",+ externalCa: caType ? { type: caType } : undefined+ });+ mockCertificateAuthorityDAL.findById.mockResolvedValue({ id: "ca-1", name: "ca" });++ await service.updateCertificateRequestStatus({+ certificateRequestId: failedRequest.id,+ status: CertificateRequestStatus.FAILED,+ errorMessage: "boom",+ error: new TypeError("socket hang up")+ });++ expect(mockAuditLogService.createCollapsedAuditLog).toHaveBeenCalledWith(+ expect.objectContaining({+ event: expect.objectContaining({+ metadata: expect.objectContaining({ operation: expected, errorName: "TypeError", error: "socket hang up" })+ })+ })+ );+ });});describe("attachCertificateToRequest", () => {diff --git a/backend/src/services/certificate-request/certificate-request-service.ts b/backend/src/services/certificate-request/certificate-request-service.tsindex 5bdad0d7ff..2d6ee1fad2 100644--- a/backend/src/services/certificate-request/certificate-request-service.ts+++ b/backend/src/services/certificate-request/certificate-request-service.ts@@ -20,6 +20,7 @@ import { logger } from "@app/lib/logger";import { QueueName, TQueueServiceFactory } from "@app/queue";import { TCertificateDALFactory } from "@app/services/certificate/certificate-dal";import { TCertificateServiceFactory } from "@app/services/certificate/certificate-service";+import { TCertificateAuthorityDALFactory } from "@app/services/certificate-authority/certificate-authority-dal";import {CertificateIssuanceOperation,domainComponentsSchema,@@ -29,9 +30,7 @@ import {describeCustomExtensionValue,TResolvedCustomExtension} from "@app/services/certificate-common/certificate-extension-fns";-import { recordCertificateIssuanceFailure } from "@app/services/certificate-common/certificate-issuance-audit-fns";import { TCertificateProfileDALFactory } from "@app/services/certificate-profile/certificate-profile-dal";-import { EnrollmentType } from "@app/services/certificate-profile/certificate-profile-types";import { TPkiApplicationDALFactory } from "@app/services/pki-application/pki-application-dal";import { ActorAuthMethod, ActorType } from "../auth/auth-type";@@ -39,6 +38,7 @@ import { TIdentityDALFactory } from "../identity/identity-dal";import { TResourceMetadataDALFactory } from "../resource-metadata/resource-metadata-dal";import { TUserDALFactory } from "../user/user-dal";import { TCertificateRequestDALFactory } from "./certificate-request-dal";+import { recordCertificateRequestFailure } from "./certificate-request-fns";import {CertificateRequestStatus,TAttachCertificateToRequestDTO,@@ -60,6 +60,7 @@ type TCertificateRequestServiceFactoryDep = {userDAL: Pick<TUserDALFactory, "findById">;identityDAL: Pick<TIdentityDALFactory, "findById">;certificateProfileDAL: Pick<TCertificateProfileDALFactory, "findById">;+ certificateAuthorityDAL: Pick<TCertificateAuthorityDALFactory, "findById" | "findByIdWithAssociatedCa">;auditLogService: Pick<TAuditLogServiceFactory, "createCollapsedAuditLog">;};@@ -160,6 +161,7 @@ export const certificateRequestServiceFactory = ({userDAL,identityDAL,certificateProfileDAL,+ certificateAuthorityDAL,auditLogService}: TCertificateRequestServiceFactoryDep) => {const $resolveApplicationName = async (applicationId?: string | null) => {@@ -472,48 +474,22 @@ export const certificateRequestServiceFactory = ({};};- const recordIssuanceFailure = async (+ const recordIssuanceFailure = (certificateRequest: TCertificateRequests,- operation: CertificateIssuanceOperation,- error?: unknown- ) => {- try {- const profile = certificateRequest.profileId- ? await certificateProfileDAL.findById(certificateRequest.profileId)- : undefined;- const applicationName = await $resolveApplicationName(certificateRequest.applicationId);-- await recordCertificateIssuanceFailure(auditLogService, {- auditLogInfo: { actor: { type: ActorType.PLATFORM, metadata: {} } },- projectId: certificateRequest.projectId,- error: error ?? new Error(certificateRequest.errorMessage || "Certificate issuance failed"),- metadata: {- operation,- ...(certificateRequest.enrollmentType && {- enrollmentType: certificateRequest.enrollmentType as EnrollmentType- }),- certificateRequestId: certificateRequest.id,- ...(certificateRequest.profileId && { certificateProfileId: certificateRequest.profileId }),- ...(profile && { profileName: profile.slug }),- ...(certificateRequest.caId && { caId: certificateRequest.caId }),- ...(certificateRequest.commonName && { commonName: certificateRequest.commonName }),- ...(certificateRequest.applicationId && { applicationId: certificateRequest.applicationId }),- ...(applicationName && { applicationName })- }- });- } catch (auditError) {- logger.warn(- auditError,- `Failed to record certificate issuance failure [certificateRequestId=${certificateRequest.id}]`- );- }- };+ options: { operation?: CertificateIssuanceOperation; originalCertificateId?: string; error?: unknown } = {}+ ) =>+ recordCertificateRequestFailure(+ { auditLogService, certificateAuthorityDAL, certificateProfileDAL, pkiApplicationDAL },+ { certificateRequest, ...options }+ );const updateCertificateRequestStatus = async ({certificateRequestId,status,errorMessage,- operation = CertificateIssuanceOperation.ORDER+ operation,+ originalCertificateId,+ error}: TUpdateCertificateRequestStatusDTO) => {const certificateRequest = await certificateRequestDAL.findById(certificateRequestId);if (!certificateRequest) {@@ -523,7 +499,7 @@ export const certificateRequestServiceFactory = ({const updated = await certificateRequestDAL.transitionFromPending(certificateRequestId, status, errorMessage);// A null result means the request already left pending, so its failure was recorded then.if (updated && status === CertificateRequestStatus.FAILED) {- await recordIssuanceFailure(updated, operation);+ await recordIssuanceFailure(updated, { operation, originalCertificateId, error });}return updated;};diff --git a/backend/src/services/certificate-request/certificate-request-types.ts b/backend/src/services/certificate-request/certificate-request-types.tsindex 0646580f97..38f0135276 100644--- a/backend/src/services/certificate-request/certificate-request-types.ts+++ b/backend/src/services/certificate-request/certificate-request-types.ts@@ -57,6 +57,8 @@ export type TUpdateCertificateRequestStatusDTO = {status: CertificateRequestStatus;errorMessage?: string;operation?: CertificateIssuanceOperation;+ originalCertificateId?: string;+ error?: unknown;};export type TAttachCertificateToRequestDTO = {diff --git a/backend/src/services/certificate-v3/certificate-v3-service.test.ts b/backend/src/services/certificate-v3/certificate-v3-service.test.tsindex 05f83adb89..4622f4393a 100644--- a/backend/src/services/certificate-v3/certificate-v3-service.test.ts+++ b/backend/src/services/certificate-v3/certificate-v3-service.test.ts@@ -3604,7 +3604,6 @@ describe("CertificateV3Service", () => {operation: CertificateIssuanceOperation.ISSUE,enrollmentType: EnrollmentType.API,commonName: "fail.example.com",- applicationId: undefined,certificateProfileId: "profile-123",profileName: "web-servers",caId: "ca-123",@@ -3652,6 +3651,63 @@ describe("CertificateV3Service", () => {await expect(service.issueCertificateFromProfile({ ...issueDto, auditLogInfo })).rejects.toBe(failure);});+ it("records a sign failure under the operation the caller passed", async () => {+ vi.mocked(mockCertificateProfileDAL.findByIdWithConfigs).mockRejectedValue(new BadRequestError({ message: "x" }));++ await expect(+ service.signCertificateFromProfile({+ profileId: "profile-123",+ csr: "not a csr",+ validity: { ttl: "30d" },+ enrollmentType: EnrollmentType.EST,+ issuanceOperation: CertificateIssuanceOperation.RENEW,+ actor: ActorType.USER,+ actorId: "user-123",+ actorAuthMethod: AuthMethod.EMAIL,+ actorOrgId: "org-123",+ auditLogInfo+ } as never)+ ).rejects.toThrow("x");++ expect(mockAuditLogService.createCollapsedAuditLog).toHaveBeenCalledWith(+ expect.objectContaining({+ event: expect.objectContaining({+ metadata: expect.objectContaining({+ operation: CertificateIssuanceOperation.RENEW,+ enrollmentType: EnrollmentType.EST+ })+ })+ })+ );+ });++ it("records an order failure with the order's common name", async () => {+ vi.mocked(mockCertificateProfileDAL.findByIdWithConfigs).mockRejectedValue(new BadRequestError({ message: "x" }));++ await expect(+ service.orderCertificate({+ profileId: "profile-123",+ certificateOrder: { commonName: "order.example.com", altNames: [], validity: { ttl: "30d" } },+ actor: ActorType.USER,+ actorId: "user-123",+ actorAuthMethod: AuthMethod.EMAIL,+ actorOrgId: "org-123",+ auditLogInfo+ } as never)+ ).rejects.toThrow("x");++ expect(mockAuditLogService.createCollapsedAuditLog).toHaveBeenCalledWith(+ expect.objectContaining({+ event: expect.objectContaining({+ metadata: expect.objectContaining({+ operation: CertificateIssuanceOperation.ORDER,+ commonName: "order.example.com"+ })+ })+ })+ );+ });+it("records a failed renewal against the original certificate", async () => {vi.mocked(mockCertificateDAL.findById).mockResolvedValue({id: "cert-123",diff --git a/backend/src/services/certificate-v3/certificate-v3-service.ts b/backend/src/services/certificate-v3/certificate-v3-service.tsindex 1432966459..351eb8cf99 100644--- a/backend/src/services/certificate-v3/certificate-v3-service.ts+++ b/backend/src/services/certificate-v3/certificate-v3-service.ts@@ -50,7 +50,10 @@ import {} from "@app/services/certificate-authority/certificate-authority-maps";import { validateGoDaddyIssuanceInputs } from "@app/services/certificate-authority/godaddy/godaddy-certificate-authority-validators";import { TInternalCertificateAuthorityServiceFactory } from "@app/services/certificate-authority/internal/internal-certificate-authority-service";-import { recordCertificateIssuanceFailure } from "@app/services/certificate-common/certificate-issuance-audit-fns";+import {+ recordCertificateIssuanceFailure,+ tagErrorWithCertificateRequest+} from "@app/services/certificate-common/certificate-issuance-audit-fns";import { recordNewCertificateQuotaKey } from "@app/services/certificate-common/certificate-quota-fns";import { TCertificatePolicyServiceFactory } from "@app/services/certificate-policy/certificate-policy-service";import { TCertificateProfileDALFactory } from "@app/services/certificate-profile/certificate-profile-dal";@@ -570,7 +573,7 @@ export const certificateV3ServiceFactory = ({error: unknown;metadata: Omit<Parameters<typeof recordCertificateIssuanceFailure>[1]["metadata"],- "certificateProfileId" | "profileName" | "applicationName"+ "certificateProfileId" | "profileName" | "applicationName" | "caName">;}) => {if (!auditLogInfo) return;@@ -583,18 +586,19 @@ export const certificateV3ServiceFactory = ({const project = await projectDAL.findById(resolvedProjectId);if (project?.orgId !== actorOrgId) return;- const applicationName = await $resolveApplicationName(metadata.applicationId);- await recordCertificateIssuanceFailure(auditLogService, {- auditLogInfo,- projectId: resolvedProjectId,- error,- metadata: {- ...metadata,- ...(profile && { certificateProfileId: profile.id, profileName: profile.slug }),- ...(!metadata.caId && profile?.caId && { caId: profile.caId }),- ...(applicationName && { applicationName })+ await recordCertificateIssuanceFailure(+ { auditLogService, certificateAuthorityDAL, pkiApplicationDAL },+ {+ auditLogInfo,+ projectId: resolvedProjectId,+ error,+ metadata: {+ ...metadata,+ ...(profile && { certificateProfileId: profile.id, profileName: profile.slug }),+ ...(!metadata.caId && profile?.caId && { caId: profile.caId })+ }}- });+ );} catch (lookupError) {logger.warn(lookupError, `Failed to record certificate issuance failure [operation=${metadata.operation}]`);}@@ -1782,6 +1786,7 @@ export const certificateV3ServiceFactory = ({error: err,fallbackMessage: "Certificate issuance failed"});+ tagErrorWithCertificateRequest(err, pendingRequest.id);throw err;}@@ -2386,8 +2391,8 @@ export const certificateV3ServiceFactory = ({metadata: {operation: CertificateIssuanceOperation.ISSUE,enrollmentType: EnrollmentType.API,- commonName: dto.certificateRequest.commonName,- applicationId: dto.applicationId+ ...(dto.certificateRequest.commonName && { commonName: dto.certificateRequest.commonName }),+ ...(dto.applicationId && { applicationId: dto.applicationId })}});throw error;@@ -2398,16 +2403,17 @@ export const certificateV3ServiceFactory = ({try {return await $signCertificateFromProfile(dto);} catch (error) {+ const commonName = $commonNameFromCsr(dto.csr);await $recordIssuanceFailure({auditLogInfo: dto.auditLogInfo,actorOrgId: dto.actorOrgId,profileId: dto.profileId,error,metadata: {- operation: CertificateIssuanceOperation.SIGN,+ operation: dto.issuanceOperation ?? CertificateIssuanceOperation.SIGN,enrollmentType: dto.enrollmentType,- commonName: $commonNameFromCsr(dto.csr),- applicationId: dto.applicationId+ ...(commonName && { commonName }),+ ...(dto.applicationId && { applicationId: dto.applicationId })}});throw error;@@ -2418,6 +2424,7 @@ export const certificateV3ServiceFactory = ({try {return await $orderCertificate(dto);} catch (error) {+ const commonName = dto.certificateOrder.commonName || $commonNameFromCsr(dto.certificateOrder.csr);await $recordIssuanceFailure({auditLogInfo: dto.auditLogInfo,actorOrgId: dto.actorOrgId,@@ -2426,8 +2433,8 @@ export const certificateV3ServiceFactory = ({metadata: {operation: CertificateIssuanceOperation.ORDER,enrollmentType: EnrollmentType.API,- commonName: dto.certificateOrder.commonName || $commonNameFromCsr(dto.certificateOrder.csr),- applicationId: dto.applicationId+ ...(commonName && { commonName }),+ ...(dto.applicationId && { applicationId: dto.applicationId })}});throw error;diff --git a/backend/src/services/certificate-v3/certificate-v3-types.ts b/backend/src/services/certificate-v3/certificate-v3-types.tsindex b647cb243d..1bdbfedf15 100644--- a/backend/src/services/certificate-v3/certificate-v3-types.ts+++ b/backend/src/services/certificate-v3/certificate-v3-types.ts@@ -3,6 +3,7 @@ import { TProjectPermission } from "@app/lib/types";import {CertExtendedKeyUsageType,+ CertificateIssuanceOperation,CertificateRequestStatus,CertKeyAlgorithm,CertKeyUsageType,@@ -65,6 +66,7 @@ export type TSignCertificateFromProfileDTO = {applicationId?: string;acmeOrderId?: string;auditLogInfo?: AuditLogInfo;+ issuanceOperation?: CertificateIssuanceOperation;} & Omit<TProjectPermission, "projectId">;export type TOrderCertificateFromProfileDTO = {diff --git a/docs/documentation/platform/audit-logs.mdx b/docs/documentation/platform/audit-logs.mdxindex 53d66adcb5..78ec47887b 100644--- a/docs/documentation/platform/audit-logs.mdx+++ b/docs/documentation/platform/audit-logs.mdx@@ -305,23 +305,25 @@ To keep a misconfigured client from filling the log, Infisical records the first### Certificate issuance failures-If Infisical can't issue a certificate, it records a `certificate-issuance-failed` event with the reason. Infisical records the event for certificates requested through the API or the Infisical UI, ACME, EST, and SCEP, including renewals and certificates issued after an approval. The event is in the `management` class, so it's always recorded.+If Infisical can't issue a certificate, it records a `certificate-issuance-failed` event with the reason. Infisical records the event for certificates requested from a certificate profile through the API or the Infisical UI, ACME, EST, and SCEP, including manual renewals and certificates issued after an approval. The event is in the `management` class, so it's always recorded.++Infisical doesn't record the event for automatic renewals, for EST enrollment through a certificate template, or for EST requests rejected before Infisical reads the CSR, such as a failed sign-in.The event records which certificate failed and why:- `operation`: what was requested (`issue`, `sign`, `order`, or `renew`)- `enrollmentType`: how the certificate was requested (`api`, `acme`, `est`, or `scep`)- `error` and `errorName`: why issuance failed, such as a TTL longer than the certificate policy allows or an error from the CA-- `certificateProfileId`, `profileName`, `caId`, `commonName`, `applicationId`, and `applicationName`: the certificate the request was for, where Infisical knows them+- `certificateProfileId`, `profileName`, `caId`, `caName`, `commonName`, `applicationId`, and `applicationName`: the certificate the request was for, where Infisical knows them- `certificateRequestId`: the certificate request that failed, if Infisical had already created one- `originalCertificateId`: on a failed renewal, the certificate being renewed- `suppressedRepeats`, `suppressedFrom`, and `suppressedUntil`: on a summary event, how many identical failures Infisical counted instead of recording, and the minute they fell in-If issuance fails after the request has already returned, the event's actor is `platform`. This happens when an external CA such as DigiCert rejects an order, or when issuance fails after an approver approves the request. To find who requested the certificate, look for the request's original event, such as `order-certificate-from-profile`, with the same `certificateRequestId`.+If issuance fails in a background job, or after an approver approves the request, the event's actor is `platform`. A background job issues the certificate when the CA is external, such as DigiCert or AWS Private CA. To find who requested a certificate through the API or the Infisical UI, look for the request's original event, such as `order-certificate-from-profile`, with the same `certificateRequestId`.If a request is denied because the actor's role doesn't allow it, Infisical records a [`permission-denied` event](#permission-denials) instead.-Infisical counts identical failures the same way it counts [repeated denials](#permission-denials): it records the first failure per actor, profile, and reason in each minute, then writes one summary event when the minute ends.+Infisical counts identical failures the same way it counts [repeated denials](#permission-denials). In each minute, it records the first failure with a given actor, operation, certificate, and error, then writes one summary event when the minute ends.## Filtering audit logs