Merge pull request #191 from canonical/revert-186-cve-status-update

Revert "Update cve status options and apply updates across test fixtures"

Author: mtruj013

docker-entrypoint-initdb.d/sample-security-data.sql.gz

@@ -49,7 +49,7 @@
                 patches={},
                 tags={},
                 bugs={},
-                status="in-progress",
+                status="active",
             )
             db.session.add(cve)
             cves.append(cve)

migrations/versions/654254322cd3_update_cve_statuses.py

@@ -80,7 +80,7 @@
             "https://www.mozilla.org/en-US/security/advisories/mfsa2020-08/#CVE-2019-20503",
             "https://usn.ubuntu.com/usn/usn-4299-1"
         ],
-        "status": "in-progress",
+        "status": "active",
         "tags": {},
         "ubuntu_description": ""
     }

scripts/generate-sample-security-data.py

@@ -30,7 +30,7 @@ def make_cve(
     patches={},
     tags={},
     bugs={},
-    status="in-progress",
+    status="active",
 ):
     cve = CVE(
         id=id,

scripts/payloads/cves.json

@@ -48,7 +48,6 @@
     },
     "priority": "critical",
     "published": "2020-08-01 12:42:54",
-    "status": "not-in-ubuntu",
 }
 
 cve2 = {
@@ -75,7 +74,7 @@
     ],
     "published": "2020-11-01 12:42:54",
     "priority": "high",
-    "status": "in-progress",
+    "status": "active",
 }
 
 cve3 = {
@@ -102,7 +101,7 @@
     ],
     "priority": "medium",
     "published": "2019-12-01 12:42:54",
-    "status": "in-progress",
+    "status": "active",
 }
 
 cve4 = {
@@ -128,7 +127,7 @@
     ],
     "priority": "medium",
     "published": "2022-12-01 12:42:54",
-    "status": "in-progress",
+    "status": "active",
 }
 
 cve5 = {
@@ -153,7 +152,7 @@
     ],
     "published": "2020-12-01 12:42:54",
     "priority": "low",
-    "status": "in-progress",
+    "status": "active",
 }
 
 cve6 = {
@@ -178,7 +177,7 @@
     ],
     "published": "2020-12-01 12:42:54",
     "priority": "negligible",
-    "status": "in-progress",
+    "status": "active",
 }
 
 cve7 = {
@@ -203,7 +202,7 @@
     ],
     "published": "2020-12-01 12:42:54",
     "priority": "negligible",
-    "status": "in-progress",
+    "status": "active",
 }
 
 cve8 = {
@@ -228,7 +227,7 @@
     ],
     "published": "2020-12-01 12:42:54",
     "priority": "negligible",
-    "status": "in-progress",
+    "status": "active",
 }
 
 notice = {

tests/fixtures/models.py

@@ -48,23 +48,6 @@ def test_cves_query_no_500(self):
 
         assert response.status_code == 200
 
-    def test_cves_default_status(self):
-        # Add new CVE without status
-        cve_payload = payloads.cve1.copy()
-
-        add_cve_response = self.client.put(
-            "/security/updates/cves.json",
-            json=[cve_payload],
-        )
-
-        assert add_cve_response.status_code == 200
-        response = self.client.get("/security/cves.json")
-
-        assert response.status_code == 200
-        # Only the CVE with the default "in-progress" status should be returned
-        assert len(response.json["cves"]) == 1
-        assert response.json["cves"][0]["status"] == "in-progress"
-
     def test_cves_returns_200_for_non_existing_package_name(self):
         response = self.client.get("/security/cves.json?package=no-exist")
 
@@ -706,7 +689,7 @@ def test_cve_group_by_functionality(self):
         Tests that CVEs are correctly grouped by priority
         and ordered by publish date.
         """
-        # Check that there is one CVE in the db with an "in-progress" status
+        # Check that there is one CVE in the db with an active status
         # and a critical priority
         initial_cves = self.client.get("/security/cves.json")
 

tests/fixtures/payloads.py

@@ -7,7 +7,7 @@
 
 from webapp.api_spec import WebappFlaskApiSpec
 from webapp.commands import register_commands
-from webapp.database import db, init_db  # noqa: F401
+from webapp.database import init_db
 from webapp.views import (
     bulk_upsert_cve,
     create_notice,

tests/test_routes.py

@@ -6,6 +6,7 @@
     Boolean,
     Column,
     DateTime,
+    Enum,
     Float,
     ForeignKey,
     JSON,
@@ -23,7 +24,6 @@
     COMPONENT_OPTIONS,
     POCKET_OPTIONS,
     PRIORITY_OPTIONS,
-    CVE_STATUSES,
 )
 
 
@@ -63,7 +63,9 @@ class CVE(db.Model):
     patches = Column(JSON)
     tags = Column(JSON)
     bugs = Column(JSON)
-    status = Column(CVE_STATUSES)
+    status = Column(
+        Enum("not-in-ubuntu", "active", "rejected", name="cve_statuses")
+    )
     statuses = relationship("Status", cascade="all, delete-orphan")
     notices = relationship(
         "Notice", secondary=notice_cves, back_populates="cves"

webapp/app.py

@@ -529,7 +529,7 @@ class CVEsAPISchema(Schema):
     ),
     "cve_status": String(
         description="CVE status",
-        enum=["not-in-ubuntu", "in-progress", "rejected"],
+        enum=["not-in-ubuntu", "active", "rejected"],
         allow_none=True,
     ),
     "status": List(

webapp/models.py

@@ -49,10 +49,3 @@
     "critical",
     name="priorities",
 )
-
-CVE_STATUSES = Enum(
-    "not-in-ubuntu",
-    "in-progress",
-    "rejected",
-    name="cve_statuses",
-)

webapp/schemas.py

@@ -104,14 +104,14 @@ def get_cves(**kwargs):
     sort_by = kwargs.get("sort_by")
     show_hidden = kwargs.get("show_hidden", False)
 
-    # query cves by filters. Default filter by "in-progress" CVEs
+    # 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 == "in-progress"
+            CVE.status == "active"
         )
 
     # order by priority