Revize e77c14f9

Re #8706 - Fixed a bug where certificates without usages would not be returned when the usage filter was unspecified. Added a related integration test.

src/controllers/certificates_controller.py

@@ -328 +328 @@
                     f"\n{dict_to_string(data)}")
 
         target_types = {ROOT_CA_ID, INTERMEDIATE_CA_ID, CERTIFICATE_ID}
-        target_usages = {v for v in CertController.INVERSE_USAGE_KEY_MAP.keys()}
+        target_usages = None
         target_cn_substring = None
         issuer_id = -1
 

src/dao/certificate_repository.py

@@ -269 +269 @@
         try:
             values = []
             values += list(target_types)
-            values += list(target_usages)
 
             sql = (
                 f"SELECT * "
                 f"FROM {TAB_CERTIFICATES} a "
                 f"WHERE (a.{COL_DELETION_DATE} IS NULL OR a.{COL_DELETION_DATE} = '') "
                 f"AND a.{COL_TYPE_ID} IN ({','.join('?' * len(target_types))}) "
-                f"AND (SELECT COUNT(*) FROM {TAB_CERTIFICATE_USAGES} "
-                f"WHERE {COL_CERTIFICATE_ID} = a.{COL_ID} "
-                f"AND {COL_USAGE_TYPE_ID} IN ({','.join('?' * len(target_usages))}) "
-                f") > 0 "
             )
+            
+            if target_usages is not None:
+                sql += f"AND (SELECT COUNT(*) FROM {TAB_CERTIFICATE_USAGES} WHERE {COL_CERTIFICATE_ID} = a.{COL_ID} " \
+                    f"AND {COL_USAGE_TYPE_ID} IN ({','.join('?' * len(target_usages))})) > 0 "
+                values += list(target_usages)
 
             if target_cn_substring is not None:
                 sql += f" AND a.{COL_COMMON_NAME} LIKE '%' || ? || '%'"
@@ -728 +728 @@
         try:
             values = [issuer_id, issuer_id]
             values += list(target_types)
-            values += list(target_usages)
 
             sql = (
                 f"SELECT * "
@@ -736 +735 @@
                 f"WHERE (a.{COL_DELETION_DATE} IS NULL OR a.{COL_DELETION_DATE} = '') "
                 f"AND a.{COL_PARENT_ID} = ? AND a.{COL_ID} != ? "
                 f"AND a.{COL_TYPE_ID} IN ({','.join('?' * len(target_types))}) "
-                f"AND (SELECT COUNT(*) FROM {TAB_CERTIFICATE_USAGES} "
-                f"WHERE {COL_CERTIFICATE_ID} = a.{COL_ID} "
-                f"AND {COL_USAGE_TYPE_ID} IN ({','.join('?' * len(target_usages))}) "
-                f") > 0 "
+                
             )
+            
+            if target_usages is not None:
+                sql += f"AND (SELECT COUNT(*) FROM {TAB_CERTIFICATE_USAGES} WHERE {COL_CERTIFICATE_ID} = a.{COL_ID} " \
+                    f"AND {COL_USAGE_TYPE_ID} IN ({','.join('?' * len(target_usages))})) > 0 "
+                values += list(target_usages)
 
             if target_cn_substring is not None:
                 sql += f" AND a.{COL_COMMON_NAME} LIKE '%' || ? || '%'"
-
                 values += [target_cn_substring]
 
             if page is not None and per_page is not None:

tests/integration_tests/rest_api/certificates_test.py

@@ -368 +368 @@
     all_certs_actual = ret.json["data"]
 
     assert len(all_certs_actual) == len(all_certs_expected)
+    
+
+def test_filtering_certs_empty_usage(server):
+    ret = server.get("/api/certificates?per_page=200")
+    assert ret.status_code == 200
+    assert "data" in ret.json
+    assert "success" in ret.json
+    assert ret.json["success"]
+    l1 = len(ret.json["data"])
+    print(ret.json["data"])
+
+    original = {
+        "CA": 1,
+        "subject": {
+            "C": "CZ",
+            "CN": "AWD s.r.o.",
+            "L": "Pilsen",
+            "O": "This is most likely a bad s.r.o.",
+            "OU": "IT department",
+            "ST": "Pilsen Region",
+            "emailAddress": "[e-mail]"
+        },
+        "usage": [],
+        "validityDays": 30
+    }
+    ret = server.post("/api/certificates", content_type="application/json", json=original)
+    assert ret.status_code == 201
+
+    ret = server.get("/api/certificates?per_page=200")
+    assert ret.status_code == 200
+    assert "data" in ret.json
+    assert "success" in ret.json
+    assert ret.json["success"]
+    l2 = len(ret.json["data"])
+    print(ret.json["data"])
+
+    assert l2 == l1 + 1
+    
 
 def test_filtering_issuer(server):
     ret = server.get("/api/certificates", json={"filtering": {"issuedby": 2}})
@@ -528 +566 @@
 
     d = ret.json
 
-    assert d["data"] == 10
+    assert d["data"] == 11
 
     id = d["data"]