Resolve PR issues

backend/src/services/certificate-authority/certificate-authority-service.ts

@@ -2,11 +2,12 @@
 import { ForbiddenError } from "@casl/ability";
 import * as x509 from "@peculiar/x509";
 import crypto, { KeyObject } from "crypto";
+import ms from "ms";
 
 import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service";
 import { ProjectPermissionActions, ProjectPermissionSub } from "@app/ee/services/permission/project-permission";
 import { BadRequestError } from "@app/lib/errors";
-import { TCertificateCertDALFactory } from "@app/services/certificate/certificate-cert-dal";
+import { TCertificateBodyDALFactory } from "@app/services/certificate/certificate-body-dal";
 import { TCertificateDALFactory } from "@app/services/certificate/certificate-dal";
 import { TKmsServiceFactory } from "@app/services/kms/kms-service";
 import { TProjectDALFactory } from "@app/services/project/project-dal";
@@ -50,7 +51,7 @@ type TCertificateAuthorityServiceFactoryDep = {
   certificateAuthorityCrlDAL: Pick<TCertificateAuthorityCrlDALFactory, "create" | "findOne" | "update">;
   certificateAuthorityQueue: TCertificateAuthorityQueueFactory; // TODO: Pick
   certificateDAL: Pick<TCertificateDALFactory, "transaction" | "create" | "find">;
-  certificateCertDAL: Pick<TCertificateCertDALFactory, "create">;
+  certificateBodyDAL: Pick<TCertificateBodyDALFactory, "create">;
   projectDAL: Pick<TProjectDALFactory, "findProjectBySlug" | "findOne" | "updateById" | "findById" | "transaction">;
   kmsService: Pick<TKmsServiceFactory, "generateKmsKey" | "encrypt" | "decrypt">;
   permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
@@ -64,7 +65,7 @@ export const certificateAuthorityServiceFactory = ({
   certificateAuthoritySecretDAL,
   certificateAuthorityCrlDAL,
   certificateDAL,
-  certificateCertDAL,
+  certificateBodyDAL,
   projectDAL,
   kmsService,
   permissionService
@@ -75,6 +76,7 @@ export const certificateAuthorityServiceFactory = ({
   const createCa = async ({
     projectSlug,
     type,
+    friendlyName,
     commonName,
     organization,
     ou,
@@ -127,6 +129,7 @@ export const certificateAuthorityServiceFactory = ({
         : new Date(new Date().setFullYear(new Date().getFullYear() + 10));
 
       const serialNumber = crypto.randomBytes(32).toString("hex");
+
       const ca = await certificateAuthorityDAL.create(
         {
           projectId: project.id,
@@ -136,6 +139,7 @@ export const certificateAuthorityServiceFactory = ({
           country,
           province,
           locality,
+          friendlyName: friendlyName || dn,
           commonName,
           status: type === CaType.ROOT ? CaStatus.ACTIVE : CaStatus.PENDING_CERTIFICATE,
           dn,
@@ -642,6 +646,7 @@ export const certificateAuthorityServiceFactory = ({
    */
   const issueCertFromCa = async ({
     caId,
+    friendlyName,
     commonName,
     ttl,
     notBefore,
@@ -688,8 +693,7 @@ export const certificateAuthorityServiceFactory = ({
     if (notAfter) {
       notAfterDate = new Date(notAfter);
     } else if (ttl) {
-      // ttl in seconds
-      notAfterDate = new Date(new Date().getTime() + ttl * 1000);
+      notAfterDate = new Date(new Date().getTime() + ms(ttl));
     }
 
     const caCertNotBeforeDate = new Date(caCertObj.notBefore);
@@ -760,6 +764,7 @@ export const certificateAuthorityServiceFactory = ({
         {
           caId: ca.id,
           status: CertStatus.ACTIVE,
+          friendlyName: friendlyName || commonName,
           commonName,
           serialNumber,
           notBefore: notBeforeDate,
@@ -768,7 +773,7 @@ export const certificateAuthorityServiceFactory = ({
         tx
       );
 
-      await certificateCertDAL.create(
+      await certificateBodyDAL.create(
         {
           certId: cert.id,
           encryptedCertificate

backend/src/services/certificate-authority/certificate-authority-types.ts

@@ -23,6 +23,7 @@ export enum CaStatus {
 export type TCreateCaDTO = {
   projectSlug: string;
   type: CaType;
+  friendlyName?: string;
   commonName: string;
   organization: string;
   ou: string;
@@ -72,8 +73,9 @@ export type TImportCertToCaDTO = {
 
 export type TIssueCertFromCaDTO = {
   caId: string;
+  friendlyName?: string;
   commonName: string;
-  ttl?: number;
+  ttl: string;
   notBefore?: string;
   notAfter?: string;
 } & Omit<TProjectPermission, "projectId">;

backend/src/services/certificate/certificate-body-dal.ts

@@ -0,0 +1,10 @@
+import { TDbClient } from "@app/db";
+import { TableName } from "@app/db/schemas";
+import { ormify } from "@app/lib/knex";
+
+export type TCertificateBodyDALFactory = ReturnType<typeof certificateBodyDALFactory>;
+
+export const certificateBodyDALFactory = (db: TDbClient) => {
+  const certificateBodyOrm = ormify(db, TableName.CertificateBody);
+  return certificateBodyOrm;
+};

backend/src/services/certificate/certificate-cert-dal.ts

@@ -1,10 +0,0 @@
-import { TDbClient } from "@app/db";
-import { TableName } from "@app/db/schemas";
-import { ormify } from "@app/lib/knex";
-
-export type TCertificateCertDALFactory = ReturnType<typeof certificateCertDALFactory>;
-
-export const certificateCertDALFactory = (db: TDbClient) => {
-  const certificateCertOrm = ormify(db, TableName.CertificateCert);
-  return certificateCertOrm;
-};

backend/src/services/certificate/certificate-service.ts

@@ -3,7 +3,7 @@ import * as x509 from "@peculiar/x509";
 
 import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service";
 import { ProjectPermissionActions, ProjectPermissionSub } from "@app/ee/services/permission/project-permission";
-import { TCertificateCertDALFactory } from "@app/services/certificate/certificate-cert-dal";
+import { TCertificateBodyDALFactory } from "@app/services/certificate/certificate-body-dal";
 import { TCertificateDALFactory } from "@app/services/certificate/certificate-dal";
 import { TCertificateAuthorityCertDALFactory } from "@app/services/certificate-authority/certificate-authority-cert-dal";
 import { TCertificateAuthorityCrlDALFactory } from "@app/services/certificate-authority/certificate-authority-crl-dal";
@@ -19,7 +19,7 @@ import { CertStatus, TDeleteCertDTO, TGetCertCertDTO, TGetCertDTO, TRevokeCertDT
 
 type TCertificateServiceFactoryDep = {
   certificateDAL: Pick<TCertificateDALFactory, "findOne" | "deleteById" | "update" | "find">;
-  certificateCertDAL: Pick<TCertificateCertDALFactory, "findOne">;
+  certificateBodyDAL: Pick<TCertificateBodyDALFactory, "findOne">;
   certificateAuthorityDAL: Pick<TCertificateAuthorityDALFactory, "findById">;
   certificateAuthorityCertDAL: Pick<TCertificateAuthorityCertDALFactory, "findOne">;
   certificateAuthorityCrlDAL: Pick<TCertificateAuthorityCrlDALFactory, "update">;
@@ -33,7 +33,7 @@ export type TCertificateServiceFactory = ReturnType<typeof certificateServiceFac
 
 export const certificateServiceFactory = ({
   certificateDAL,
-  certificateCertDAL,
+  certificateBodyDAL,
   certificateAuthorityDAL,
   certificateAuthorityCertDAL,
   certificateAuthorityCrlDAL,
@@ -155,7 +155,7 @@ export const certificateServiceFactory = ({
 
     ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Read, ProjectPermissionSub.Certificates);
 
-    const certCert = await certificateCertDAL.findOne({ certId: cert.id });
+    const certCert = await certificateBodyDAL.findOne({ certId: cert.id });
 
     const keyId = await getProjectKmsCertificateKeyId({
       projectId: ca.projectId,