Revize 11a90594

Re #8475 - Getting root and trust chain from controller uses correct service

src/controllers/certificates_controller.py

@@ -276 +276 @@
         cert = CERTIFICATE_SERVICE.get_certificate(v)
 
         if cert is None:
-            return E_NO_CERTIFICATES_FOUND, C_NO_DATA                               
+            return E_NO_CERTIFICATES_FOUND, C_NO_DATA
 
-        while cert.parent_id != cert.certificate_id:
-            cert = CERTIFICATE_SERVICE.get_certificate(cert.parent_id)
-            if cert is None:
-                return E_CORRUPTED_DATABASE, C_INTERNAL_SERVER_ERROR
+        trust_chain = CERTIFICATE_SERVICE.get_chain_of_trust(cert.parent_id, exclude_root=False)
+        if trust_chain is None or len(trust_chain) is 0:
+            return E_NO_CERTIFICATES_FOUND, C_NO_DATA
 
-        return {"success": True, "data": cert.pem_data}, C_SUCCESS
+        return {"success": True, "data": trust_chain[-1].pem_data}, C_SUCCESS
 
     @staticmethod
     def get_certificate_trust_chain_by_id(id):
@@ -308 +307 @@
         if cert is None:
             return E_NO_CERTIFICATES_FOUND, C_NO_DATA                               
 
-        ret = []
+        if cert.parent_id is None:
+            return E_NO_CERTIFICATES_FOUND, C_NO_DATA
 
-        while True:
-            cert = CERTIFICATE_SERVICE.get_certificate(cert.parent_id)
-            if cert is None:
-                return E_CORRUPTED_DATABASE, C_INTERNAL_SERVER_ERROR
-            elif cert.parent_id == cert.certificate_id:
-                break
-            ret.append(cert.pem_data)
+        trust_chain = CERTIFICATE_SERVICE.get_chain_of_trust(cert.parent_id)
+
+        ret = []
+        for intermediate in trust_chain:
+            ret.append(intermediate.pem_data)
 
         return {"success": True, "data": "".join(ret)}, C_SUCCESS