🔨 Refactor codebase to use new Vulnerability model

Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>

Author: sbs2001

vulnerabilities/api.py

@@ -53,7 +53,7 @@ class Meta:
 
 
 class HyperLinkedVulnerabilitySerializer(serializers.HyperlinkedModelSerializer):
-    vulnerability_id = serializers.CharField(source="cve_id")
+    vulnerability_id = serializers.CharField(source="identifier")
 
     class Meta:
         model = Vulnerability
@@ -128,7 +128,7 @@ class PackageViewSet(viewsets.ReadOnlyModelViewSet):
 
 
 class VulnerabilityFilterSet(filters.FilterSet):
-    vulnerability_id = filters.CharFilter(field_name="cve_id")
+    vulnerability_id = filters.CharFilter(field_name="identifier")
 
     class Meta:
         model = Vulnerability

vulnerabilities/data_source.py

@@ -72,14 +72,14 @@ class Advisory:
     impacted_package_urls: Iterable[PackageURL]
     resolved_package_urls: Iterable[PackageURL] = dataclasses.field(default_factory=list)
     vuln_references: List[Reference] = dataclasses.field(default_factory=list)
-    cve_id: Optional[str] = None
+    identifier: Optional[str] = None
 
     def __hash__(self):
         s = '{}{}{}{}'.format(
             self.summary,
             ''.join(sorted([str(p) for p in self.impacted_package_urls])),
             ''.join(sorted([str(p) for p in self.resolved_package_urls])),
-            self.cve_id,
+            self.identifier,
         )
         return hash(s)
 
@@ -531,6 +531,6 @@ def get_data_from_xml_doc(self, xml_doc: ET.ElementTree, pkg_metadata={}) -> Lis
                     summary=description,
                     impacted_package_urls=affected_purls,
                     resolved_package_urls=safe_purls,
-                    cve_id=vuln_id,
+                    identifier=vuln_id,
                     vuln_references=references))
         return all_adv

vulnerabilities/fixtures/debian.json

@@ -3,7 +3,7 @@
   "model": "vulnerabilities.vulnerability",
   "pk": 1,
   "fields": {
-    "cve_id": "CVE-2014-8242",
+    "identifier": "CVE-2014-8242",
     "summary": "",
     "cvss": null
   }
@@ -12,7 +12,7 @@
   "model": "vulnerabilities.vulnerability",
   "pk": 2,
   "fields": {
-    "cve_id": "CVE-2009-1382",
+    "identifier": "CVE-2009-1382",
     "summary": "",
     "cvss": null
   }
@@ -21,7 +21,7 @@
   "model": "vulnerabilities.vulnerability",
   "pk": 3,
   "fields": {
-    "cve_id": "CVE-2009-2459",
+    "identifier": "CVE-2009-2459",
     "summary": "",
     "cvss": null
   }

vulnerabilities/fixtures/openssl.json

@@ -249,9 +249,8 @@ def handle_conflicts(conflicts):
 def _get_or_create_vulnerability(
     advisory: Advisory,
 ) -> Tuple[models.Vulnerability, bool]:
-
-    if advisory.cve_id:
-        query_kwargs = {"cve_id": advisory.cve_id}
+    if advisory.identifier:
+        query_kwargs = {"identifier": advisory.identifier}
     elif advisory.summary:
         query_kwargs = {"summary": advisory.summary}
     else:

vulnerabilities/import_runner.py

@@ -163,7 +163,7 @@ def _load_advisories(
                         impacted_package_urls=[],
                         resolved_package_urls=resolved_purls,
                         vuln_references=references,
-                        cve_id=vuln_ids[0] if vuln_ids[0] != "CVE-????-?????" else None,
+                        identifier=vuln_ids[0] if vuln_ids[0] != "CVE-????-?????" else None,
                     )
                 )
 

vulnerabilities/importers/alpine_linux.py

@@ -121,7 +121,7 @@ def _parse(self, record) -> List[Advisory]:
 
             advisories.append(
                 Advisory(
-                    cve_id=cve_id,
+                    identifier=cve_id,
                     summary="",
                     impacted_package_urls=impacted_purls,
                     resolved_package_urls=resolved_purls,

vulnerabilities/importers/archlinux.py

@@ -145,7 +145,7 @@ def _parse(self, pkg_name: str, records: Mapping[str, Any]) -> List[Advisory]:
 
             advisories.append(
                 Advisory(
-                    cve_id=cve_id,
+                    identifier=cve_id,
                     summary=record.get("description", ""),
                     impacted_package_urls=impacted_purls,
                     resolved_package_urls=resolved_purls,

vulnerabilities/importers/debian.py

@@ -77,7 +77,7 @@ def process_file(self, file):
         # this way, but there seems no alternative.
         for cve in xml_data["cves"]:
             advisory = Advisory(
-                cve_id=cve,
+                identifier=cve,
                 summary=xml_data["description"],
                 impacted_package_urls=xml_data["affected_purls"],
                 resolved_package_urls=xml_data["unaffected_purls"],

vulnerabilities/importers/gentoo.py

@@ -209,7 +209,7 @@ def process_response(self) -> List[Advisory]:
                     for cve_id in cve_ids:
                         adv_list.append(
                             Advisory(
-                                cve_id=cve_id,
+                                identifier=cve_id,
                                 summary=vuln_desc,
                                 impacted_package_urls=affected_purls,
                                 resolved_package_urls=unaffected_purls,