Revize 20b33bd4

Re #8571 - certificate_service.py revocation support end tests

src/services/certificate_service.py

@@ -2 +2 @@
 
 from injector import inject
 
-from src.constants import ROOT_CA_ID, INTERMEDIATE_CA_ID, CA_ID, CERTIFICATE_ID
+from src.config.configuration import Configuration
+from src.constants import ROOT_CA_ID, INTERMEDIATE_CA_ID, CA_ID, CERTIFICATE_ID, CERTIFICATE_STATES, \
+    CERTIFICATE_REVOCATION_REASONS
 from src.dao.certificate_repository import CertificateRepository
 from src.model.certificate import Certificate
 from src.model.private_key import PrivateKey
@@ -13 +15 @@
 
 DATE_FORMAT = "%d.%m.%Y %H:%M:%S"
 CA_EXTENSIONS = "basicConstraints=critical,CA:TRUE"
+CRL_EXTENSION = "crlDistributionPoints=URI:"
+OCSP_EXTENSION = "authorityInfoAccess=OCSP;URI:"
+STATUS_REVOKED = "revoked"
+STATUS_VALID = "valid"
 
 
 class CertificateService:
 
     @inject
-    def __init__(self, cryptography_service: CryptographyService, certificate_repository: CertificateRepository):
+    def __init__(self, cryptography_service: CryptographyService,
+                 certificate_repository: CertificateRepository,
+                 configuration: Configuration):
         self.cryptography_service = cryptography_service
         self.certificate_repository = certificate_repository
+        self.configuration = configuration
 
     # TODO usages present in method parameters but not in class diagram
     def create_root_ca(self, key: PrivateKey, subject: Subject, extensions: str = "", config: str = "",
@@ -38 +47 @@
         if usages is None:
             usages = {}
 
+        cert_id = self.certificate_repository.get_next_id()
+        extensions = extensions + "\n" + CRL_EXTENSION + " " + self.__get_crl_endpoint(cert_id)
+        extensions = extensions + "\n" + OCSP_EXTENSION + " " + self.__get_ocsp_endpoint(cert_id)
+
         # create a new self signed  certificate
         cert_pem = self.cryptography_service.create_sscrt(subject, key.private_key, key_pass=key.password,
                                                           extensions=extensions, config=config, days=days)
@@ -98 +111 @@
             usages = {}
 
         extensions = extensions + "\n" + CA_EXTENSIONS
+        # Add CRL and OCSP distribution point to certificate extensions
+        cert_id = self.certificate_repository.get_next_id()
+        extensions = extensions + "\n" + CRL_EXTENSION + " " + self.__get_crl_endpoint(cert_id)
+        extensions = extensions + "\n" + OCSP_EXTENSION + " " + self.__get_ocsp_endpoint(cert_id)
+
         # TODO implement AIA URI via extensions
         cert_pem = self.cryptography_service.create_crt(subject, subject_key.private_key, issuer_cert.pem_data,
                                                         issuer_key.private_key,
@@ -248 +266 @@
         # TODO delete children?
         return self.certificate_repository.delete(unique_id)
 
+    def set_certificate_revocation_status(self, id, status, reason="unspecified"):
+        """
+        Set certificate status to 'valid' or 'revoked'.
+        If the new status is revoked a reason can be provided -> default is unspecified
+        :param reason: reason for revocation
+        :param id: identifier of the certificate whose status is to be changed
+        :param status: new status of the certificate
+        """
+        if status not in CERTIFICATE_STATES:
+            raise CertificateStatusInvalidException(status)
+        if reason not in CERTIFICATE_REVOCATION_REASONS:
+            raise RevocationReasonInvalidException(reason)
+
+        if status == STATUS_VALID:
+            self.certificate_repository.clear_certificate_revocation(id)
+        elif status == STATUS_REVOKED:
+            revocation_timestamp = int(time.time())
+            self.certificate_repository.set_certificate_revoked(id, str(revocation_timestamp), reason)
+
     def get_subject_from_certificate(self, certificate: Certificate) -> Subject:
         """
         Get Subject distinguished name from a Certificate
@@ -265 +302 @@
         :return: a string containing the extracted public key in PEM format
         """
         return self.cryptography_service.extract_public_key_from_certificate(certificate.pem_data)
+
+    def __get_crl_endpoint(self, ca_identifier: int) -> str:
+        """
+        Get URL address of CRL distribution endpoint based on
+        issuer's ID
+
+        :param ca_identifier: ID of issuing authority
+        :return: CRL endpoint for the given CA
+        """
+        return self.configuration.base_server_url + "/api/crl/" + str(ca_identifier)
+
+    def __get_ocsp_endpoint(self, ca_identifier: int) -> str:
+        """
+        Get URL address of OCSP distribution endpoint based on
+        issuer's ID
+
+        :param ca_identifier: ID of issuing authority
+        :return: OCSP endpoint for the given CA
+        """
+        return self.configuration.base_server_url + "/api/ocsp/" + str(ca_identifier)
+
+
+class RevocationReasonInvalidException(Exception):
+    """
+    Exception that denotes that the caller was trying to revoke
+    a certificate using an invalid revocation reason
+    """
+
+    def __init__(self, reason):
+        self.reason = reason
+
+    def __str__(self):
+        return f"Revocation reason '{self.reason}' is not valid."
+
+
+class CertificateStatusInvalidException(Exception):
+    """
+    Exception that denotes that the caller was trying to set
+    a certificate to an invalid state
+    """
+
+    def __init__(self, status):
+        self.status = status
+
+    def __str__(self):
+        return f"Certificate status '{self.status}' is not valid."