Rebase to latest main

Signed-off-by: Shivam Sandbhor <[email protected]>

Author: sbs2001

vulnerabilities/api.py

@@ -208,13 +208,13 @@ def bulk_search(self, request):
                 },
             )
 
-        for cve_id in request.data["vulnerabilities"]:
-            filter_list.append(cve_id)
+        for vulnerability_id in request.data["vulnerabilities"]:
+            filter_list.append(vulnerability_id)
             # This handles the case when the said cve doesnt exist in db
-            response[cve_id] = {}
-        res = Vulnerability.objects.filter(cve_id__in=filter_list)
+            response[vulnerability_id] = {}
+        res = Vulnerability.objects.filter(identifier__in=filter_list)
         for vuln in res:
-            response[vuln.cve_id] = MinimalVulnerabilitySerializer(
+            response[vuln.identifier] = MinimalVulnerabilitySerializer(
                 vuln, context={"request": request}
             ).data
         return Response(response)

vulnerabilities/importers/elixir_security.py

@@ -139,6 +139,6 @@ def process_file(self, path):
             summary=yaml_file["description"],
             impacted_package_urls=vuln_purls,
             resolved_package_urls=safe_purls,
-            cve_id=cve_id,
+            identifier=cve_id,
             vuln_references=vuln_references,
         )

vulnerabilities/tests/test_elixir_security.py

@@ -129,7 +129,7 @@ def test_process_file(self):
                 ),
                 Reference(url="https://github.com/smpallen99/coherence/issues/270"),
             ],
-            cve_id="CVE-2018-20301",
+            identifier="CVE-2018-20301",
         )
 
         found_data = self.data_src.process_file(path)