Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

feat(pki): certificate audit log details

bernie-g0bb290b7f5aa
diff --git a/backend/src/ee/services/audit-log/audit-log-types.ts b/backend/src/ee/services/audit-log/audit-log-types.ts
index 2465c7d2de..32e3888dd2 100644
--- a/backend/src/ee/services/audit-log/audit-log-types.ts
+++ b/backend/src/ee/services/audit-log/audit-log-types.ts
@@ -32,9 +32,16 @@ import { AsymmetricKeyAlgorithm, SigningAlgorithm } from "@app/lib/crypto/sign/t
import { TOrgPermission, TProjectPermission } from "@app/lib/types";
import { AppConnection } from "@app/services/app-connection/app-connection-enums";
import { TCreateAppConnectionDTO, TUpdateAppConnectionDTO } from "@app/services/app-connection/app-connection-types";
+import { TApprovalRequestSubjectMetadata } from "@app/services/approval-policy/approval-policy-types";
import { ActorType } from "@app/services/auth/auth-type";
-import { CertExtendedKeyUsage, CertKeyAlgorithm, CertKeyUsage } from "@app/services/certificate/certificate-types";
+import {
+ CertExtendedKeyUsage,
+ CertKeyAlgorithm,
+ CertKeyUsage,
+ CrlReason
+} from "@app/services/certificate/certificate-types";
import { CaStatus } from "@app/services/certificate-authority/certificate-authority-enums";
+import { CertificateRequestStatus } from "@app/services/certificate-request/certificate-request-types";
import { CertificateRenewalKeySource, TRenewalAuditChange } from "@app/services/certificate-v3/certificate-v3-types";
import type { ExternalMigrationImportStatus } from "@app/services/external-migration/external-migration-types";
import { TIdentityTrustedIp } from "@app/services/identity/identity-types";
@@ -3178,6 +3185,7 @@ interface RevokeCert {
certId: string;
cn: string;
serialNumber: string;
+ revocationReason?: CrlReason;
};
}
@@ -3420,10 +3428,12 @@ interface AutomatedRenewCertificate {
type: EventType.AUTOMATED_RENEW_CERTIFICATE;
metadata: {
certificateId: string;
+ newCertificateId?: string;
commonName: string;
profileId: string;
- renewBeforeDays: string;
+ renewBeforeDays?: number;
profileName: string;
+ serialNumber?: string;
};
}
@@ -3433,7 +3443,7 @@ interface AutomatedRenewCertificateFailed {
certificateId: string;
commonName: string;
profileId: string;
- renewBeforeDays: string;
+ renewBeforeDays?: number;
profileName: string;
error: string;
};
@@ -4026,8 +4036,11 @@ interface IssueCertificateFromProfile {
metadata: {
certificateProfileId: string;
certificateId: string;
+ certificateRequestId: string;
commonName: string;
profileName: string;
+ status: CertificateRequestStatus;
+ serialNumber?: string;
applicationId?: string;
};
}
@@ -4037,8 +4050,11 @@ interface SignCertificateFromProfile {
metadata: {
certificateProfileId: string;
certificateId: string;
+ certificateRequestId: string;
profileName: string;
commonName: string;
+ status: CertificateRequestStatus;
+ serialNumber?: string;
applicationId?: string;
};
}
@@ -4047,7 +4063,11 @@ interface OrderCertificateFromProfile {
type: EventType.ORDER_CERTIFICATE_FROM_PROFILE;
metadata: {
certificateProfileId: string;
+ certificateRequestId: string;
+ commonName: string;
profileName: string;
+ status: CertificateRequestStatus;
+ serialNumber?: string;
applicationId?: string;
};
}
@@ -4068,8 +4088,10 @@ interface RenewCertificate {
metadata: {
originalCertificateId: string;
newCertificateId: string;
+ certificateRequestId: string;
profileName: string;
commonName: string;
+ serialNumber?: string;
renewalKeySource: CertificateRenewalKeySource;
changedAttributes: TRenewalAuditChange[];
};
@@ -4929,7 +4951,7 @@ interface PkiSignerRequestToSignEvent {
type: EventType.PKI_SIGNER_REQUEST_TO_SIGN;
metadata: {
signerId: string;
- requestId?: string;
+ approvalRequestId?: string;
};
}
@@ -4937,7 +4959,7 @@ interface PkiSignerPreApproveSigningEvent {
type: EventType.PKI_SIGNER_PRE_APPROVE_SIGNING;
metadata: {
signerId: string;
- requestId?: string;
+ approvalRequestId?: string;
granteeUserId?: string;
granteeIdentityId?: string;
};
@@ -4947,7 +4969,7 @@ interface PkiSignerRevokeRequestEvent {
type: EventType.PKI_SIGNER_REVOKE_REQUEST;
metadata: {
signerId: string;
- requestId: string;
+ approvalRequestId: string;
};
}
@@ -6532,6 +6554,9 @@ interface GetCertificateRequestEvent {
type: EventType.GET_CERTIFICATE_REQUEST;
metadata: {
certificateRequestId: string;
+ commonName?: string;
+ status?: string;
+ serialNumber?: string;
};
}
@@ -6556,9 +6581,9 @@ interface CancelCertificateRequestEvent {
type: EventType.CANCEL_CERTIFICATE_REQUEST;
metadata: {
certificateRequestId: string;
+ commonName?: string;
cancelled: boolean;
previousStatus: string;
- previousPendingMessage: string | null;
};
}
@@ -6620,9 +6645,9 @@ interface ApprovalRequestGetEvent {
type: EventType.APPROVAL_REQUEST_GET;
metadata: {
policyType: string;
- requestId: string;
+ approvalRequestId: string;
status: string;
- };
+ } & TApprovalRequestSubjectMetadata;
}
interface ApprovalRequestListEvent {
@@ -6637,35 +6662,36 @@ interface ApprovalRequestCreateEvent {
type: EventType.APPROVAL_REQUEST_CREATE;
metadata: {
policyType: string;
+ approvalRequestId: string;
justification?: string;
requestDuration: string;
- };
+ } & TApprovalRequestSubjectMetadata;
}
interface ApprovalRequestApproveEvent {
type: EventType.APPROVAL_REQUEST_APPROVE;
metadata: {
policyType: string;
- requestId: string;
+ approvalRequestId: string;
comment?: string;
- };
+ } & TApprovalRequestSubjectMetadata;
}
interface ApprovalRequestRejectEvent {
type: EventType.APPROVAL_REQUEST_REJECT;
metadata: {
policyType: string;
- requestId: string;
+ approvalRequestId: string;
comment?: string;
- };
+ } & TApprovalRequestSubjectMetadata;
}
interface ApprovalRequestCancelEvent {
type: EventType.APPROVAL_REQUEST_CANCEL;
metadata: {
policyType: string;
- requestId: string;
- };
+ approvalRequestId: string;
+ } & TApprovalRequestSubjectMetadata;
}
interface ApprovalRequestGrantListEvent {
@@ -6799,6 +6825,9 @@ interface DownloadAcmeCertificateEvent {
type: EventType.DOWNLOAD_ACME_CERTIFICATE;
metadata: {
orderId: string;
+ certificateId: string;
+ commonName: string;
+ serialNumber: string;
};
}
diff --git a/backend/src/ee/services/pki-acme/pki-acme-service.ts b/backend/src/ee/services/pki-acme/pki-acme-service.ts
index cb42a763e7..0e4f70e03d 100644
--- a/backend/src/ee/services/pki-acme/pki-acme-service.ts
+++ b/backend/src/ee/services/pki-acme/pki-acme-service.ts
@@ -1608,7 +1608,10 @@ export const pkiAcmeServiceFactory = ({
event: {
type: EventType.DOWNLOAD_ACME_CERTIFICATE,
metadata: {
- orderId
+ orderId,
+ certificateId: syncedOrder.certificateId,
+ commonName: Array.from(certObj.subjectName.getField("CN")?.values() || [])[0] || "",
+ serialNumber: certObj.serialNumber
}
}
});
diff --git a/backend/src/server/routes/v1/approval-policy-routers/approval-policy-endpoints.ts b/backend/src/server/routes/v1/approval-policy-routers/approval-policy-endpoints.ts
index 72ed808124..2fc7dcec69 100644
--- a/backend/src/server/routes/v1/approval-policy-routers/approval-policy-endpoints.ts
+++ b/backend/src/server/routes/v1/approval-policy-routers/approval-policy-endpoints.ts
@@ -13,6 +13,7 @@ import {
TCreateRequestDTO,
TUpdatePolicyDTO
} from "@app/services/approval-policy/approval-policy-types";
+import { getApprovalRequestSubjectMetadata } from "@app/services/approval-policy/approval-request-fns";
import {
CreateCertRequestPolicySchema,
UpdateCertRequestPolicySchema
@@ -419,9 +420,11 @@ export const registerApprovalPolicyEndpoints = ({
event: {
type: EventType.APPROVAL_REQUEST_CREATE,
metadata: {
- policyType,
+ policyType: request.type,
+ approvalRequestId: request.id,
justification: req.body.justification || undefined,
- requestDuration: req.body.requestDuration || "infinite"
+ requestDuration: req.body.requestDuration || "infinite",
+ ...getApprovalRequestSubjectMetadata(request)
}
}
});
@@ -473,9 +476,10 @@ export const registerApprovalPolicyEndpoints = ({
event: {
type: EventType.APPROVAL_REQUEST_GET,
metadata: {
- policyType,
- requestId: request.id,
- status: request.status
+ policyType: request.type,
+ approvalRequestId: request.id,
+ status: request.status,
+ ...getApprovalRequestSubjectMetadata(request)
}
}
});
@@ -539,9 +543,10 @@ export const registerApprovalPolicyEndpoints = ({
event: {
type: EventType.APPROVAL_REQUEST_APPROVE,
metadata: {
- policyType,
- requestId: req.params.requestId,
- comment: req.body.comment
+ policyType: request.type,
+ approvalRequestId: request.id,
+ comment: req.body.comment,
+ ...getApprovalRequestSubjectMetadata(request)
}
}
});
@@ -600,9 +605,10 @@ export const registerApprovalPolicyEndpoints = ({
event: {
type: EventType.APPROVAL_REQUEST_REJECT,
metadata: {
- policyType,
- requestId: req.params.requestId,
- comment: req.body.comment
+ policyType: request.type,
+ approvalRequestId: request.id,
+ comment: req.body.comment,
+ ...getApprovalRequestSubjectMetadata(request)
}
}
});
@@ -653,8 +659,9 @@ export const registerApprovalPolicyEndpoints = ({
event: {
type: EventType.APPROVAL_REQUEST_CANCEL,
metadata: {
- policyType,
- requestId: req.params.requestId
+ policyType: request.type,
+ approvalRequestId: request.id,
+ ...getApprovalRequestSubjectMetadata(request)
}
}
});
diff --git a/backend/src/server/routes/v1/certificate-router.ts b/backend/src/server/routes/v1/certificate-router.ts
index 17464fce15..2d0f176169 100644
--- a/backend/src/server/routes/v1/certificate-router.ts
+++ b/backend/src/server/routes/v1/certificate-router.ts
@@ -243,7 +243,11 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
type: EventType.ORDER_CERTIFICATE_FROM_PROFILE,
metadata: {
certificateProfileId: requestBody.profileId,
+ certificateRequestId: data.certificateRequestId,
+ commonName: data.commonName || attributes?.commonName || "",
profileName: data.profileName,
+ status: data.status,
+ ...(data.serialNumber && { serialNumber: data.serialNumber }),
...(requestBody.applicationId && { applicationId: requestBody.applicationId })
}
}
@@ -297,8 +301,11 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
metadata: {
certificateProfileId: requestBody.profileId,
certificateId: data.certificateId || "",
+ certificateRequestId: data.certificateRequestId,
profileName: data.profileName,
commonName: extractedCsrData.commonName || "",
+ status: data.status,
+ ...(data.serialNumber && { serialNumber: data.serialNumber }),
...(requestBody.applicationId && { applicationId: requestBody.applicationId })
}
}
@@ -378,8 +385,11 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
metadata: {
certificateProfileId: requestBody.profileId,
certificateId: data.certificateId || "",
- commonName: attributes?.commonName || "",
+ certificateRequestId: data.certificateRequestId,
+ commonName: attributes?.commonName || data.commonName || "",
profileName: data.profileName,
+ status: data.status,
+ ...(data.serialNumber && { serialNumber: data.serialNumber }),
...(requestBody.applicationId && { applicationId: requestBody.applicationId })
}
}
@@ -462,7 +472,10 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
event: {
type: EventType.GET_CERTIFICATE_REQUEST,
metadata: {
- certificateRequestId: req.params.requestId
+ certificateRequestId: req.params.requestId,
+ commonName: certificateRequest.commonName ?? undefined,
+ status: certificateRequest.status,
+ serialNumber: certificateRequest.serialNumber ?? undefined
}
}
});
@@ -792,7 +805,7 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
},
onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN, AuthMode.OAUTH]),
handler: async (req) => {
- const { certificateRequest, projectId, cancelled, previousStatus, previousPendingMessage } =
+ const { certificateRequest, projectId, cancelled, previousStatus } =
await server.services.certificateRequest.cancelCertificateRequest({
actor: req.permission.type,
actorId: req.permission.id,
@@ -808,9 +821,9 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
type: EventType.CANCEL_CERTIFICATE_REQUEST,
metadata: {
certificateRequestId: req.params.requestId,
+ commonName: certificateRequest?.commonName ?? undefined,
cancelled,
- previousStatus,
- previousPendingMessage
+ previousStatus
}
}
});
@@ -917,8 +930,11 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
metadata: {
certificateProfileId: req.body.profileId,
certificateId: data.certificateId || "",
+ certificateRequestId: data.certificateRequestId,
commonName: req.body.commonName || "",
- profileName: data.profileName
+ profileName: data.profileName,
+ status: data.status,
+ ...(data.serialNumber && { serialNumber: data.serialNumber })
}
}
});
@@ -1016,8 +1032,11 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
metadata: {
certificateProfileId: req.body.profileId,
certificateId: data.certificateId || "",
+ certificateRequestId: data.certificateRequestId,
profileName: data.profileName,
- commonName: certificateRequestData.commonName || ""
+ commonName: certificateRequestData.commonName || "",
+ status: data.status,
+ ...(data.serialNumber && { serialNumber: data.serialNumber })
}
}
});
@@ -1124,7 +1143,11 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
type: EventType.ORDER_CERTIFICATE_FROM_PROFILE,
metadata: {
certificateProfileId: req.body.profileId,
- profileName: data.profileName
+ certificateRequestId: data.certificateRequestId,
+ commonName: data.commonName || req.body.commonName || "",
+ profileName: data.profileName,
+ status: data.status,
+ ...(data.serialNumber && { serialNumber: data.serialNumber })
}
}
});
@@ -1193,8 +1216,10 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
metadata: {
originalCertificateId: req.params.id,
newCertificateId: data.certificateId || "",
+ certificateRequestId: data.certificateRequestId,
profileName: data.profileName,
commonName: data.commonName || "",
+ ...(data.serialNumber && { serialNumber: data.serialNumber }),
renewalKeySource: req.body?.renewalKeySource ?? CertificateRenewalKeySource.New,
changedAttributes: data.changedAttributes ?? []
}
@@ -1744,7 +1769,8 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {
metadata: {
certId: cert.id,
cn: cert.commonName,
- serialNumber: cert.serialNumber
+ serialNumber: cert.serialNumber,
+ revocationReason: req.body.revocationReason
}
}
});
diff --git a/backend/src/server/routes/v1/deprecated-certificate-router.ts b/backend/src/server/routes/v1/deprecated-certificate-router.ts
index 05559f67e4..c985ddb885 100644
--- a/backend/src/server/routes/v1/deprecated-certificate-router.ts
+++ b/backend/src/server/routes/v1/deprecated-certificate-router.ts
@@ -505,7 +505,8 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =
metadata: {
certId: cert.id,
cn: cert.commonName,
- serialNumber: cert.serialNumber
+ serialNumber: cert.serialNumber,
+ revocationReason: req.body.revocationReason
}
}
});
diff --git a/backend/src/server/routes/v1/signer-routers/requests-router.ts b/backend/src/server/routes/v1/signer-routers/requests-router.ts
index 119ac97268..cc64c44ecc 100644
--- a/backend/src/server/routes/v1/signer-routers/requests-router.ts
+++ b/backend/src/server/routes/v1/signer-routers/requests-router.ts
@@ -94,7 +94,7 @@ export const registerSignerRequestsRouter = async (server: FastifyZodProvider) =
projectId: await server.services.pkiSigner.getProjectIdForSigner(req.params.signerId),
event: {
type: EventType.PKI_SIGNER_REQUEST_TO_SIGN,
- metadata: { signerId: req.params.signerId, requestId: request?.id }
+ metadata: { signerId: req.params.signerId, approvalRequestId: request?.id }
}
});
@@ -141,7 +141,7 @@ export const registerSignerRequestsRouter = async (server: FastifyZodProvider) =
type: EventType.PKI_SIGNER_PRE_APPROVE_SIGNING,
metadata: {
signerId: req.params.signerId,
- requestId: result?.request?.id,
+ approvalRequestId: result?.request?.id,
granteeUserId: req.body.granteeUserId,
granteeIdentityId: req.body.granteeIdentityId
}
@@ -179,7 +179,7 @@ export const registerSignerRequestsRouter = async (server: FastifyZodProvider) =
projectId: await server.services.pkiSigner.getProjectIdForSigner(req.params.signerId),
event: {
type: EventType.PKI_SIGNER_REVOKE_REQUEST,
- metadata: { signerId: req.params.signerId, requestId: req.params.requestId }
+ metadata: { signerId: req.params.signerId, approvalRequestId: req.params.requestId }
}
});
diff --git a/backend/src/server/routes/v3/deprecated-certificates-router.ts b/backend/src/server/routes/v3/deprecated-certificates-router.ts
index ccc9b5d504..9895701085 100644
--- a/backend/src/server/routes/v3/deprecated-certificates-router.ts
+++ b/backend/src/server/routes/v3/deprecated-certificates-router.ts
@@ -183,8 +183,11 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>
metadata: {
certificateProfileId: req.body.profileId,
certificateId: certificateData.certificateId,
+ certificateRequestId: certificateData.certificateRequestId,
commonName: req.body.commonName || "",
- profileName: certificateData.profileName
+ profileName: certificateData.profileName,
+ status: certificateData.status,
+ serialNumber: certificateData.serialNumber
}
}
});
@@ -305,8 +308,11 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>
metadata: {
certificateProfileId: req.body.profileId,
certificateId: certificateData.certificateId,
+ certificateRequestId: certificateData.certificateRequestId,
profileName: certificateData.profileName,
- commonName: certificateRequestData.commonName || ""
+ commonName: certificateRequestData.commonName || "",
+ status: certificateData.status,
+ serialNumber: certificateData.serialNumber
}
}
});
@@ -427,7 +433,11 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>
type: EventType.ORDER_CERTIFICATE_FROM_PROFILE,
metadata: {
certificateProfileId: req.body.profileId,
- profileName: data.profileName
+ certificateRequestId: data.certificateRequestId,
+ commonName: data.commonName || "",
+ profileName: data.profileName,
+ status: data.status,
+ ...(data.serialNumber && { serialNumber: data.serialNumber })
}
}
});
@@ -508,8 +518,10 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>
changedAttributes: certificateData.changedAttributes ?? [],
originalCertificateId: req.params.certificateId,
newCertificateId: certificateData.certificateId,
+ certificateRequestId: certificateData.certificateRequestId,
profileName: certificateData.profileName,
- commonName: certificateData.commonName ?? ""
+ commonName: certificateData.commonName ?? "",
+ serialNumber: certificateData.serialNumber
}
}
});
diff --git a/backend/src/services/approval-policy/approval-policy-types.ts b/backend/src/services/approval-policy/approval-policy-types.ts
index 733d211dc5..a62c83b495 100644
--- a/backend/src/services/approval-policy/approval-policy-types.ts
+++ b/backend/src/services/approval-policy/approval-policy-types.ts
@@ -184,3 +184,13 @@ export type TApprovalResourceFactory<
postApprovalRoutine: TApprovalRequestFactoryPostApprovalRoutine<C>;
postRejectionRoutine: TApprovalRequestFactoryPostRejectionRoutine<C>;
};
+
+// Subject of an approval request, flattened for audit metadata. Which fields are populated
+// depends on the request's policy type; PAM access requests contribute none.
+export type TApprovalRequestSubjectMetadata = {
+ certificateRequestId?: string;
+ commonName?: string;
+ profileName?: string;
+ signerId?: string;
+ signerName?: string;
+};
diff --git a/backend/src/services/approval-policy/approval-request-fns.ts b/backend/src/services/approval-policy/approval-request-fns.ts
index 9ec758af97..7b77b09768 100644
--- a/backend/src/services/approval-policy/approval-request-fns.ts
+++ b/backend/src/services/approval-policy/approval-request-fns.ts
@@ -15,12 +15,14 @@ import {
ApprovalRequestStepStatus,
ApproverType
} from "./approval-policy-enums";
-import { ApprovalPolicyStep, TApprovalRequestData } from "./approval-policy-types";
+import { ApprovalPolicyStep, TApprovalRequestData, TApprovalRequestSubjectMetadata } from "./approval-policy-types";
import {
TApprovalRequestDALFactory,
TApprovalRequestStepEligibleApproversDALFactory,
TApprovalRequestStepsDALFactory
} from "./approval-request-dal";
+import { TCertRequestRequestData } from "./cert-request/cert-request-policy-types";
+import { TCodeSigningRequestData } from "./code-signing/code-signing-policy-types";
export interface TCreateApprovalRequestWithStepsParams {
projectId: string;
@@ -281,3 +283,22 @@ export const notifyStepApprovers = async (
logger.error(err, `Failed to send approval request emails to approvers [requestId=${request.id}]`);
}
};
+
+export const getApprovalRequestSubjectMetadata = (
+ request: Pick<TApprovalRequests, "type" | "requestData">
+): TApprovalRequestSubjectMetadata => {
+ const requestData = (request.requestData as { requestData?: unknown } | null)?.requestData;
+ if (!requestData) return {};
+
+ if (request.type === ApprovalPolicyType.CertRequest) {
+ const { certificateRequestId, certificateRequest, profileName } = requestData as TCertRequestRequestData;
+ return { certificateRequestId, commonName: certificateRequest?.commonName, profileName };
+ }
+
+ if (request.type === ApprovalPolicyType.CertCodeSigning) {
+ const { signerId, signerName } = requestData as TCodeSigningRequestData;
+ return { signerId, signerName };
+ }
+
+ return {};
+};
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.ts
index db9fd81025..823fdb6f06 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
@@ -71,7 +71,8 @@ export const digicertRevocationSyncQueueFactory = ({
metadata: {
certId: cert.id,
cn: cert.commonName,
- serialNumber: cert.serialNumber
+ serialNumber: cert.serialNumber,
+ revocationReason: CrlReason.UNSPECIFIED
}
}
});
diff --git a/backend/src/services/certificate-v3/certificate-v3-queue.ts b/backend/src/services/certificate-v3/certificate-v3-queue.ts
index 4c26c68513..122d06fd94 100644
--- a/backend/src/services/certificate-v3/certificate-v3-queue.ts
+++ b/backend/src/services/certificate-v3/certificate-v3-queue.ts
@@ -70,7 +70,7 @@ export const certificateV3QueueServiceFactory = ({
}
}
- await certificateV3Service.renewCertificate({
+ const renewed = await certificateV3Service.renewCertificate({
actor: ActorType.PLATFORM,
actorId: "",
actorAuthMethod: null,
@@ -91,10 +91,12 @@ export const certificateV3QueueServiceFactory = ({
type: EventType.AUTOMATED_RENEW_CERTIFICATE,
metadata: {
certificateId: certificate.id,
+ newCertificateId: renewed.certificateId,
commonName: certificate.commonName || "",
profileId: certificate.profileId!,
- renewBeforeDays: certificate.renewBeforeDays?.toString() || "",
- profileName: certificate.profileName || ""
+ renewBeforeDays: certificate.renewBeforeDays ?? undefined,
+ profileName: certificate.profileName || "",
+ serialNumber: renewed.serialNumber
}
}
});
@@ -113,7 +115,7 @@ export const certificateV3QueueServiceFactory = ({
certificateId: certificate.id,
commonName: certificate.commonName || "",
profileId: certificate.profileId || "",
- renewBeforeDays: certificate.renewBeforeDays?.toString() || "",
+ renewBeforeDays: certificate.renewBeforeDays ?? undefined,
profileName: certificate.profileName || "",
error: errorMessage
}
diff --git a/frontend/src/hooks/api/auditLogs/constants.tsx b/frontend/src/hooks/api/auditLogs/constants.tsx
index 12eac7147a..5a7d7ab39c 100644
--- a/frontend/src/hooks/api/auditLogs/constants.tsx
+++ b/frontend/src/hooks/api/auditLogs/constants.tsx
@@ -376,7 +376,7 @@ export const eventToNameMap: { [K in EventType]: string } = {
[EventType.DELETE_CERTIFICATE_PROFILE]: "Delete Certificate Profile",
[EventType.GET_CERTIFICATE_PROFILE]: "Get Certificate Profile",
[EventType.LIST_CERTIFICATE_PROFILES]: "List Certificate Profiles",
- [EventType.ISSUE_CERTIFICATE_FROM_PROFILE]: "Request Certificate From Profile",
+ [EventType.ISSUE_CERTIFICATE_FROM_PROFILE]: "Issue Certificate From Profile",
[EventType.SIGN_CERTIFICATE_FROM_PROFILE]: "Sign Certificate From Profile",
[EventType.ORDER_CERTIFICATE_FROM_PROFILE]: "Order Certificate From Profile",
[EventType.GET_CERTIFICATE_PROFILE_LATEST_ACTIVE_BUNDLE]: