Revize 94e89bb1

Re #8576 - calling CryptographyService from CrlService, passphrase support

src/services/crl/crl_service.py

@@ -3 +3 @@
 from injector import inject
 
 from src.dao.certificate_repository import CertificateRepository
+from src.dao.private_key_repository import PrivateKeyRepository
 from src.exceptions.certificate_not_found_exception import CertificateNotFoundException
+from src.exceptions.private_key_not_found_exception import PrivateKeyNotFoundException
 from src.services.crl.ca_index_file_line_generator import create_index_file_revoked_line
 from src.services.cryptography import CryptographyService
 from src.utils.temporary_file import TemporaryFile
@@ -13 +15 @@
     @inject
     def __init__(self,
                  certificate_repository: CertificateRepository,
+                 key_repository: PrivateKeyRepository,
                  cryptography_service: CryptographyService
                  ):
+        self.key_repository = key_repository
         self.certificate_repository = certificate_repository
         self.cryptography_service = cryptography_service
 
@@ -53 +57 @@
         :param ca_id: ID of a CA whose CRL shall be generated
         :return: CRL in PEM format
         """
-        # check if the requested CA exists and if not throw an exception
-        if self.certificate_repository.read(ca_id) is None:
+        # get cert and check if the requested CA exists and if not throw an exception
+        cert = self.certificate_repository.read(ca_id)
+        if cert is None:
             raise CertificateNotFoundException(ca_id)
 
+        # get key and check if it exists
+        key = self.key_repository.read(cert.private_key_id)
+        if key is None:
+            raise PrivateKeyNotFoundException(ca_id)
+
         # Create an index file and call cryptography service to generate CRL
-        with TemporaryFile("crl.index", self.create_revoked_index(ca_id)) as index_path:
-            crl_content = self.cryptography_service.generate_crl(index_path)
+        with TemporaryFile("crl.index", f"{self.create_revoked_index(ca_id)}\n") as index_path:
+            crl_content = self.cryptography_service.generate_crl(cert, key, index_path)
 
         return crl_content