Revize 9e6f791a

Re #8571 - Fixed problems during walk-through code review

src/services/certificate_service.py

@@ -6 +6 @@
 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.exceptions.unknown_exception import UnknownException
 from src.model.certificate import Certificate
 from src.model.private_key import PrivateKey
 from src.model.subject import Subject
@@ -279 +280 @@
         if reason not in CERTIFICATE_REVOCATION_REASONS:
             raise RevocationReasonInvalidException(reason)
 
+        # check whether the certificate exists
+        certificate = self.certificate_repository.read(id)
+        if certificate is None:
+            raise CertificateNotFoundException(id)
+
         updated = False
         if status == STATUS_VALID:
             updated = self.certificate_repository.clear_certificate_revocation(id)
         elif status == STATUS_REVOKED:
+            # check if the certificate is not revoked already
+            revoked = self.certificate_repository.get_all_revoked_by(certificate.parent_id)
+            if certificate.certificate_id in [x.certificate_id for x in revoked]:
+                raise CertificateAlreadyRevokedException(id)
+
             revocation_timestamp = int(time.time())
             updated = self.certificate_repository.set_certificate_revoked(id, str(revocation_timestamp), reason)
 
         if not updated:
-            raise CertificateNotFoundException(id)
+            # TODO log this
+            raise UnknownException("Repository returned 'false' from clear_certificate_revocation() "
+                                   "or set_certificate_revoked().")
 
     def get_subject_from_certificate(self, certificate: Certificate) -> Subject:
         """
@@ -357 +370 @@
 class CertificateNotFoundException(Exception):
     """
     Exception that denotes that the caller was trying to set
-    a certificate to an invalid state
+    work with non-existing certificate
     """
 
     def __init__(self, id):
@@ -365 +378 @@
 
     def __str__(self):
         return f"Certificate id '{self.id}' does not exist."
+
+
+class CertificateAlreadyRevokedException(Exception):
+    """
+    Exception that denotes that the caller was trying to revoke
+    a certificate that is already revoked
+    """
+
+    def __init__(self, id):
+        self.id = id
+
+    def __str__(self):
+        return f"Certificate id '{self.id}' is already revoked."