From c06c6c6c61111f59aca89200d6b586d2f955c17c Mon Sep 17 00:00:00 2001 From: Carlos Monastyrski Date: Thu, 17 Jul 2025 10:28:31 -0300 Subject: [PATCH] On importCertToCa use serialNumber instead of dn to get the parentCa --- .../certificate-authority/certificate-authority-dal.ts | 2 +- .../internal/internal-certificate-authority-service.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/services/certificate-authority/certificate-authority-dal.ts b/backend/src/services/certificate-authority/certificate-authority-dal.ts index d5a45ce50..352675441 100644 --- a/backend/src/services/certificate-authority/certificate-authority-dal.ts +++ b/backend/src/services/certificate-authority/certificate-authority-dal.ts @@ -218,7 +218,7 @@ export const certificateAuthorityDALFactory = (db: TDbClient) => { }; const findWithAssociatedCa = async ( - filter: Parameters<(typeof caOrm)["find"]>[0] & { dn?: string; type?: string }, + filter: Parameters<(typeof caOrm)["find"]>[0] & { dn?: string; type?: string; serialNumber?: string }, { offset, limit, sort = [["createdAt", "desc"]] }: TFindOpt = {}, tx?: Knex ) => { diff --git a/backend/src/services/certificate-authority/internal/internal-certificate-authority-service.ts b/backend/src/services/certificate-authority/internal/internal-certificate-authority-service.ts index 6668c806c..80201eab6 100644 --- a/backend/src/services/certificate-authority/internal/internal-certificate-authority-service.ts +++ b/backend/src/services/certificate-authority/internal/internal-certificate-authority-service.ts @@ -1068,11 +1068,11 @@ export const internalCertificateAuthorityServiceFactory = ({ throw new BadRequestError({ message: "Invalid certificate chain" }); const parentCertObj = chainItems[1]; - const parentCertSubject = parentCertObj.subject; + const parentSerialNumber = parentCertObj.serialNumber; const [parentCa] = await certificateAuthorityDAL.findWithAssociatedCa({ [`${TableName.CertificateAuthority}.projectId` as "projectId"]: ca.projectId, - [`${TableName.InternalCertificateAuthority}.dn` as "dn"]: parentCertSubject + [`${TableName.InternalCertificateAuthority}.serialNumber` as "serialNumber"]: parentSerialNumber }); const certificateManagerKmsId = await getProjectKmsCertificateKeyId({