Merge pull request #117 from mtruj013/status-fix

Fix status filter

Author: mtruj013

tests/test_routes.py

@@ -31,7 +31,6 @@
 from webapp import auth
 from tests.helpers import transparent_decorator
 
-
 auth.authorization_required = transparent_decorator
 os.environ["DATABASE_URL"] = os.environ["TEST_DATABASE_URL"]
 
@@ -136,7 +135,7 @@ def test_cves_returns_200_for_non_existing_version(self):
             "errors", []
         )
 
-    def test_cves_returns_422_for_non_existing_status(self):
+    def test_cves_returns_422_for_non_existing_package_status(self):
         response = self.client.get("/security/cves.json?status=no-exist")
 
         assert response.status_code == 422

webapp/schemas.py

@@ -461,9 +461,14 @@ class CVEsAPISchema(Schema):
         description="List of release codenames ",
         allow_none=True,
     ),
+    "cve_status": String(
+        description="CVE status",
+        enum=["not-in-ubuntu", "active", "rejected"],
+        allow_none=True,
+    ),
     "status": List(
         StatusStatuses(),
-        description="List of statuses",
+        description="List of package statuses",
         allow_none=True,
     ),
     "order": String(

webapp/views.py

@@ -81,12 +81,20 @@ def get_cves(**kwargs):
     offset = kwargs.get("offset", 0)
     component = kwargs.get("component")
     versions = kwargs.get("version")
+    cve_status = kwargs.get("cve_status")
     statuses = kwargs.get("status")
     order_by = kwargs.get("order")
     show_hidden = kwargs.get("show_hidden", False)
 
-    # query cves by filters
-    cves_query: Query = db.session.query(CVE).filter(CVE.status == "active")
+    # query cves by filters. Default filter by active CVEs
+    if cve_status:
+        cves_query: Query = db.session.query(CVE).filter(
+            CVE.status == cve_status
+        )
+    else:
+        cves_query: Query = db.session.query(CVE).filter(
+            CVE.status == "active"
+        )
 
     # filter by priority
     if priority:
@@ -113,7 +121,7 @@ def get_cves(**kwargs):
     if component:
         parameters.append(Status.component == component)
 
-    # filter by status and version
+    # filter by package status and version
     if _should_filter_by_version_and_status(statuses, versions):
         clean_versions = _get_clean_versions(versions)
         clean_statuses = _get_clean_statuses(statuses)