Revize 5cd65ab4

Re #8577 - Minor refactoring (crl -> crl_ocsp).

src/controllers/crl_ocsp_controller.py

@@ -4 +4 @@
 
 from src.exceptions.certificate_not_found_exception import CertificateNotFoundException
 from src.exceptions.private_key_not_found_exception import PrivateKeyNotFoundException
-from src.services.crl.crl_service import CrlService
+from src.services.crl_ocsp.crl_ocsp_service import CrlOcspService
 from src.controllers.return_codes import *
 
 E_WRONG_PARAMETERS = {"success": False, "data": "Invalid request, wrong parameters."}
@@ -14 +14 @@
 class CrlOcspController:
 
     @inject
-    def __init__(self, crl_service: CrlService):
+    def __init__(self, crl_service: CrlOcspService):
         self.crl_service = crl_service
 
     def get_crl(self, ca_id: str):
@@ -32 +32 @@
         # generate the CRL
         try:
             crl = self.crl_service.generate_crl_response(identifier)
-        except (CertificateNotFoundException, PrivateKeyNotFoundException):
+        except CertificateNotFoundException:
             return E_NO_CERTIFICATES_FOUND, C_NOT_FOUND
 
         return Response(crl, mimetype="application/x-x509-ca-cert",
@@ -64 +64 @@
 
         try:
             ocsp_response = self.crl_service.generate_ocsp_response(ca_id, der_ocsp_request)
-        except CertificateNotFoundException or PrivateKeyNotFoundException:
+        except CertificateNotFoundException:
             return E_NO_CERTIFICATES_FOUND, C_NOT_FOUND
 
         return Response(ocsp_response, mimetype="application/ocsp-response")

tests/integration_tests/services/conftest.py

@@ -10 +10 @@
 from src.dao.private_key_repository import PrivateKeyRepository
 from src.db.init_queries import SCHEMA_SQL, DEFAULT_VALUES_SQL
 from src.services.certificate_service import CertificateService
-from src.services.crl.crl_service import CrlService
+from src.services.crl_ocsp.crl_ocsp_service import CrlOcspService
 from src.services.cryptography import CryptographyService
 from src.services.key_service import KeyService
 
@@ -80 +80 @@
 
 @pytest.fixture
 def crl_service_unique(certificate_repository_unique, private_key_repository_unique, cryptography_service):
-    return CrlService(certificate_repository_unique, private_key_repository_unique, cryptography_service)
+    return CrlOcspService(certificate_repository_unique, private_key_repository_unique, cryptography_service)

tests/unit_tests/services/crl/generate_crl_test.py

@@ -119 +119 @@
 -----END X509 CRL-----
 """.strip().replace("\r", "").replace("\n", "")
 
+
 def test_generate_crl():
     # only PEM data are relevant for the testcase
     service = CryptographyService()