Refactor UI for new vulnerabiity model

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

Author: sbs2001

docs/how-to-guides/add_new_importer.rst

@@ -37,12 +37,13 @@ The Building Blocks A.K.A Prerequisites
         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
+        vulnerability_id: Optional[str] = None
 
     class Reference:
-
-        url: str = ''
-        reference_id: str = ''
+        reference_id: str = ""
+        url: str = ""
+        severities: List[VulnerabilitySeverity] = dataclasses.field(default_factory=list)
+        
 
 Steps to build an Importer
 --------------------------
@@ -120,7 +121,7 @@ method of the migration script.
                     for version in vuln_pkg_versions}
                      
                      
-                advisory = Advisory(cve_id=cve_id,summary='',impacted_package_urls=vuln_purls,resolved_package_urls=safe_purls)
+                advisory = Advisory(vulnerability_id=cve_id,summary='',impacted_package_urls=vuln_purls,resolved_package_urls=safe_purls)
                 advisories.append(advisory)
             return advisories
     

vulnerabilities/admin.py

@@ -35,12 +35,12 @@
 
 @admin.register(Vulnerability)
 class VulnerabilityAdmin(admin.ModelAdmin):
-    search_fields = ["cve_id"]
+    search_fields = ["vulnerability_id"]
 
 
 @admin.register(VulnerabilityReference)
 class VulnerabilityReferenceAdmin(admin.ModelAdmin):
-    search_fields = ["vulnerability__cve_id", "reference_id", "url"]
+    search_fields = ["vulnerability__vulnerability_id", "reference_id", "url"]
 
 
 @admin.register(Package)
@@ -52,7 +52,7 @@ class PackageAdmin(admin.ModelAdmin):
 @admin.register(PackageRelatedVulnerability)
 class PackageRelatedVulnerabilityAdmin(admin.ModelAdmin):
     list_filter = ("is_vulnerable", "package__type", "package__namespace")
-    search_fields = ["vulnerability__cve_id", "package__name"]
+    search_fields = ["vulnerability__vulnerability_id", "package__name"]
 
 
 @admin.register(Importer)

vulnerabilities/models.py

@@ -176,7 +176,7 @@ class PackageRelatedVulnerability(models.Model):
     is_vulnerable = models.BooleanField()
 
     def __str__(self):
-        return f"{self.package.package_url} {self.vulnerability.cve_id}"
+        return f"{self.package.package_url} {self.vulnerability.vulnerability_id}"
 
     class Meta:
         unique_together = ("package", "vulnerability")

vulnerabilities/templates/vulnerabilities.html

@@ -36,7 +36,7 @@ <h1 class="title">
           </tr>
           {% for vulnerability in  vulnerabilities %}
               <tr>
-                  <td><a href="{% url 'vulnerability_view' vulnerability.pk %}">{{vulnerability.cve_id}}</a></td>
+                  <td><a href="{% url 'vulnerability_view' vulnerability.pk %}">{{vulnerability.vulnerability_id}}</a></td>
                   <td>{{vulnerability.vulnerable_to.all|length}}</td>
                   <td>{{vulnerability.resolved_to.all|length}}</td>
               </tr>

vulnerabilities/templates/vulnerability.html

@@ -2,7 +2,7 @@
 
 {% block title %}
 <h1 class="title">
-{{vulnerability.cve_id}}
+{{vulnerability.vulnerability_id}}
 </h1>
 {% endblock %}
 

vulnerabilities/views.py

@@ -88,7 +88,7 @@ def get(self, request):
     @staticmethod
     def request_to_queryset(request):
         vuln_id = request.GET["vuln_id"]
-        return models.Vulnerability.objects.filter(cve_id__contains=vuln_id)
+        return models.Vulnerability.objects.filter(vulnerability_id__contains=vuln_id)
 
 
 class PackageUpdate(UpdateView):
@@ -142,7 +142,7 @@ class VulnerabilityCreate(CreateView):
 
     template_name = "vulnerability_create.html"
     model = models.Vulnerability
-    fields = ["cve_id", "summary"]
+    fields = ["vulnerability_id", "summary"]
 
     def get_success_url(self):
 
@@ -193,7 +193,7 @@ def post(self, request, *args, **kwargs):
         if "vuln_id" in self.request.POST:
             is_vulnerable = "impacted" in self.request.headers["Referer"]
             relation = self.create_relationship_instance(
-                cve_id=self.request.POST["vuln_id"],
+                vulnerability_id=self.request.POST["vuln_id"],
                 package_id=kwargs["pid"],
                 is_vulnerable=is_vulnerable,
             )
@@ -214,9 +214,9 @@ def relationship_already_exists(relationship):
         return existing_relation.exists()
 
     @staticmethod
-    def create_relationship_instance(cve_id, package_id, is_vulnerable):
+    def create_relationship_instance(vulnerability_id, package_id, is_vulnerable):
         package = models.Package.objects.get(id=package_id)
-        vulnerability, vuln_created = models.Vulnerability.objects.get_or_create(cve_id=cve_id)
+        vulnerability, vuln_created = models.Vulnerability.objects.get_or_create(vulnerability_id=vulnerability_id)  # nopep8
         return models.PackageRelatedVulnerability(
             vulnerability=vulnerability, package=package, is_vulnerable=is_vulnerable
         )