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
feat(pki): application names on certificate lifecycle events
bernie-g48e91f164715
diff --git a/backend/src/ee/routes/scep/pki-scep-router.ts b/backend/src/ee/routes/scep/pki-scep-router.tsindex bf11c4c272..7175705ed0 100644--- a/backend/src/ee/routes/scep/pki-scep-router.ts+++ b/backend/src/ee/routes/scep/pki-scep-router.ts@@ -185,8 +185,6 @@ export const registerPkiScepRouter = async (server: FastifyZodProvider) => {actorOrgId: req.permission.orgId});- const applicationName = await server.services.pkiApplication.getApplicationNameById(applicationId);-void server.services.auditLog.createAuditLog({...req.auditLogInfo,projectId: result.projectId,@@ -197,7 +195,7 @@ export const registerPkiScepRouter = async (server: FastifyZodProvider) => {profileSlug: result.profileSlug,expiresAt: result.expiresAt,applicationId,- ...(applicationName && { applicationName })+ ...(result.applicationName && { applicationName: result.applicationName })}}});diff --git a/backend/src/ee/services/audit-log/audit-log-types.ts b/backend/src/ee/services/audit-log/audit-log-types.tsindex a49e5af76a..dcef90b3b9 100644--- a/backend/src/ee/services/audit-log/audit-log-types.ts+++ b/backend/src/ee/services/audit-log/audit-log-types.ts@@ -3137,6 +3137,8 @@ interface ImportCert {certId: string;cn: string;serialNumber: string;+ applicationId?: string | null;+ applicationName?: string | null;certificateProfileId?: string;profileName?: string;caId?: string;@@ -3167,6 +3169,8 @@ interface GetCert {certId: string;cn: string;serialNumber: string;+ applicationId?: string | null;+ applicationName?: string | null;};}@@ -3176,6 +3180,8 @@ interface DeleteCert {certId: string;cn: string;serialNumber: string;+ applicationId?: string | null;+ applicationName?: string | null;};}@@ -3185,6 +3191,8 @@ interface RevokeCert {certId: string;cn: string;serialNumber: string;+ applicationId?: string | null;+ applicationName?: string | null;revocationReason?: CrlReason;};}@@ -3206,6 +3214,8 @@ interface GetCertBody {certId: string;cn: string;serialNumber: string;+ applicationId?: string | null;+ applicationName?: string | null;};}@@ -3215,6 +3225,8 @@ interface GetCertPrivateKey {certId: string;cn: string;serialNumber: string;+ applicationId?: string | null;+ applicationName?: string | null;};}@@ -3224,6 +3236,8 @@ interface GetCertBundle {certId: string;cn: string;serialNumber: string;+ applicationId?: string | null;+ applicationName?: string | null;};}interface GetCertPkcs12 {@@ -3232,6 +3246,8 @@ interface GetCertPkcs12 {certId: string;cn: string;serialNumber: string;+ applicationId?: string | null;+ applicationName?: string | null;};}@@ -3438,6 +3454,8 @@ interface AutomatedRenewCertificate {newCertificateId?: string;certificateRequestId?: string;commonName: string;+ applicationId?: string | null;+ applicationName?: string | null;profileId: string;renewBeforeDays: string;profileName: string;@@ -3451,6 +3469,8 @@ interface AutomatedRenewCertificateFailed {metadata: {certificateId: string;commonName: string;+ applicationId?: string | null;+ applicationName?: string | null;profileId: string;renewBeforeDays: string;profileName: string;@@ -4116,6 +4136,8 @@ interface RenewCertificate {certificateRequestId: string;profileName: string;commonName: string;+ applicationId?: string | null;+ applicationName?: string | null;serialNumber?: string;renewalKeySource: CertificateRenewalKeySource;changedAttributes: TRenewalAuditChange[];@@ -6538,6 +6560,8 @@ interface UpdateCertificateRenewalConfigEvent {certificateId: string;renewBeforeDays: string;commonName: string;+ applicationId?: string | null;+ applicationName?: string | null;};}@@ -6546,6 +6570,8 @@ interface UpdateCertificateMetadataEvent {metadata: {certificateId: string;commonName: string;+ applicationId?: string | null;+ applicationName?: string | null;metadata: { key: string; value: string }[];};}@@ -6573,6 +6599,8 @@ interface DisableCertificateRenewalConfigEvent {metadata: {certificateId: string;commonName: string;+ applicationId?: string | null;+ applicationName?: string | null;};}@@ -6590,6 +6618,8 @@ interface GetCertificateRequestEvent {type: EventType.GET_CERTIFICATE_REQUEST;metadata: {certificateRequestId: string;+ applicationId?: string | null;+ applicationName?: string | null;commonName?: string;status?: string;serialNumber?: string;@@ -6608,6 +6638,8 @@ interface TriggerCertificateRequestValidationEvent {type: EventType.TRIGGER_CERTIFICATE_REQUEST_VALIDATION;metadata: {certificateRequestId: string;+ applicationId?: string | null;+ applicationName?: string | null;status: string;orderStatus?: string;};@@ -6617,6 +6649,8 @@ interface CancelCertificateRequestEvent {type: EventType.CANCEL_CERTIFICATE_REQUEST;metadata: {certificateRequestId: string;+ applicationId?: string | null;+ applicationName?: string | null;commonName?: string;cancelled: boolean;previousStatus: string;diff --git a/backend/src/ee/services/pki-scep/pki-scep-service.ts b/backend/src/ee/services/pki-scep/pki-scep-service.tsindex 3891108eac..9b5b806430 100644--- a/backend/src/ee/services/pki-scep/pki-scep-service.ts+++ b/backend/src/ee/services/pki-scep/pki-scep-service.ts@@ -46,6 +46,7 @@ import { TCertificateV3ServiceFactory } from "@app/services/certificate-v3/certiimport { TScepEnrollmentConfigDALFactory } from "@app/services/enrollment-config/scep-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";@@ -105,6 +106,7 @@ type TPkiScepServiceFactoryDep = {auditLogService: Pick<TAuditLogServiceFactory, "createAuditLog">;permissionService: Pick<TPermissionServiceFactory, "getProjectPermission" | "getResourcePermission">;pkiApplicationProfileDAL?: Pick<TPkiApplicationProfileDALFactory, "findOneByApplicationAndProfile">;+ pkiApplicationDAL?: Pick<TPkiApplicationDALFactory, "findById">;};export type TPkiScepServiceFactory = ReturnType<typeof pkiScepServiceFactory>;@@ -136,7 +138,8 @@ export const pkiScepServiceFactory = ({certificateIssuanceQueue,auditLogService,permissionService,- pkiApplicationProfileDAL+ pkiApplicationProfileDAL,+ pkiApplicationDAL}: TPkiScepServiceFactoryDep) => {const loadScepContext = async (profileId: string, applicationId?: string) => {const profile = await certificateProfileDAL.findByIdWithConfigs(profileId);@@ -1259,10 +1262,13 @@ export const pkiScepServiceFactory = ({void scepDynamicChallengeDAL.pruneExpired(scepConfig.id);+ const application = applicationId && pkiApplicationDAL ? await pkiApplicationDAL.findById(applicationId) : null;+return {challenge: challengePlaintext,projectId: profile.projectId,profileSlug: profile.slug,+ applicationName: application?.name ?? null,expiresAt: expiresAt.toISOString()};};diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex bfdc88c906..f0f4e90002 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -2900,6 +2900,7 @@ export const registerRoutes = async (const certificateInventoryViewService = certificateInventoryViewServiceFactory({certificateInventoryViewDAL,+ pkiApplicationDAL,permissionService});@@ -3492,6 +3493,7 @@ export const registerRoutes = async (});const certificateAuthorityService = certificateAuthorityServiceFactory({+ pkiApplicationDAL,certificateAuthorityDAL,permissionService,appConnectionDAL,@@ -3614,6 +3616,7 @@ export const registerRoutes = async (const certificateRequestService = certificateRequestServiceFactory({certificateRequestDAL,certificateDAL,+ pkiApplicationDAL,certificateService,permissionService,resourceMetadataDAL,@@ -3697,6 +3700,7 @@ export const registerRoutes = async (const certificateV3Service = certificateV3ServiceFactory({usageCounterDAL,+ pkiApplicationDAL,keyStore,certificateDAL,certificateSecretDAL,@@ -3786,6 +3790,7 @@ export const registerRoutes = async (const pkiScepService = pkiScepServiceFactory({keyStore,+ pkiApplicationDAL,usageCounterDAL,certificateV3Service,certificateProfileDAL,diff --git a/backend/src/server/routes/v1/certificate-inventory-view-router.ts b/backend/src/server/routes/v1/certificate-inventory-view-router.tsindex 300c114d98..bcb741df2f 100644--- a/backend/src/server/routes/v1/certificate-inventory-view-router.ts+++ b/backend/src/server/routes/v1/certificate-inventory-view-router.ts@@ -149,9 +149,6 @@ export const registerCertificateInventoryViewRouter = async (server: FastifyZodPactorAuthMethod: req.permission.authMethod,actor: req.permission.type});- const applicationName = view.applicationId- ? await server.services.pkiApplication.getApplicationNameById(view.applicationId)- : undefined;await server.services.auditLog.createAuditLog({...req.auditLogInfo,@@ -165,7 +162,7 @@ export const registerCertificateInventoryViewRouter = async (server: FastifyZodPcolumns: req.body.columns,isShared: req.body.isShared,...(view.applicationId && { applicationId: view.applicationId }),- ...(applicationName && { applicationName })+ ...(view.applicationName && { applicationName: view.applicationName })}}});@@ -214,9 +211,6 @@ export const registerCertificateInventoryViewRouter = async (server: FastifyZodPactorAuthMethod: req.permission.authMethod,actor: req.permission.type});- const applicationName = view.applicationId- ? await server.services.pkiApplication.getApplicationNameById(view.applicationId)- : undefined;await server.services.auditLog.createAuditLog({...req.auditLogInfo,@@ -230,7 +224,7 @@ export const registerCertificateInventoryViewRouter = async (server: FastifyZodPcolumns: req.body.columns,isShared: req.body.isShared,...(view.applicationId && { applicationId: view.applicationId }),- ...(applicationName && { applicationName })+ ...(view.applicationName && { applicationName: view.applicationName })}}});@@ -268,9 +262,6 @@ export const registerCertificateInventoryViewRouter = async (server: FastifyZodPactorAuthMethod: req.permission.authMethod,actor: req.permission.type});- const applicationName = view.applicationId- ? await server.services.pkiApplication.getApplicationNameById(view.applicationId)- : undefined;await server.services.auditLog.createAuditLog({...req.auditLogInfo,@@ -281,7 +272,7 @@ export const registerCertificateInventoryViewRouter = async (server: FastifyZodPviewId: req.params.viewId,name: view.name,...(view.applicationId && { applicationId: view.applicationId }),- ...(applicationName && { applicationName })+ ...(view.applicationName && { applicationName: view.applicationName })}}});diff --git a/backend/src/server/routes/v1/certificate-router.ts b/backend/src/server/routes/v1/certificate-router.tsindex ebae210bfd..f3279acb5b 100644--- a/backend/src/server/routes/v1/certificate-router.ts+++ b/backend/src/server/routes/v1/certificate-router.ts@@ -236,10 +236,6 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {removeRootsFromChain: requestBody.removeRootsFromChain});- const applicationName = requestBody.applicationId- ? await server.services.pkiApplication.getApplicationNameById(requestBody.applicationId)- : undefined;-await server.services.auditLog.createAuditLog({...req.auditLogInfo,projectId: data.projectId,@@ -253,7 +249,7 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {status: data.status,...(data.serialNumber && { serialNumber: data.serialNumber }),...(requestBody.applicationId && { applicationId: requestBody.applicationId }),- ...(applicationName && { applicationName })+ ...(data.applicationName && { applicationName: data.applicationName })}}});@@ -298,10 +294,6 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {basicConstraints: attributes?.basicConstraints});- const applicationName = requestBody.applicationId- ? await server.services.pkiApplication.getApplicationNameById(requestBody.applicationId)- : undefined;-await server.services.auditLog.createAuditLog({...req.auditLogInfo,projectId: data.projectId,@@ -316,7 +308,7 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {status: data.status,...(data.serialNumber && { serialNumber: data.serialNumber }),...(requestBody.applicationId && { applicationId: requestBody.applicationId }),- ...(applicationName && { applicationName })+ ...(data.applicationName && { applicationName: data.applicationName })}}});@@ -387,10 +379,6 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {removeRootsFromChain: requestBody.removeRootsFromChain});- const applicationName = requestBody.applicationId- ? await server.services.pkiApplication.getApplicationNameById(requestBody.applicationId)- : undefined;-await server.services.auditLog.createAuditLog({...req.auditLogInfo,projectId: data.projectId,@@ -405,7 +393,7 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {status: data.status,...(data.serialNumber && { serialNumber: data.serialNumber }),...(requestBody.applicationId && { applicationId: requestBody.applicationId }),- ...(applicationName && { applicationName })+ ...(data.applicationName && { applicationName: data.applicationName })}}});@@ -1236,6 +1224,8 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {profileName: data.profileName,commonName: data.commonName || "",...(data.serialNumber && { serialNumber: data.serialNumber }),+ applicationId: data.applicationId,+ applicationName: data.applicationName,renewalKeySource: req.body?.renewalKeySource ?? CertificateRenewalKeySource.New,changedAttributes: data.changedAttributes ?? []}@@ -1310,7 +1300,9 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {type: EventType.DISABLE_CERTIFICATE_RENEWAL_CONFIG,metadata: {certificateId: req.params.id,- commonName: data.commonName+ commonName: data.commonName,+ applicationId: data.applicationId,+ applicationName: data.applicationName}}});@@ -1349,7 +1341,9 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {metadata: {certificateId: req.params.id,renewBeforeDays: req.body.renewBeforeDays.toString(),- commonName: data.commonName+ commonName: data.commonName,+ applicationId: data.applicationId,+ applicationName: data.applicationName}}});@@ -1452,7 +1446,9 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {metadata: {certId: cert.id,cn: cert.commonName,- serialNumber: cert.serialNumber+ serialNumber: cert.serialNumber,+ applicationId: cert.applicationId,+ applicationName: cert.applicationName}}});@@ -1511,6 +1507,8 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {metadata: {certificateId: req.params.id,commonName: result.commonName,+ applicationId: result.applicationId,+ applicationName: result.applicationName,metadata: req.body.metadata.map(({ key, value }) => ({ key, value }))}}@@ -1552,7 +1550,7 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {}},handler: async (req, reply) => {- const { cert, certPrivateKey } = await server.services.certificate.getCertPrivateKey({+ const { cert, applicationName, certPrivateKey } = await server.services.certificate.getCertPrivateKey({id: req.params.id,actor: req.permission.type,actorId: req.permission.id,@@ -1568,7 +1566,9 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {metadata: {certId: cert.id,cn: cert.commonName,- serialNumber: cert.serialNumber+ serialNumber: cert.serialNumber,+ applicationId: cert.applicationId,+ applicationName}}});@@ -1614,7 +1614,7 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {}},handler: async (req, reply) => {- const { certificate, certificateChain, serialNumber, cert, privateKey } =+ const { certificate, certificateChain, serialNumber, cert, privateKey, applicationName } =await server.services.certificate.getCertBundle({id: req.params.id,actor: req.permission.type,@@ -1631,7 +1631,9 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {metadata: {certId: cert.id,cn: cert.commonName,- serialNumber: cert.serialNumber+ serialNumber: cert.serialNumber,+ applicationId: cert.applicationId,+ applicationName}}});@@ -1692,7 +1694,7 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {}},handler: async (req) => {- const { certificate, certificateChain, privateKey, serialNumber, cert, profileName, caName } =+ const { certificate, certificateChain, privateKey, serialNumber, cert, profileName, caName, applicationName } =await server.services.certificate.importCert({actor: req.permission.type,actorId: req.permission.id,@@ -1711,6 +1713,8 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {certId: cert.id,cn: cert.commonName,serialNumber,+ applicationId: cert.applicationId,+ applicationName,certificateProfileId: cert.profileId ?? undefined,profileName: profileName ?? undefined,caId: cert.caId ?? undefined,@@ -1768,7 +1772,7 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {},handler: async (req) => {const { id: identifier } = req.params;- const { revokedAt, cert, ca } = await server.services.certificate.revokeCert({+ const { revokedAt, cert, applicationName, ca } = await server.services.certificate.revokeCert({...(isUuidV4(identifier) ? { id: identifier } : { thumbprint: identifier }),actor: req.permission.type,actorId: req.permission.id,@@ -1786,6 +1790,8 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {certId: cert.id,cn: cert.commonName,serialNumber: cert.serialNumber,+ applicationId: cert.applicationId,+ applicationName,revocationReason: req.body.revocationReason}}@@ -1805,6 +1811,8 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {return {message: "Successfully revoked certificate",serialNumber: cert.serialNumber,+ applicationId: cert.applicationId,+ applicationName,revokedAt};}@@ -1832,7 +1840,7 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {}},handler: async (req) => {- const { deletedCert } = await server.services.certificate.deleteCert({+ const { deletedCert, applicationName } = await server.services.certificate.deleteCert({id: req.params.id,actor: req.permission.type,actorId: req.permission.id,@@ -1848,7 +1856,9 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {metadata: {certId: deletedCert.id,cn: deletedCert.commonName,- serialNumber: deletedCert.serialNumber+ serialNumber: deletedCert.serialNumber,+ applicationId: deletedCert.applicationId,+ applicationName}}});@@ -1945,13 +1955,14 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {}},handler: async (req) => {- const { certificate, certificateChain, serialNumber, cert } = await server.services.certificate.getCertBody({- id: req.params.id,- actor: req.permission.type,- actorId: req.permission.id,- actorAuthMethod: req.permission.authMethod,- actorOrgId: req.permission.orgId- });+ const { certificate, certificateChain, serialNumber, cert, applicationName } =+ await server.services.certificate.getCertBody({+ id: req.params.id,+ actor: req.permission.type,+ actorId: req.permission.id,+ actorAuthMethod: req.permission.authMethod,+ actorOrgId: req.permission.orgId+ });await server.services.auditLog.createAuditLog({...req.auditLogInfo,@@ -1961,7 +1972,9 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {metadata: {certId: cert.id,cn: cert.commonName,- serialNumber: cert.serialNumber+ serialNumber: cert.serialNumber,+ applicationId: cert.applicationId,+ applicationName}}});@@ -2001,7 +2014,7 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {}},handler: async (req, reply) => {- const { pkcs12Data, cert } = await server.services.certificate.getCertPkcs12({+ const { pkcs12Data, cert, applicationName } = await server.services.certificate.getCertPkcs12({id: req.params.id,password: req.body.password,alias: req.body.alias,@@ -2019,7 +2032,9 @@ export const registerCertificateRouter = async (server: FastifyZodProvider) => {metadata: {certId: cert.id,cn: cert.commonName,- serialNumber: cert.serialNumber+ serialNumber: cert.serialNumber,+ applicationId: cert.applicationId,+ applicationName}}});diff --git a/backend/src/server/routes/v1/deprecated-certificate-router.ts b/backend/src/server/routes/v1/deprecated-certificate-router.tsindex c985ddb885..d53ff6f7b3 100644--- a/backend/src/server/routes/v1/deprecated-certificate-router.ts+++ b/backend/src/server/routes/v1/deprecated-certificate-router.ts@@ -56,7 +56,9 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =metadata: {certId: cert.id,cn: cert.commonName,- serialNumber: cert.serialNumber+ serialNumber: cert.serialNumber,+ applicationId: cert.applicationId,+ applicationName: cert.applicationName}}});@@ -87,7 +89,7 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =}},handler: async (req, reply) => {- const { cert, certPrivateKey } = await server.services.certificate.getCertPrivateKey({+ const { cert, applicationName, certPrivateKey } = await server.services.certificate.getCertPrivateKey({serialNumber: req.params.serialNumber,actor: req.permission.type,actorId: req.permission.id,@@ -103,7 +105,9 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =metadata: {certId: cert.id,cn: cert.commonName,- serialNumber: cert.serialNumber+ serialNumber: cert.serialNumber,+ applicationId: cert.applicationId,+ applicationName}}});@@ -139,7 +143,7 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =}},handler: async (req, reply) => {- const { certificate, certificateChain, serialNumber, cert, privateKey } =+ const { certificate, certificateChain, serialNumber, cert, privateKey, applicationName } =await server.services.certificate.getCertBundle({serialNumber: req.params.serialNumber,actor: req.permission.type,@@ -156,7 +160,9 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =metadata: {certId: cert.id,cn: cert.commonName,- serialNumber: cert.serialNumber+ serialNumber: cert.serialNumber,+ applicationId: cert.applicationId,+ applicationName}}});@@ -317,7 +323,7 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =}},handler: async (req) => {- const { certificate, certificateChain, privateKey, serialNumber, cert } =+ const { certificate, certificateChain, privateKey, serialNumber, cert, applicationName } =await server.services.certificate.importCert({actor: req.permission.type,actorId: req.permission.id,@@ -334,7 +340,9 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =metadata: {certId: cert.id,cn: cert.commonName,- serialNumber+ serialNumber,+ applicationId: cert.applicationId,+ applicationName}}});@@ -488,7 +496,7 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =}},handler: async (req) => {- const { revokedAt, cert, ca } = await server.services.certificate.revokeCert({+ const { revokedAt, cert, applicationName, ca } = await server.services.certificate.revokeCert({serialNumber: req.params.serialNumber,actor: req.permission.type,actorId: req.permission.id,@@ -506,6 +514,8 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =certId: cert.id,cn: cert.commonName,serialNumber: cert.serialNumber,+ applicationId: cert.applicationId,+ applicationName,revocationReason: req.body.revocationReason}}@@ -540,7 +550,7 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =}},handler: async (req) => {- const { deletedCert } = await server.services.certificate.deleteCert({+ const { deletedCert, applicationName } = await server.services.certificate.deleteCert({serialNumber: req.params.serialNumber,actor: req.permission.type,actorId: req.permission.id,@@ -556,7 +566,9 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =metadata: {certId: deletedCert.id,cn: deletedCert.commonName,- serialNumber: deletedCert.serialNumber+ serialNumber: deletedCert.serialNumber,+ applicationId: deletedCert.applicationId,+ applicationName}}});@@ -590,13 +602,14 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =}},handler: async (req) => {- const { certificate, certificateChain, serialNumber, cert } = await server.services.certificate.getCertBody({- serialNumber: req.params.serialNumber,- actor: req.permission.type,- actorId: req.permission.id,- actorAuthMethod: req.permission.authMethod,- actorOrgId: req.permission.orgId- });+ const { certificate, certificateChain, serialNumber, cert, applicationName } =+ await server.services.certificate.getCertBody({+ serialNumber: req.params.serialNumber,+ actor: req.permission.type,+ actorId: req.permission.id,+ actorAuthMethod: req.permission.authMethod,+ actorOrgId: req.permission.orgId+ });await server.services.auditLog.createAuditLog({...req.auditLogInfo,@@ -606,7 +619,9 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =metadata: {certId: cert.id,cn: cert.commonName,- serialNumber: cert.serialNumber+ serialNumber: cert.serialNumber,+ applicationId: cert.applicationId,+ applicationName}}});@@ -645,7 +660,7 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =}},handler: async (req, reply) => {- const { pkcs12Data, cert } = await server.services.certificate.getCertPkcs12({+ const { pkcs12Data, cert, applicationName } = await server.services.certificate.getCertPkcs12({serialNumber: req.params.serialNumber,password: req.body.password,alias: req.body.alias,@@ -663,7 +678,9 @@ export const registerDeprecatedCertRouter = async (server: FastifyZodProvider) =metadata: {certId: cert.id,cn: cert.commonName,- serialNumber: cert.serialNumber+ serialNumber: cert.serialNumber,+ applicationId: cert.applicationId,+ applicationName}}});diff --git a/backend/src/server/routes/v1/pki-alert-router.ts b/backend/src/server/routes/v1/pki-alert-router.tsindex 47fbc3b306..9eee9be8f1 100644--- a/backend/src/server/routes/v1/pki-alert-router.ts+++ b/backend/src/server/routes/v1/pki-alert-router.ts@@ -73,10 +73,6 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {projectId: req.internalCertManagerProjectId});- const applicationName = alert.applicationId- ? await server.services.pkiApplication.getApplicationNameById(alert.applicationId)- : undefined;-await server.services.auditLog.createAuditLog({...req.auditLogInfo,projectId: req.internalCertManagerProjectId,@@ -88,7 +84,7 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {eventType: alert.eventType,alertBefore: alert.alertBefore,...(alert.applicationId && { applicationId: alert.applicationId }),- ...(applicationName && { applicationName })+ ...(alert.applicationName && { applicationName: alert.applicationName })}}});@@ -223,10 +219,6 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {actorOrgId: req.permission.orgId});- const applicationName = alert.applicationId- ? await server.services.pkiApplication.getApplicationNameById(alert.applicationId)- : undefined;-await server.services.auditLog.createAuditLog({...req.auditLogInfo,projectId: alert.projectId,@@ -235,7 +227,7 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {metadata: {pkiAlertId: alert.id,...(alert.applicationId && { applicationId: alert.applicationId }),- ...(applicationName && { applicationName })+ ...(alert.applicationName && { applicationName: alert.applicationName })}}});@@ -299,10 +291,6 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {...req.body});- const applicationName = alert.applicationId- ? await server.services.pkiApplication.getApplicationNameById(alert.applicationId)- : undefined;-await server.services.auditLog.createAuditLog({...req.auditLogInfo,projectId: alert.projectId,@@ -314,7 +302,7 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {eventType: alert.eventType,alertBefore: alert.alertBefore,...(alert.applicationId && { applicationId: alert.applicationId }),- ...(applicationName && { applicationName })+ ...(alert.applicationName && { applicationName: alert.applicationName })}}});@@ -376,10 +364,6 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {actorOrgId: req.permission.orgId});- const applicationName = alert.applicationId- ? await server.services.pkiApplication.getApplicationNameById(alert.applicationId)- : undefined;-await server.services.auditLog.createAuditLog({...req.auditLogInfo,projectId: alert.projectId,@@ -388,7 +372,7 @@ export const registerPkiAlertRouter = async (server: FastifyZodProvider) => {metadata: {pkiAlertId: alert.id,...(alert.applicationId && { applicationId: alert.applicationId }),- ...(applicationName && { applicationName })+ ...(alert.applicationName && { applicationName: alert.applicationName })}}});diff --git a/backend/src/server/routes/v1/pki-application-alert-router.ts b/backend/src/server/routes/v1/pki-application-alert-router.tsindex 8739088793..74e6a801f3 100644--- a/backend/src/server/routes/v1/pki-application-alert-router.ts+++ b/backend/src/server/routes/v1/pki-application-alert-router.ts@@ -86,8 +86,6 @@ export const registerPkiApplicationAlertRoutes = async (server: FastifyZodProvid...req.body});- const applicationName = await server.services.pkiApplication.getApplicationNameById(req.params.applicationId);-await server.services.auditLog.createAuditLog({...req.auditLogInfo,projectId: req.internalCertManagerProjectId,@@ -96,7 +94,7 @@ export const registerPkiApplicationAlertRoutes = async (server: FastifyZodProvidmetadata: {pkiAlertId: alert.id,applicationId: req.params.applicationId,- ...(applicationName && { applicationName }),+ ...(alert.applicationName && { applicationName: alert.applicationName }),name: alert.name,alertBefore: alert.alertBefore ?? undefined,eventType: alert.eventType@@ -148,8 +146,6 @@ export const registerPkiApplicationAlertRoutes = async (server: FastifyZodProvid...req.body});- const applicationName = await server.services.pkiApplication.getApplicationNameById(req.params.applicationId);-await server.services.auditLog.createAuditLog({...req.auditLogInfo,projectId: req.internalCertManagerProjectId,@@ -158,7 +154,7 @@ export const registerPkiApplicationAlertRoutes = async (server: FastifyZodProvidmetadata: {pkiAlertId: alert.id,applicationId: req.params.applicationId,- ...(applicationName && { applicationName }),+ ...(alert.applicationName && { applicationName: alert.applicationName }),name: alert.name,alertBefore: alert.alertBefore ?? undefined,eventType: alert.eventType@@ -207,8 +203,6 @@ export const registerPkiApplicationAlertRoutes = async (server: FastifyZodProvidalertId: req.params.alertId});- const applicationName = await server.services.pkiApplication.getApplicationNameById(req.params.applicationId);-await server.services.auditLog.createAuditLog({...req.auditLogInfo,projectId: req.internalCertManagerProjectId,@@ -217,7 +211,7 @@ export const registerPkiApplicationAlertRoutes = async (server: FastifyZodProvidmetadata: {pkiAlertId: alert.id,applicationId: req.params.applicationId,- ...(applicationName && { applicationName })+ ...(alert.applicationName && { applicationName: alert.applicationName })}}});diff --git a/backend/src/server/routes/v1/pki-application-profile-router.ts b/backend/src/server/routes/v1/pki-application-profile-router.tsindex 27c8675820..515ffeb87f 100644--- a/backend/src/server/routes/v1/pki-application-profile-router.ts+++ b/backend/src/server/routes/v1/pki-application-profile-router.ts@@ -59,7 +59,7 @@ export const registerPkiApplicationProfileRoutes = async (server: FastifyZodProv},onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN, AuthMode.OAUTH]),handler: async (req) => {- const profiles = await server.services.pkiApplication.attachProfiles({+ const { profiles, applicationName } = await server.services.pkiApplication.attachProfiles({actor: req.permission.type,actorId: req.permission.id,actorAuthMethod: req.permission.authMethod,@@ -69,8 +69,6 @@ export const registerPkiApplicationProfileRoutes = async (server: FastifyZodProvprofileIds: req.body.profileIds});- const applicationName = await server.services.pkiApplication.getApplicationNameById(req.params.applicationId);-await server.services.auditLog.createAuditLog({...req.auditLogInfo,projectId: req.internalCertManagerProjectId,@@ -78,7 +76,7 @@ export const registerPkiApplicationProfileRoutes = async (server: FastifyZodProvtype: EventType.ATTACH_PKI_APPLICATION_PROFILES,metadata: {applicationId: req.params.applicationId,- ...(applicationName && { applicationName }),+ applicationName,profileIds: req.body.profileIds}}@@ -131,8 +129,6 @@ export const registerPkiApplicationProfileRoutes = async (server: FastifyZodProvprofileId: req.params.profileId});- const applicationName = await server.services.pkiApplication.getApplicationNameById(result.applicationId);-await server.services.auditLog.createAuditLog({...req.auditLogInfo,projectId: req.internalCertManagerProjectId,@@ -140,7 +136,7 @@ export const registerPkiApplicationProfileRoutes = async (server: FastifyZodProvtype: EventType.DETACH_PKI_APPLICATION_PROFILE,metadata: {applicationId: result.applicationId,- ...(applicationName && { applicationName }),+ applicationName: result.applicationName,profileId: result.profileId}}diff --git a/backend/src/server/routes/v3/deprecated-certificates-router.ts b/backend/src/server/routes/v3/deprecated-certificates-router.tsindex 9895701085..c3ae48155f 100644--- a/backend/src/server/routes/v3/deprecated-certificates-router.ts+++ b/backend/src/server/routes/v3/deprecated-certificates-router.ts@@ -514,6 +514,8 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>event: {type: EventType.RENEW_CERTIFICATE,metadata: {+ applicationId: certificateData.applicationId,+ applicationName: certificateData.applicationName,renewalKeySource: CertificateRenewalKeySource.New,changedAttributes: certificateData.changedAttributes ?? [],originalCertificateId: req.params.certificateId,@@ -575,7 +577,9 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>type: EventType.DISABLE_CERTIFICATE_RENEWAL_CONFIG,metadata: {certificateId: req.params.certificateId,- commonName: data.commonName+ commonName: data.commonName,+ applicationId: data.applicationId,+ applicationName: data.applicationName}}});@@ -603,7 +607,9 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>metadata: {certificateId: req.params.certificateId,renewBeforeDays: req.body.renewBeforeDays.toString(),- commonName: data.commonName+ commonName: data.commonName,+ applicationId: data.applicationId,+ applicationName: data.applicationName}}});diff --git a/backend/src/services/certificate-authority/certificate-authority-service.ts b/backend/src/services/certificate-authority/certificate-authority-service.tsindex 3fd9a2ea7c..9c886d8fcc 100644--- a/backend/src/services/certificate-authority/certificate-authority-service.ts+++ b/backend/src/services/certificate-authority/certificate-authority-service.ts@@ -13,6 +13,7 @@ import {import { getProcessedPermissionRules } from "@app/lib/casl/permission-filter-utils";import { BadRequestError, NotFoundError } from "@app/lib/errors";import { OrgServiceActor, TProjectPermission } from "@app/lib/types";+import { TPkiApplicationDALFactory } from "@app/services/pki-application/pki-application-dal";import { CertKeySource } from "@app/services/signer/signer-enums";import { TAppConnectionDALFactory } from "../app-connection/app-connection-dal";@@ -152,6 +153,7 @@ type TCertificateAuthorityServiceFactoryDep = {pkiSyncDAL: Pick<TPkiSyncDALFactory, "find">;pkiSyncQueue: Pick<TPkiSyncQueueFactory, "queuePkiSyncSyncCertificatesById">;certificateProfileDAL?: Pick<TCertificateProfileDALFactory, "findById" | "findByIdWithConfigs">;+ pkiApplicationDAL: Pick<TPkiApplicationDALFactory, "findById">;certificateRequestDAL: Pick<TCertificateRequestDALFactory,"findById" | "updateById" | "transitionFromPending" | "attachCertificate" | "setPendingMessage"@@ -185,6 +187,7 @@ export const certificateAuthorityServiceFactory = ({pkiSyncQueue,certificateProfileDAL,certificateRequestDAL,+ pkiApplicationDAL,resourceMetadataDAL,gatewayV2Service,gatewayPoolService,@@ -1483,7 +1486,14 @@ export const certificateAuthorityServiceFactory = ({certificateRequest);- return { ...result, projectId: certificateRequest.projectId };+ return {+ ...result,+ projectId: certificateRequest.projectId,+ applicationId: certificateRequest.applicationId,+ applicationName: certificateRequest.applicationId+ ? ((await pkiApplicationDAL.findById(certificateRequest.applicationId))?.name ?? null)+ : null+ };};return {diff --git a/backend/src/services/certificate-inventory-view/certificate-inventory-view-service.ts b/backend/src/services/certificate-inventory-view/certificate-inventory-view-service.tsindex d5eee7f376..9687ea225c 100644--- a/backend/src/services/certificate-inventory-view/certificate-inventory-view-service.ts+++ b/backend/src/services/certificate-inventory-view/certificate-inventory-view-service.ts@@ -8,6 +8,7 @@ import { TPermissionServiceFactory } from "../../ee/services/permission/permissiimport { ProjectPermissionActions, ProjectPermissionSub } from "../../ee/services/permission/project-permission";import { ResourcePermissionSub } from "../../ee/services/permission/resource-permission";import { NON_PQC_KEY_ALGORITHMS, PQC_KEY_ALGORITHMS } from "../certificate/certificate-dal";+import { TPkiApplicationDALFactory } from "../pki-application/pki-application-dal";import { TCertificateInventoryViewDALFactory } from "./certificate-inventory-view-dal";import {TCreateInventoryViewDTO,@@ -93,6 +94,7 @@ const SYSTEM_VIEWS: TSystemView[] = [type TCertificateInventoryViewServiceFactoryDep = {certificateInventoryViewDAL: TCertificateInventoryViewDALFactory;+ pkiApplicationDAL: Pick<TPkiApplicationDALFactory, "findById">;permissionService: Pick<TPermissionServiceFactory, "getProjectPermission" | "getResourcePermission">;};@@ -100,6 +102,7 @@ export type TCertificateInventoryViewServiceFactory = ReturnType<typeof certificexport const certificateInventoryViewServiceFactory = ({certificateInventoryViewDAL,+ pkiApplicationDAL,permissionService}: TCertificateInventoryViewServiceFactoryDep) => {const assertCanActOnView = async (@@ -166,6 +169,12 @@ export const certificateInventoryViewServiceFactory = ({};};+ const $resolveApplicationName = async (applicationId?: string | null) => {+ if (!applicationId) return null;+ const application = await pkiApplicationDAL.findById(applicationId);+ return application?.name ?? null;+ };+const createView = async ({projectId,applicationId,@@ -200,7 +209,7 @@ export const certificateInventoryViewServiceFactory = ({isShared});- return view;+ return { ...view, applicationName: await $resolveApplicationName(view.applicationId) };} catch (error) {if (error instanceof DatabaseError && (error.error as { code?: string })?.code === "23505") {throw new BadRequestError({@@ -253,7 +262,7 @@ export const certificateInventoryViewServiceFactory = ({...(isShared !== undefined && { isShared })});- return view;+ return { ...view, applicationName: await $resolveApplicationName(view.applicationId) };} catch (error) {if (error instanceof DatabaseError && (error.error as { code?: string })?.code === "23505") {throw new BadRequestError({@@ -290,7 +299,7 @@ export const certificateInventoryViewServiceFactory = ({await certificateInventoryViewDAL.deleteById(viewId);- return existing;+ return { ...existing, applicationName: await $resolveApplicationName(existing.applicationId) };};return {diff --git a/backend/src/services/certificate-request/certificate-request-service.test.ts b/backend/src/services/certificate-request/certificate-request-service.test.tsindex 0fa749efc6..e4e0586e4c 100644--- a/backend/src/services/certificate-request/certificate-request-service.test.ts+++ b/backend/src/services/certificate-request/certificate-request-service.test.ts@@ -68,6 +68,7 @@ describe("CertificateRequestService", () => {service = certificateRequestServiceFactory({certificateRequestDAL: mockCertificateRequestDAL as TCertificateRequestDALFactory,certificateDAL: mockCertificateDAL,+ pkiApplicationDAL: { findById: vi.fn().mockResolvedValue(undefined) } as never,certificateService: mockCertificateService,permissionService: mockPermissionService,resourceMetadataDAL: { find: vi.fn().mockResolvedValue([]), insertMany: vi.fn() },diff --git a/backend/src/services/certificate-request/certificate-request-service.ts b/backend/src/services/certificate-request/certificate-request-service.tsindex bba5591ba4..7a78fe806d 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 { QueueName, TQueueServiceFactory } from "@app/queue";import { TCertificateDALFactory } from "@app/services/certificate/certificate-dal";import { TCertificateServiceFactory } from "@app/services/certificate/certificate-service";import { domainComponentsSchema } from "@app/services/certificate-common/certificate-constants";+import { TPkiApplicationDALFactory } from "@app/services/pki-application/pki-application-dal";import { ActorAuthMethod, ActorType } from "../auth/auth-type";import { TIdentityDALFactory } from "../identity/identity-dal";@@ -39,6 +40,7 @@ import {type TCertificateRequestServiceFactoryDep = {certificateRequestDAL: TCertificateRequestDALFactory;certificateDAL: Pick<TCertificateDALFactory, "findById">;+ pkiApplicationDAL: Pick<TPkiApplicationDALFactory, "findById">;certificateService: Pick<TCertificateServiceFactory, "getCertBody" | "getCertPrivateKey">;permissionService: Pick<TPermissionServiceFactory, "getProjectPermission" | "getResourcePermission">;resourceMetadataDAL: Pick<TResourceMetadataDALFactory, "find" | "insertMany">;@@ -135,6 +137,7 @@ const validateCertificateRequestData = (data: unknown) => {export const certificateRequestServiceFactory = ({certificateRequestDAL,certificateDAL,+ pkiApplicationDAL,certificateService,permissionService,resourceMetadataDAL,@@ -142,6 +145,12 @@ export const certificateRequestServiceFactory = ({userDAL,identityDAL}: TCertificateRequestServiceFactoryDep) => {+ const $resolveApplicationName = async (applicationId?: string | null) => {+ if (!applicationId) return null;+ const application = await pkiApplicationDAL.findById(applicationId);+ return application?.name ?? null;+ };+const createCertificateRequest = async ({acmeOrderId,actor,@@ -427,7 +436,9 @@ export const certificateRequestServiceFactory = ({createdAt: certificateRequest.createdAt,updatedAt: certificateRequest.updatedAt},- projectId: certificateRequest.projectId+ projectId: certificateRequest.projectId,+ applicationId: certificateRequest.applicationId,+ applicationName: await $resolveApplicationName(certificateRequest.applicationId)};};@@ -621,7 +632,9 @@ export const certificateRequestServiceFactory = ({projectId: certificateRequest.projectId,cancelled: false,previousStatus,- previousPendingMessage+ previousPendingMessage,+ applicationId: certificateRequest.applicationId,+ applicationName: await $resolveApplicationName(certificateRequest.applicationId)};}@@ -650,7 +663,9 @@ export const certificateRequestServiceFactory = ({projectId: certificateRequest.projectId,cancelled: false,previousStatus,- previousPendingMessage+ previousPendingMessage,+ applicationId: certificateRequest.applicationId,+ applicationName: await $resolveApplicationName(certificateRequest.applicationId)};}@@ -686,7 +701,9 @@ export const certificateRequestServiceFactory = ({projectId: certificateRequest.projectId,cancelled: true,previousStatus,- previousPendingMessage+ previousPendingMessage,+ applicationId: certificateRequest.applicationId,+ applicationName: await $resolveApplicationName(certificateRequest.applicationId)};};diff --git a/backend/src/services/certificate-v3/certificate-renewal-service.ts b/backend/src/services/certificate-v3/certificate-renewal-service.tsindex bb1a054083..fd4660d540 100644--- a/backend/src/services/certificate-v3/certificate-renewal-service.ts+++ b/backend/src/services/certificate-v3/certificate-renewal-service.ts@@ -80,6 +80,7 @@ import {import { TCertificateRequestServiceFactory } from "../certificate-request/certificate-request-service";import { CertificateRequestStatus } from "../certificate-request/certificate-request-types";import { TCertificateSyncDALFactory } from "../certificate-sync/certificate-sync-dal";+import { TPkiApplicationDALFactory } from "../pki-application/pki-application-dal";import { TPkiApplicationProfileDALFactory } from "../pki-application/pki-application-profile-dal";import { TPkiSyncDALFactory } from "../pki-sync/pki-sync-dal";import { TPkiSyncQueueFactory } from "../pki-sync/pki-sync-queue";@@ -144,6 +145,7 @@ type TCertificateRenewalServiceFactoryDep = {certificateRequestDAL: Pick<TCertificateRequestDALFactory, "attachCertificate" | "transitionFromPending">;resourceMetadataDAL: Pick<TResourceMetadataDALFactory, "insertMany" | "delete" | "find">;pkiAlertV2Queue?: Pick<TPkiAlertV2QueueServiceFactory, "queueCertificateEvent">;+ pkiApplicationDAL: Pick<TPkiApplicationDALFactory, "findById">;pkiApplicationProfileDAL: Pick<TPkiApplicationProfileDALFactory,"findAllByProfileId" | "findOneByApplicationAndProfile"@@ -211,6 +213,7 @@ export const certificateRenewalServiceFactory = ({certificateRequestDAL,resourceMetadataDAL,pkiAlertV2Queue,+ pkiApplicationDAL,pkiApplicationProfileDAL,apiEnrollmentConfigDAL,licenseService,@@ -1004,6 +1007,12 @@ export const certificateRenewalServiceFactory = ({});};+ const $resolveApplicationName = async (applicationId?: string | null) => {+ if (!applicationId) return null;+ const application = await pkiApplicationDAL.findById(applicationId);+ return application?.name ?? null;+ };+const renewCertificate = async ({certificateId,actor,@@ -1302,12 +1311,22 @@ export const certificateRenewalServiceFactory = ({actorOrgId,removeRootsFromChain});- return { ...response, changedAttributes };+ return {+ ...response,+ changedAttributes,+ applicationId: renewalResult.originalCert.applicationId,+ applicationName: await $resolveApplicationName(renewalResult.originalCert.applicationId)+ };}if (renewalResult.renewalMode === CertificateRenewalMode.InternalCa) {const response = await $completeInternalCaRenewal({ ...renewalResult, actorCtx, removeRootsFromChain });- return { ...response, changedAttributes };+ return {+ ...response,+ changedAttributes,+ applicationId: renewalResult.originalCert.applicationId,+ applicationName: await $resolveApplicationName(renewalResult.originalCert.applicationId)+ };}if (renewalResult.renewalMode === CertificateRenewalMode.ExternalCa) {@@ -1398,7 +1417,9 @@ export const certificateRenewalServiceFactory = ({projectId: originalCert.projectId,profileName: profile?.slug || "External CA Profile",commonName: renewalRequest.commonName || "",- changedAttributes+ changedAttributes,+ applicationId: originalCert.applicationId,+ applicationName: await $resolveApplicationName(originalCert.applicationId)};}@@ -1535,7 +1556,9 @@ export const certificateRenewalServiceFactory = ({return {projectId: certificate.projectId,renewBeforeDays,- commonName: certificate.commonName || ""+ commonName: certificate.commonName || "",+ applicationId: certificate.applicationId,+ applicationName: await $resolveApplicationName(certificate.applicationId)};};@@ -1558,7 +1581,9 @@ export const certificateRenewalServiceFactory = ({return {projectId: certificate.projectId,- commonName: certificate.commonName || ""+ commonName: certificate.commonName || "",+ applicationId: certificate.applicationId,+ applicationName: await $resolveApplicationName(certificate.applicationId)};};diff --git a/backend/src/services/certificate-v3/certificate-v3-queue.ts b/backend/src/services/certificate-v3/certificate-v3-queue.tsindex dc705e0baa..bafc10f368 100644--- a/backend/src/services/certificate-v3/certificate-v3-queue.ts+++ b/backend/src/services/certificate-v3/certificate-v3-queue.ts@@ -105,6 +105,8 @@ export const certificateV3QueueServiceFactory = ({profileId: certificate.profileId!,renewBeforeDays: certificate.renewBeforeDays?.toString() || "",profileName: certificate.profileName || "",+ applicationId: certificate.applicationId,+ applicationName: certificate.applicationName,status: renewed.status}}@@ -126,6 +128,8 @@ export const certificateV3QueueServiceFactory = ({profileId: certificate.profileId || "",renewBeforeDays: certificate.renewBeforeDays?.toString() || "",profileName: certificate.profileName || "",+ applicationId: certificate.applicationId,+ applicationName: certificate.applicationName,error: errorMessage}}diff --git a/backend/src/services/certificate-v3/certificate-v3-service.test.ts b/backend/src/services/certificate-v3/certificate-v3-service.test.tsindex 77c8e60746..a444a91234 100644--- a/backend/src/services/certificate-v3/certificate-v3-service.test.ts+++ b/backend/src/services/certificate-v3/certificate-v3-service.test.ts@@ -356,6 +356,9 @@ describe("CertificateV3Service", () => {findAllByProfileId: vi.fn().mockResolvedValue([]),findOneByApplicationAndProfile: vi.fn().mockResolvedValue(undefined)} as never,+ pkiApplicationDAL: {+ findById: vi.fn().mockResolvedValue(undefined)+ } as never,apiEnrollmentConfigDAL: {findById: vi.fn().mockResolvedValue(undefined)},diff --git a/backend/src/services/certificate-v3/certificate-v3-service.ts b/backend/src/services/certificate-v3/certificate-v3-service.tsindex e4094c67ba..14566ad7c2 100644--- a/backend/src/services/certificate-v3/certificate-v3-service.ts+++ b/backend/src/services/certificate-v3/certificate-v3-service.ts@@ -98,6 +98,7 @@ import {import { TCertificateRequestServiceFactory } from "../certificate-request/certificate-request-service";import { CertificateRequestStatus } from "../certificate-request/certificate-request-types";import { TCertificateSyncDALFactory } from "../certificate-sync/certificate-sync-dal";+import { TPkiApplicationDALFactory } from "../pki-application/pki-application-dal";import { TPkiApplicationProfileDALFactory } from "../pki-application/pki-application-profile-dal";import { TPkiSyncDALFactory } from "../pki-sync/pki-sync-dal";import { TPkiSyncQueueFactory } from "../pki-sync/pki-sync-queue";@@ -173,6 +174,7 @@ type TCertificateV3ServiceFactoryDep = {TPkiApplicationProfileDALFactory,"findAllByProfileId" | "findOneByApplicationAndProfile">;+ pkiApplicationDAL: Pick<TPkiApplicationDALFactory, "findById">;apiEnrollmentConfigDAL: Pick<TApiEnrollmentConfigDALFactory, "findById">;licenseService: Pick<TLicenseServiceFactory, "getPlan">;usageCounterDAL: Pick<@@ -338,6 +340,7 @@ export const certificateV3ServiceFactory = ({resourceMetadataDAL,pkiAlertV2Queue,pkiApplicationProfileDAL,+ pkiApplicationDAL,apiEnrollmentConfigDAL,licenseService,usageCounterDAL,@@ -522,7 +525,7 @@ export const certificateV3ServiceFactory = ({return actor === ActorType.IDENTITY && policy?.bypassForMachineIdentities === true;};- const issueCertificateFromProfile = async ({+ const $issueCertificateFromProfile = async ({profileId,certificateRequest,metadata,@@ -1213,7 +1216,7 @@ export const certificateV3ServiceFactory = ({};};- const signCertificateFromProfile = async ({+ const $signCertificateFromProfile = async ({profileId,csr,validity,@@ -1676,7 +1679,7 @@ export const certificateV3ServiceFactory = ({};};- const orderCertificate = async ({+ const $orderCertificate = async ({profileId,certificateOrder,metadata,@@ -2140,7 +2143,15 @@ export const certificateV3ServiceFactory = ({updatedMetadata = metadata;}- return { metadata: updatedMetadata, projectId: certificate.projectId, commonName: certificate.commonName };+ return {+ metadata: updatedMetadata,+ projectId: certificate.projectId,+ commonName: certificate.commonName,+ applicationId: certificate.applicationId,+ applicationName: certificate.applicationId+ ? ((await pkiApplicationDAL.findById(certificate.applicationId))?.name ?? null)+ : null+ };};const renewalService = certificateRenewalServiceFactory({@@ -2163,6 +2174,7 @@ export const certificateV3ServiceFactory = ({resourceMetadataDAL,pkiAlertV2Queue,pkiApplicationProfileDAL,+ pkiApplicationDAL,apiEnrollmentConfigDAL,licenseService,quotaDeps: $quotaDeps,@@ -2171,6 +2183,21 @@ export const certificateV3ServiceFactory = ({reportCertificateIssued: $reportCertificateIssued});+ const $withApplicationName = async <T>(applicationId: string | undefined, result: T) => {+ if (!applicationId) return result;+ const application = await pkiApplicationDAL.findById(applicationId);+ return { ...result, applicationName: application?.name };+ };++ const issueCertificateFromProfile = async (dto: Parameters<typeof $issueCertificateFromProfile>[0]) =>+ $withApplicationName(dto.applicationId, await $issueCertificateFromProfile(dto));++ const signCertificateFromProfile = async (dto: Parameters<typeof $signCertificateFromProfile>[0]) =>+ $withApplicationName(dto.applicationId, await $signCertificateFromProfile(dto));++ const orderCertificate = async (dto: Parameters<typeof $orderCertificate>[0]) =>+ $withApplicationName(dto.applicationId, await $orderCertificate(dto));+return {...renewalService,issueCertificateFromProfile,diff --git a/backend/src/services/certificate-v3/certificate-v3-types.ts b/backend/src/services/certificate-v3/certificate-v3-types.tsindex 72a79bb3fc..06916294f6 100644--- a/backend/src/services/certificate-v3/certificate-v3-types.ts+++ b/backend/src/services/certificate-v3/certificate-v3-types.ts@@ -98,6 +98,8 @@ export type TOrderCertificateFromProfileDTO = {export type TCertificateIssuanceResponse = {status: CertificateRequestStatus;+ applicationId?: string | null;+ applicationName?: string | null;certificateRequestId: string;projectId: string;profileName: string;@@ -179,12 +181,16 @@ export type TDisableRenewalConfigDTO = {} & Omit<TProjectPermission, "projectId">;export type TRenewalConfigResponse = {+ applicationId?: string | null;+ applicationName?: string | null;projectId: string;renewBeforeDays: number;commonName: string;};export type TDisableRenewalResponse = {+ applicationId?: string | null;+ applicationName?: string | null;projectId: string;commonName: string;};diff --git a/backend/src/services/certificate/certificate-dal.ts b/backend/src/services/certificate/certificate-dal.tsindex e9897d95eb..28e094a1a7 100644--- a/backend/src/services/certificate/certificate-dal.ts+++ b/backend/src/services/certificate/certificate-dal.ts@@ -557,7 +557,7 @@ export const certificateDALFactory = (db: TDbClient) => {}: {limit: number;offset: number;- }): Promise<(TCertificates & { profileName?: string })[]> => {+ }): Promise<(TCertificates & { profileName?: string; applicationName?: string | null })[]> => {try {const now = new Date();const endOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);@@ -566,11 +566,13 @@ export const certificateDALFactory = (db: TDbClient) => {.replicaNode()(TableName.Certificate).select(selectAllTableCols(TableName.Certificate)).select(db.ref("slug").withSchema(TableName.PkiCertificateProfile).as("profileName"))+ .select(db.ref("name").withSchema(TableName.PkiApplication).as("applicationName")).leftJoin(TableName.PkiCertificateProfile,`${TableName.Certificate}.profileId`,`${TableName.PkiCertificateProfile}.id`)+ .leftJoin(TableName.PkiApplication, `${TableName.Certificate}.applicationId`, `${TableName.PkiApplication}.id`).innerJoin(TableName.CertificateSecret, `${TableName.Certificate}.id`, `${TableName.CertificateSecret}.certId`).where(`${TableName.Certificate}.status`, CertStatus.ACTIVE).whereNull(`${TableName.Certificate}.renewedByCertificateId`)diff --git a/backend/src/services/certificate/certificate-service.ts b/backend/src/services/certificate/certificate-service.tsindex f6352e71a3..9edae02f5d 100644--- a/backend/src/services/certificate/certificate-service.ts+++ b/backend/src/services/certificate/certificate-service.ts@@ -212,6 +212,12 @@ export const certificateServiceFactory = ({/*** Return details for certificate with serial number [serialNumber]*/+ const $resolveApplicationName = async (applicationId?: string | null) => {+ if (!applicationId) return null;+ const application = await pkiApplicationDAL.findById(applicationId);+ return application?.name ?? null;+ };+const getCert = async ({ id, serialNumber, actorId, actorAuthMethod, actor, actorOrgId }: TGetCertDTO) => {// Validation: require either id or serialNumberif (!id && !serialNumber) {@@ -419,6 +425,7 @@ export const certificateServiceFactory = ({return {cert,+ applicationName: await $resolveApplicationName(cert.applicationId),certPrivateKey};};@@ -514,7 +521,8 @@ export const certificateServiceFactory = ({usageMeteringService.emitForProject(cert.projectId, WildcardCerts.key);return {- deletedCert+ deletedCert,+ applicationName: await $resolveApplicationName(deletedCert.applicationId)};};@@ -748,7 +756,7 @@ export const certificateServiceFactory = ({}: expandInternalCa(ca);- return { revokedAt, cert, ca: caResult };+ return { revokedAt, cert, applicationName: await $resolveApplicationName(cert.applicationId), ca: caResult };};/**@@ -841,7 +849,8 @@ export const certificateServiceFactory = ({certificate: certObj.toString("pem"),certificateChain,serialNumber: certObj.serialNumber,- cert+ cert,+ applicationName: await $resolveApplicationName(cert.applicationId)};};@@ -1375,6 +1384,7 @@ export const certificateServiceFactory = ({privateKey: privateKeyPem,serialNumber,cert,+ applicationName: await $resolveApplicationName(cert.applicationId),profileName: linkage?.profileName ?? null,caName: linkage?.caName ?? null};@@ -1512,7 +1522,8 @@ export const certificateServiceFactory = ({certificateChain,privateKey,serialNumber: cert.serialNumber,- cert+ cert,+ applicationName: await $resolveApplicationName(cert.applicationId)};};@@ -1599,7 +1610,8 @@ export const certificateServiceFactory = ({return {pkcs12Data,- cert+ cert,+ applicationName: await $resolveApplicationName(cert.applicationId)};};diff --git a/backend/src/services/pki-alert-v2/pki-alert-v2-dal.ts b/backend/src/services/pki-alert-v2/pki-alert-v2-dal.tsindex d0aec76d8c..aee9ebe52f 100644--- a/backend/src/services/pki-alert-v2/pki-alert-v2-dal.ts+++ b/backend/src/services/pki-alert-v2/pki-alert-v2-dal.ts@@ -34,6 +34,7 @@ export type TLastRunData = {};export type TAlertWithChannels = TPkiAlertsV2 & {+ applicationName?: string | null;channels: TChannelResult[];lastRunData: TLastRunData | null;};@@ -100,8 +101,10 @@ export const pkiAlertV2DALFactory = (db: TDbClient) => {try {const [alert] = (await (tx || db.replicaNode()).select(selectAllTableCols(TableName.PkiAlertsV2))+ .select(db.ref("name").withSchema(TableName.PkiApplication).as("applicationName")).from(TableName.PkiAlertsV2)- .where(`${TableName.PkiAlertsV2}.id`, alertId)) as TPkiAlertsV2[];+ .leftJoin(TableName.PkiApplication, `${TableName.PkiAlertsV2}.applicationId`, `${TableName.PkiApplication}.id`)+ .where(`${TableName.PkiAlertsV2}.id`, alertId)) as (TPkiAlertsV2 & { applicationName?: string | null })[];if (!alert) return null;diff --git a/backend/src/services/pki-alert-v2/pki-alert-v2-service.ts b/backend/src/services/pki-alert-v2/pki-alert-v2-service.tsindex 175b4ca5cb..e1f60a3d98 100644--- a/backend/src/services/pki-alert-v2/pki-alert-v2-service.ts+++ b/backend/src/services/pki-alert-v2/pki-alert-v2-service.ts@@ -169,6 +169,7 @@ export const pkiAlertV2ServiceFactory = ({enabled: alert.enabled ?? true,projectId: alert.projectId,applicationId: alert.applicationId ?? null,+ applicationName: alert.applicationName ?? null,channels: (alert.channels || []).map((channel) => {const config = decryptChannelConfig<TChannelConfig>(channel, decryptor);diff --git a/backend/src/services/pki-alert-v2/pki-alert-v2-types.ts b/backend/src/services/pki-alert-v2/pki-alert-v2-types.tsindex da50962342..78f70aef6d 100644--- a/backend/src/services/pki-alert-v2/pki-alert-v2-types.ts+++ b/backend/src/services/pki-alert-v2/pki-alert-v2-types.ts@@ -346,6 +346,7 @@ export type TLastRun = {};export type TAlertV2Response = {+ applicationName?: string | null;id: string;name: string;description: string | null;diff --git a/backend/src/services/pki-application/pki-application-service.ts b/backend/src/services/pki-application/pki-application-service.tsindex b5278d01ca..57333ae927 100644--- a/backend/src/services/pki-application/pki-application-service.ts+++ b/backend/src/services/pki-application/pki-application-service.ts@@ -217,11 +217,6 @@ export const pkiApplicationServiceFactory = ({return application;};- const getApplicationNameById = async (applicationId: string) => {- const application = await pkiApplicationDAL.findById(applicationId);- return application?.name;- };-const getApplicationByName = async ({name,projectId,@@ -477,7 +472,7 @@ export const pkiApplicationServiceFactory = ({);}- return pkiApplicationDAL.transaction(async (tx) => {+ const profiles = await pkiApplicationDAL.transaction(async (tx) => {const existing = await pkiApplicationProfileDAL.findByApplicationId(applicationId, tx);const existingProfileIds = new Set(existing.map((row) => row.profileId));const toAttach = profileIds.filter((id) => !existingProfileIds.has(id));@@ -491,6 +486,8 @@ export const pkiApplicationServiceFactory = ({return pkiApplicationProfileDAL.findByApplicationId(applicationId, tx);});++ return { profiles, applicationName: application.name };};const detachProfile = async ({@@ -543,7 +540,7 @@ export const pkiApplicationServiceFactory = ({);await pkiApplicationProfileDAL.delete({ applicationId, profileId });- return { applicationId, profileId };+ return { applicationId, applicationName: application.name, profileId };};const getApplicationPermissions = async ({@@ -581,7 +578,6 @@ export const pkiApplicationServiceFactory = ({createApplication,getApplicationById,getApplicationByName,- getApplicationNameById,listApplications,updateApplication,deleteApplication,