Revize aa740737

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

app.py

@@ -35 +35 @@
     return CertController.get_certificate_root_by_id(id)
 
 
[e-mail]('/api/certificates/<id>/chain', methods=["GET"])
+def get_cert_chain(id):
+    return CertController.get_certificate_trust_chain_by_id(id)
+
+
 if __name__ == '__main__':
     host = "0.0.0.0"
     port = 5000

src/controllers/certificates_controller.py

@@ -293 +293 @@
         """
         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
+
+        ret = []
+
+        while True:
+            cert = CERTIFICATE_SERVICE.get_certificate(cert.parent_id)
+            if cert is None:
+                return E_CORRUPTED_DATABASE, 500
+            elif cert.parent_id == cert.certificate_id:
+                break
+            ret.append(cert.pem_data)
 
+        return {"success": True, "data": "".join(ret)}
 
     @staticmethod
     def cert_to_dict_partial(c):

tests/unit_tests/rest_api/certificates.py

@@ -1 @@
-def test_import(server):
-    assert 1 + 2 + 3 + 4 != -1 / 12
-
-    ret = server.get("/")
-    assert ret.status_code == 200
-    assert str(ret.data, encoding='utf-8') == "Welcome to the X.509 management application homepage!"
+# structure:
+# 1->10
+# 2->3->4->5->6->7
+# 2->8->9
 
 
-def test_root_ca(server):
-    ret = server.post("/api/certificates", content_type="application/json", json={
+def make_root_ca(server, title="Root CA s.r.o."):
+    return server.post("/api/certificates", content_type="application/json", json={
         "subject": {
             "C": "CZ",
-            "CN": "Root CA s.r.o.",
+            "CN": title,
             "L": "Pilsen",
-            "O": "Root CA s.r.o.",
+            "O": title,
             "OU": "IT department",
             "ST": "Pilsen Region",
             "emailAddress": "[e-mail]"
@@ -26 +24 @@
         "validityDays": 30
     })
 
+
+def make_inter_ca(server, parent, title="Intermediate CA s.r.o."):
+    return server.post("/api/certificates", content_type="application/json", json={
+        "CA": parent,
+        "subject": {
+            "C": "CZ",
+            "CN": title,
+            "L": "Pilsen",
+            "O": title,
+            "OU": "IT department",
+            "ST": "Pilsen Region",
+            "emailAddress": "[e-mail]"
+        },
+        "usage": {
+            "CA": True,
+            "SSL": True,
+            "authentication": True,
+            "digitalSignature": True
+        },
+        "validityDays": 30
+    })
+
+
+def make_end_cert(server, parent, title="End certificate s.r.o.", usage=None):
+    if usage is None:
+        usage = {
+            "CA": False,
+            "SSL": True,
+            "authentication": True,
+            "digitalSignature": True
+        }
+
+    return server.post("/api/certificates", content_type="application/json", json={
+        "CA": parent,
+        "subject": {
+            "C": "CZ",
+            "CN": title,
+            "L": "Pilsen",
+            "O": title,
+            "OU": "IT department",
+            "ST": "Pilsen Region",
+            "emailAddress": "[e-mail]"
+        },
+        "usage": usage,
+        "validityDays": 30
+    })
+
+
+def test_import(server):
+    assert 1 + 2 + 3 + 4 != -1 / 12
+
+    ret = server.get("/")
+    assert ret.status_code == 200
+    assert str(ret.data, encoding='utf-8') == "Welcome to the X.509 management application homepage!"
+
+
+def test_root_ca(server):
+    ret = make_root_ca(server)
+
     assert ret.status_code == 201
 
     d = ret.json
@@ -152 +209 @@
 
 
 def test_create_chain(server):
-    ret = server.post("/api/certificates", content_type="application/json", json={
-        "subject": {
-            "C": "CZ",
-            "CN": "Another Root CA s.r.o.",
-            "L": "Pilsen",
-            "O": "Another Root CA s.r.o.",
-            "OU": "IT department",
-            "ST": "Pilsen Region",
-            "emailAddress": "[e-mail]"
-        },
-        "usage": {
-            "CA": True,
-            "SSL": True,
-            "authentication": True,
-            "digitalSignature": True
-        },
-        "validityDays": 30
-    })
+    ret = make_root_ca(server, "Another Root CA s.r.o.")
 
     assert ret.status_code == 201
 
@@ -180 +220 @@
     assert "success" in d
     assert d["success"]
 
-    ret = server.post("/api/certificates", content_type="application/json", json={
-        "CA": 2,
-        "subject": {
-            "C": "CZ",
-            "CN": "Intermediate CA s.r.o.",
-            "L": "Pilsen",
-            "O": "Intermediate CA s.r.o.",
-            "OU": "IT department",
-            "ST": "Pilsen Region",
-            "emailAddress": "[e-mail]"
-        },
-        "usage": {
-            "CA": True,
-            "SSL": True,
-            "authentication": True,
-            "digitalSignature": True
-        },
-        "validityDays": 30
-    })
+    ret = make_inter_ca(server, 2)
 
     assert ret.status_code == 201
 
@@ -209 +231 @@
     assert "success" in d
     assert d["success"]
 
-    ret = server.post("/api/certificates", content_type="application/json", json={
-        "CA": 3,
-        "subject": {
-            "C": "CZ",
-            "CN": "Legit end certificate s.r.o.",
-            "L": "Pilsen",
-            "O": "I swear s.r.o.",
-            "OU": "IT department",
-            "ST": "Pilsen Region",
-            "emailAddress": "[e-mail]"
-        },
-        "usage": {
-            "CA": True,
-            "SSL": True,
-            "authentication": True,
-            "digitalSignature": True
-        },
-        "validityDays": 30
-    })
+    ret = make_inter_ca(server, 3)
 
     assert ret.status_code == 201
 
@@ -238 +242 @@
     assert "success" in d
     assert d["success"]
 
+    ret = make_inter_ca(server, 4)
+
+    assert ret.status_code == 201
+
+    d = ret.json
+
+    assert "data" in d
+    assert d["data"] == 5
+    assert "success" in d
+    assert d["success"]
+
+    ret = make_inter_ca(server, 5)
+
+    assert ret.status_code == 201
+
+    d = ret.json
+
+    assert "data" in d
+    assert d["data"] == 6
+    assert "success" in d
+    assert d["success"]
+
+    ret = make_end_cert(server, 6)
+
+    assert ret.status_code == 201
+
+    d = ret.json
+
+    assert "data" in d
+    assert d["data"] == 7
+    assert "success" in d
+    assert d["success"]
+
 
 def test_list_of_certificates(server):
     ret = server.get("/api/certificates")
@@ -274 +311 @@
 
 
 def test_sign_by_non_ca(server):
-    ret = server.post("/api/certificates", content_type="application/json", json={
-        "CA": 2,
-        "subject": {
-            "C": "CZ",
-            "CN": "Fake Intermediate CA s.r.o.",
-            "L": "Pilsen",
-            "O": "Fake Intermediate CA s.r.o.",
-            "OU": "IT department",
-            "ST": "Pilsen Region",
-            "emailAddress": "[e-mail]"
-        },
-        "usage": {
+    ret = make_end_cert(server, 2, "Fake intermediate cert s.r.o.", usage={
             "CA": False,
             "SSL": True,
             "authentication": True,
             "digitalSignature": True
-        },
-        "validityDays": 30
-    })
+        })
 
     assert ret.status_code == 201
 
     d = ret.json
 
     assert "data" in d
-    assert d["data"] == 5
+    assert d["data"] == 8
     assert "success" in d
     assert d["success"]
 
-    ret = server.post("/api/certificates", content_type="application/json", json={
-        "CA": 5,
-        "subject": {
-            "C": "CZ",
-            "CN": "End certificate signed by end certificate s.r.o.",
-            "L": "Pilsen",
-            "O": "This is probably bad s.r.o.",
-            "OU": "IT department",
-            "ST": "Pilsen Region",
-            "emailAddress": "[e-mail]"
-        },
-        "usage": {
+    ret = make_end_cert(server, 8, "End certificate signed by end certificate s.r.o.", usage={
             "CA": False,
             "SSL": True,
-            "authentication": True,
-            "digitalSignature": True
-        },
-        "validityDays": 30
-    })
+            "authentication": False,
+            "digitalSignature": False
+        })
 
     # TODO discussion -> assert ret.status_code == 400
     assert ret.status_code == 201
@@ -329 +340 @@
     d = ret.json
 
     assert "data" in d
-    assert d["data"] == 6
+    assert d["data"] == 9
     assert "success" in d
     assert d["success"]
 
@@ -339 +350 @@
 
     assert ret.status_code == 200
 
-    usage_dict = {'CA': True, 'SSL': True, 'authentication': True, 'digitalSignature': True}
-    s1 = "Root CA s.r.o."
-    s2 = "Another Root CA s.r.o."
-    s3 = "Intermediate CA s.r.o."
+    assert "data" in ret.json
+    assert "success" in ret.json
+    assert ret.json["success"]
+
+    d = ret.json["data"]
+
+    assert all(c["usage"]["CA"] for c in d)
+
+    all_certs_expected = list(d)
+
+    ret = server.get("/api/certificates", json={"filtering": {"CA": False}})
+
+    assert ret.status_code == 200
 
     assert "data" in ret.json
     assert "success" in ret.json
@@ -350 +370 @@
 
     d = ret.json["data"]
 
-    # print(d)
+    assert all(not c["usage"]["CA"] for c in d)
 
-    assert d[0]['CN'] == s1
-    assert d[1]['CN'] == s2
-    assert d[2]['CN'] == s3
+    for v in d:
+        all_certs_expected.append(v)
 
-    assert all(d[i]['id'] == i + 1 for i in range(3))
-    assert all(d[i]['usage'] == usage_dict for i in range(3))
+    ret = server.get("/api/certificates")
 
-    assert d[0]['issuer']['CN'] == s1
-    assert d[1]['issuer']['CN'] == s2
-    assert d[2]['issuer']['CN'] == s2
+    assert ret.status_code == 200
 
-    assert d[0]['issuer']['id'] == 1
-    assert d[1]['issuer']['id'] == 2
-    assert d[2]['issuer']['id'] == 2
+    assert "data" in ret.json
+    assert "success" in ret.json
+    assert ret.json["success"]
+
+    all_certs_actual = ret.json["data"]
+
+    assert len(all_certs_actual) == len(all_certs_expected)
+    # TODO assert set(all_certs_expected) == set(all_certs_actual) or something like that instead
 
 
 def test_get_one(server):
@@ -432 +453 @@
 
     d = ret.json
 
-    assert d["data"] == 7
+    assert d["data"] == 10
 
     id = d["data"]
 
@@ -486 +507 @@
     assert not ret.json["success"]
     assert ret.json["data"] == "No such certificate found."
 
+
+def test_chain_of_trust(server):
+    expected = []
+    for i in range(6, 2, -1):
+        ret = server.get(f"/api/certificates/{i}")
+
+        assert ret.status_code == 200
+
+        assert "data" in ret.json
+        assert "success" in ret.json
+        assert ret.json["success"]
+
+        d = ret.json["data"]
+        expected.append(d)
+
+    ret = server.get(f"/api/certificates/7/chain")
+    assert ret.status_code == 200
+
+    assert "data" in ret.json
+    assert "success" in ret.json
+    assert ret.json["success"]
+
+    actual = ret.json["data"]
+
+    assert "".join(expected) == actual