Revize 5b6d9513

Re #8476 - Implemented and tested `get_cert_details(id)`.

src/controllers/certificates_controller.py

@@ -50 +50 @@
 
 
 class CertController:
+    KEY_MAP = {'CA': CA_ID, 'SSL': SSL_ID, 'digitalSignature': SIGNATURE_ID, 'authentication': AUTHENTICATION_ID}
+    INVERSE_KEY_MAP = {k: v for v, k in KEY_MAP.items()}
 
     @staticmethod
     def setup():
@@ -76 +78 @@
         """
         CertController.setup()  # TODO remove after issue fixed
 
-        key_map = {'CA': CA_ID, 'SSL': SSL_ID, 'digitalSignature': SIGNATURE_ID, 'authentication': AUTHENTICATION_ID}
         required_keys = {SUBJECT, USAGE, VALIDITY_DAYS}
 
         if request.is_json:
@@ -92 +93 @@
             if subject is None:
                 return E_WRONG_PARAMETERS, 400
 
-            usages_dict = DICT_USAGES.copy()
+            usages_dict = {}
 
             if not isinstance(body[USAGE], dict):
                 return E_WRONG_PARAMETERS, 400
 
             for k, v in body[USAGE].items():
-                if k not in key_map:
+                if k not in CertController.KEY_MAP:
                     return E_WRONG_PARAMETERS, 400
-                usages_dict[key_map[k]] = v
+                usages_dict[CertController.KEY_MAP[k]] = v
 
             key = KEY_SERVICE.create_new_key()  # TODO pass key
 
@@ -115 +116 @@
                 issuer = CERTIFICATE_SERVICE.get_certificate(body[CA])
 
                 if issuer is None:
+                    KEY_SERVICE.delete_key(key.private_key_id)
                     return E_NO_ISSUER_FOUND, 400
 
                 issuer_key = KEY_SERVICE.get_key(issuer.private_key_id)
 
                 if issuer_key is None:
+                    KEY_SERVICE.delete_key(key.private_key_id)
                     return E_CORRUPTED_DATABASE, 500
 
                 f = CERTIFICATE_SERVICE.create_ca if CA_ID in usages_dict and usages_dict[CA_ID] else \
@@ -138 +141 @@
                 return {"success": True,
                         "data": cert.certificate_id}, 201
             else:
+                KEY_SERVICE.delete_key(key.private_key_id)
                 return {"success": False,
                         "data": "Internal error: The certificate could not have been created."}, 400
         else:
@@ -181 +185 @@
         """
         CertController.setup()  # TODO remove after issue fixed
 
-        if connexion.request.is_json:
-            id = IdParameter.from_dict(connexion.request.get_json())  # noqa: E501
-        return 'do some magic!'
+        try:
+            v = int(id)
+        except ValueError:
+            return E_WRONG_PARAMETERS, 400
+
+        cert = CERTIFICATE_SERVICE.get_certificate(v)
+
+        if cert is None:
+            return E_NO_CERTIFICATES_FOUND, 205  # TODO related to 204 issue
+        else:
+            data = CertController.cert_to_dict_full(cert)
+            if data is None:
+                return E_CORRUPTED_DATABASE, 500
+            return {"success": True, "data": data}
 
     @staticmethod
     def get_certificate_list():  # noqa: E501
@@ -198 +213 @@
         """
         CertController.setup()  # TODO remove after issue fixed
 
-        key_map = {CA_ID: 'CA', SSL_ID: 'SSL', SIGNATURE_ID: 'digitalSignature', AUTHENTICATION_ID: 'authentication'}
-
         targets = {ROOT_CA_ID, INTERMEDIATE_CA_ID, CERTIFICATE_ID}
         if request.is_json:
             data = request.get_json()
@@ -217 +230 @@
                 else:
                     return E_WRONG_PARAMETERS, 400
 
-        if len(targets) == 3:
+        if len(targets) == 3:                               # potentially risky
             certs = CERTIFICATE_SERVICE.get_certificates()
         else:
             certs = list(chain(*(CERTIFICATE_SERVICE.get_certificates(target) for target in targets)))
@@ -229 +242 @@
         else:
             ret = []
             for c in certs:
-                c_issuer = CERTIFICATE_SERVICE.get_certificate(c.parent_id)
-                if c_issuer is None:
+                data = CertController.cert_to_dict_partial(c)
+                if data is None:
                     return E_CORRUPTED_DATABASE, 500
-
                 ret.append(
-                    {
-                        ID: c.certificate_id,
-                        COMMON_NAME: c.common_name,
-                        NOT_BEFORE: datetime.strptime(c.valid_from, DATETIME_FORMAT).date(),
-                        NOT_AFTER: datetime.strptime(c.valid_to, DATETIME_FORMAT).date(),
-                        USAGE: {key_map[k]: v for k, v in c.usages.items()},
-                        ISSUER: {
-                            ID: c_issuer.certificate_id,
-                            COMMON_NAME: c_issuer.common_name
-                        }
-                    }
+                    data
                 )
             return {"success": True, "data": ret}
 
 
-
     @staticmethod
     def get_certificate_root_by_id(id):  # noqa: E501
         """get certificate's root of trust chain by ID
@@ -283 +284 @@
         if connexion.request.is_json:
             id = IdParameter.from_dict(connexion.request.get_json())  # noqa: E501
         return 'do some magic!'
+
+
+    @staticmethod
+    def cert_to_dict_partial(c):
+        c_issuer = CERTIFICATE_SERVICE.get_certificate(c.parent_id)
+        if c_issuer is None:
+            return None
+
+        return {
+            ID: c.certificate_id,
+            COMMON_NAME: c.common_name,
+            NOT_BEFORE: datetime.strptime(c.valid_from, DATETIME_FORMAT).date(),
+            NOT_AFTER: datetime.strptime(c.valid_to, DATETIME_FORMAT).date(),
+            USAGE: {CertController.INVERSE_KEY_MAP[k]: v for k, v in c.usages.items()},
+            ISSUER: {
+                ID: c_issuer.certificate_id,
+                COMMON_NAME: c_issuer.common_name
+            }
+        }
+
+    @staticmethod
+    def cert_to_dict_full(c):
+        subj = CERTIFICATE_SERVICE.get_subject_from_certificate(c)
+        c_issuer = CERTIFICATE_SERVICE.get_certificate(c.parent_id)
+        if c_issuer is None:
+            return None
+
+        return {
+            SUBJECT: subj.to_dict(),
+            NOT_BEFORE: datetime.strptime(c.valid_from, DATETIME_FORMAT).date(),
+            NOT_AFTER: datetime.strptime(c.valid_to, DATETIME_FORMAT).date(),
+            USAGE: {CertController.INVERSE_KEY_MAP[k]: v for k, v in c.usages.items()},
+            CA: c_issuer.certificate_id
+        }