Revize 894cc2cd

Re #8590 - Modified methods due to fields of subject implemented

src/services/certificate_service.py

@@ -113 +113 @@
         not_after_formatted = time.strftime(VALID_FROM_TO_DATE_FORMAT, not_after)
 
         # create a certificate wrapper
-        certificate = Certificate(-1, subj.common_name, not_before_formatted, not_after_formatted, cert_pem,
-                                  private_key_id, cert_type, parent_id, usages)
+        certificate = Certificate(-1, not_before_formatted, not_after_formatted, cert_pem, cert_type, parent_id,
+                                  private_key_id, usages, subj.common_name, subj.country, subj.locality, subj.state,
+                                  subj.organization, subj.organization_unit, subj.email_address)
 
         return certificate
 
@@ -158 +159 @@
                                                         sn=cert_id)
 
         # wrap into Certificate class
-        self.__create_wrapper(cert_pem, subject_key.private_key_id, usages,
-                              issuer_cert.certificate_id, INTERMEDIATE_CA_ID)
-
-        # parse the generated pem for subject and notBefore/notAfter fields
-        subj, not_before, not_after = self.cryptography_service.parse_cert_pem(cert_pem)
-
-        # format the parsed date
-        not_before_formatted = time.strftime(VALID_FROM_TO_DATE_FORMAT, not_before)
-        not_after_formatted = time.strftime(VALID_FROM_TO_DATE_FORMAT, not_after)
-
-        # create a certificate wrapper
-        certificate = Certificate(-1, subject.common_name, not_before_formatted, not_after_formatted, cert_pem,
-                                  subject_key.private_key_id, INTERMEDIATE_CA_ID, issuer_cert.certificate_id, usages)
+        certificate = self.__create_wrapper(cert_pem, subject_key.private_key_id, usages,
+                                            issuer_cert.certificate_id, INTERMEDIATE_CA_ID)
 
         # store the wrapper into the repository
         created_id = self.certificate_repository.create(certificate)
@@ -405 +395 @@
 
         Logger.debug("Function launched.")
 
-        (subject, _, _) = self.cryptography_service.parse_cert_pem(certificate.pem_data)
+        subject = Subject(certificate.common_name,
+                          certificate.country_code,
+                          certificate.locality,
+                          certificate.province,
+                          certificate.organization,
+                          certificate.organizational_unit,
+                          certificate.email_address)
         return subject
 
     def get_public_key_from_certificate(self, certificate: Certificate):