Revize c62151d4

Improved InvalidSubjectAttribute string representation and added an "except" block in CertificateController that handles this error.

src/controllers/certificates_controller.py

@@ -15 +15 @@
 from src.model.subject import Subject
 from src.services.certificate_service import CertificateService, RevocationReasonInvalidException, \
     CertificateStatusInvalidException, CertificateNotFoundException, CertificateAlreadyRevokedException, \
-    CertificateCannotBeSetToValid
+    CertificateCannotBeSetToValid, InvalidSubjectAttribute
 #  responsibility.
 from src.services.cryptography import CryptographyException
 from src.services.key_service import KeyService
@@ -200 +200 @@
                     return E_INVALID_EXTENSIONS, C_BAD_REQUEST
                 else:
                     raise CryptographyException(e.executable, e.args, e.message)
+            except InvalidSubjectAttribute as e:
+                return {"success": False, "data": str(e)}, C_BAD_REQUEST
 
             if cert is not None:
                 return {"success": True,

src/services/certificate_service.py

@@ -57 +57 @@
         :raises InvalidCertificateAttribute: When a subject with an invalid attribute is passed
         """
         if subject.country is not None and len(subject.country) != 2:
-            raise InvalidSubjectAttribute("Country code", "Must consist of exactly 2 letters.")
+            raise InvalidSubjectAttribute("Country code", "Must consist of exactly 2 letters")
 
     # TODO usages present in method parameters but not in class diagram
     def create_root_ca(self, key: PrivateKey, subject: Subject, extensions: str = "", config: str = "",
@@ -637 +637 @@
         self.reason = reason
 
     def __str__(self):
-        return f"""Subject attribute "{self.attribute_name} is invalid (reason: {self.reason})."""
+        return f"""Subject attribute "{self.attribute_name}" is invalid (reason: {self.reason})."""