diff --git a/vulnerabilities/forms.py b/vulnerabilities/forms.py index 03829cd52..f06440f8e 100644 --- a/vulnerabilities/forms.py +++ b/vulnerabilities/forms.py @@ -12,6 +12,7 @@ from django.core.validators import validate_email from django_altcha import AltchaField +from vulnerabilities.models import ISSUE_TYPE_CHOICES from vulnerabilities.models import ApiUser @@ -103,3 +104,32 @@ class PipelineSchedulePackageForm(forms.Form): class AdminLoginForm(AdminAuthenticationForm): captcha = AltchaField(floating=True, hidefooter=True) + + +class AdvisoryToDoForm(forms.Form): + search = forms.CharField( + required=False, + label=False, + widget=forms.TextInput( + attrs={ + "placeholder": "Search ToDos...", + "class": "input", + }, + ), + ) + + resolved = forms.ChoiceField( + required=False, + choices=[ + ("", "All"), + ("True", "Yes"), + ("False", "No"), + ], + widget=forms.Select(attrs={"class": "select"}), + ) + + issue_type = forms.ChoiceField( + required=False, + choices=[("", "All")] + ISSUE_TYPE_CHOICES, + widget=forms.Select(attrs={"class": "select"}), + ) diff --git a/vulnerabilities/pipelines/v2_importers/fireeye_importer_v2.py b/vulnerabilities/pipelines/v2_importers/fireeye_importer_v2.py index b9d647628..5899eac37 100644 --- a/vulnerabilities/pipelines/v2_importers/fireeye_importer_v2.py +++ b/vulnerabilities/pipelines/v2_importers/fireeye_importer_v2.py @@ -43,6 +43,8 @@ class FireeyeImporterPipeline(VulnerableCodeBaseImporterPipelineV2): precedence = 200 + exclude_from_package_todo = True + @classmethod def steps(cls): return ( diff --git a/vulnerabilities/pipelines/v2_importers/linux_kernel_importer.py b/vulnerabilities/pipelines/v2_importers/linux_kernel_importer.py index 299cd57cb..ca8dd5401 100644 --- a/vulnerabilities/pipelines/v2_importers/linux_kernel_importer.py +++ b/vulnerabilities/pipelines/v2_importers/linux_kernel_importer.py @@ -35,6 +35,8 @@ class LinuxKernelPipeline(VulnerableCodeBaseImporterPipelineV2): license_url = "https://github.com/nluedtke/linux_kernel_cves/blob/master/LICENSE" run_once = True + exclude_from_package_todo = True + @classmethod def steps(cls): return ( diff --git a/vulnerabilities/pipelines/v2_importers/vulnrichment_importer.py b/vulnerabilities/pipelines/v2_importers/vulnrichment_importer.py index 218f97a32..3edb1a000 100644 --- a/vulnerabilities/pipelines/v2_importers/vulnrichment_importer.py +++ b/vulnerabilities/pipelines/v2_importers/vulnrichment_importer.py @@ -35,6 +35,7 @@ class VulnrichImporterPipeline(VulnerableCodeBaseImporterPipelineV2): repo_url = "git+https://github.com/cisagov/vulnrichment.git" precedence = 100 + exclude_from_package_todo = True @classmethod def steps(cls): diff --git a/vulnerabilities/pipelines/v2_importers/xen_importer.py b/vulnerabilities/pipelines/v2_importers/xen_importer.py index af1282e30..6968a23cb 100644 --- a/vulnerabilities/pipelines/v2_importers/xen_importer.py +++ b/vulnerabilities/pipelines/v2_importers/xen_importer.py @@ -57,6 +57,7 @@ class XenImporterPipeline(VulnerableCodeBaseImporterPipelineV2): """ precedence = 200 + exclude_from_package_todo = True _cached_data = None # Class-level cache diff --git a/vulnerabilities/templates/advisory_detail.html b/vulnerabilities/templates/advisory_detail.html index 90f1d6d8b..0b850c006 100644 --- a/vulnerabilities/templates/advisory_detail.html +++ b/vulnerabilities/templates/advisory_detail.html @@ -12,7 +12,7 @@ {% block content %} {% if advisory %} -
+
diff --git a/vulnerabilities/templates/advisory_package_details.html b/vulnerabilities/templates/advisory_package_details.html index 234c5bae0..85c1dcaba 100644 --- a/vulnerabilities/templates/advisory_package_details.html +++ b/vulnerabilities/templates/advisory_package_details.html @@ -12,7 +12,7 @@ {% block content %} {% if advisoryv2 %} -
+
diff --git a/vulnerabilities/templates/advisory_todos.html b/vulnerabilities/templates/advisory_todos.html new file mode 100644 index 000000000..82dbafd76 --- /dev/null +++ b/vulnerabilities/templates/advisory_todos.html @@ -0,0 +1,157 @@ +{% extends "base.html" %} +{% load utils %} + +{% block title %} +Advisory To-Dos +{% endblock %} + +{% block extrahead %} + +{% endblock %} + + +{% block content %} +
+
+
+ +
+
+

Advisory To-Dos

+
+
+
+ +
+
+ {{ form.search }} + + {% if form.search.value %} + + ✕ + + {% endif %} +
+ +
+ +
+
+
+ +
+ + + + + + + + + + + + {% for todo in todo_list %} + + + + {% empty %} + + + + {% endfor %} + +
+
+
+
Aliases
+
Date
+
Resolved
+
# Advisories
+
Issue Type
+
+
+
+
+ + +
+
+
+ +
+
+ +
+
+ +
+ +
+
+ +
+
+
+
+
+
+
+ {{ todo.alias }} +
+
+ {{ todo.oldest_advisory_date|default:"NA" }} +
+
+ {{ todo.is_resolved|yesno:"Yes,No" }} +
+
+ {{ todo.advisories_count }} +
+
+ {{ todo.get_issue_type_display }} +
+
+
No To-Dos found.
+
+ {% include "includes/pagination_v2.html" with page_obj=page_obj %} +
+
+
+{% endblock %} + diff --git a/vulnerabilities/templates/fixing_advisories.html b/vulnerabilities/templates/fixing_advisories.html index 64af4fc65..cb4b5a20f 100644 --- a/vulnerabilities/templates/fixing_advisories.html +++ b/vulnerabilities/templates/fixing_advisories.html @@ -3,7 +3,7 @@ {% load widget_tweaks %} {% block content %} -
+
diff --git a/vulnerabilities/templates/includes/pagination_v2.html b/vulnerabilities/templates/includes/pagination_v2.html new file mode 100644 index 000000000..3afba9a53 --- /dev/null +++ b/vulnerabilities/templates/includes/pagination_v2.html @@ -0,0 +1,65 @@ +{% load utils %} + +{% if page_obj.has_other_pages %} + +{% endif %} \ No newline at end of file diff --git a/vulnerabilities/templates/navbar.html b/vulnerabilities/templates/navbar.html index 3d3fa0e91..815cd6b76 100644 --- a/vulnerabilities/templates/navbar.html +++ b/vulnerabilities/templates/navbar.html @@ -11,7 +11,7 @@
{% endif %} -
+ + Advisory To-Dos + Pipeline Dashboard diff --git a/vulnerabilities/templates/package_details.html b/vulnerabilities/templates/package_details.html index dd72d0500..0812ef629 100644 --- a/vulnerabilities/templates/package_details.html +++ b/vulnerabilities/templates/package_details.html @@ -9,7 +9,7 @@ {% endblock %} {% block content %} -
+
{% include "package_search_box.html"%}
diff --git a/vulnerabilities/templates/package_details_v2.html b/vulnerabilities/templates/package_details_v2.html index b6aa84009..a93fcc449 100644 --- a/vulnerabilities/templates/package_details_v2.html +++ b/vulnerabilities/templates/package_details_v2.html @@ -10,7 +10,7 @@ {% endblock %} {% block content %} -
+
{% include "package_search_box_v2.html"%}
diff --git a/vulnerabilities/templates/package_search_box.html b/vulnerabilities/templates/package_search_box.html index bbd305af9..ab8d76402 100644 --- a/vulnerabilities/templates/package_search_box.html +++ b/vulnerabilities/templates/package_search_box.html @@ -1,5 +1,5 @@ {% load widget_tweaks %} -
+
Search for packages
diff --git a/vulnerabilities/templates/package_search_box_v2.html b/vulnerabilities/templates/package_search_box_v2.html index e78d400e6..798ec9c5a 100644 --- a/vulnerabilities/templates/package_search_box_v2.html +++ b/vulnerabilities/templates/package_search_box_v2.html @@ -1,5 +1,5 @@ {% load widget_tweaks %} -
+
Search for packages
diff --git a/vulnerabilities/templates/packages.html b/vulnerabilities/templates/packages.html index 1f7687429..553148612 100644 --- a/vulnerabilities/templates/packages.html +++ b/vulnerabilities/templates/packages.html @@ -7,7 +7,7 @@ {% endblock %} {% block content %} -
+
{% include "package_search_box.html" %}
diff --git a/vulnerabilities/templates/packages_v2.html b/vulnerabilities/templates/packages_v2.html index f114a7159..20e470856 100644 --- a/vulnerabilities/templates/packages_v2.html +++ b/vulnerabilities/templates/packages_v2.html @@ -7,7 +7,7 @@ {% endblock %} {% block content %} -
+
{% include "package_search_box_v2.html" %}
diff --git a/vulnerabilities/templates/pipeline_dashboard.html b/vulnerabilities/templates/pipeline_dashboard.html index 61c479126..a49ac9858 100644 --- a/vulnerabilities/templates/pipeline_dashboard.html +++ b/vulnerabilities/templates/pipeline_dashboard.html @@ -41,7 +41,7 @@ {% block content %} -
+
diff --git a/vulnerabilities/templates/pipeline_run_details.html b/vulnerabilities/templates/pipeline_run_details.html index 5f7f0ebd1..7b602296a 100644 --- a/vulnerabilities/templates/pipeline_run_details.html +++ b/vulnerabilities/templates/pipeline_run_details.html @@ -34,7 +34,7 @@ {% endblock %} {% block content %} -
+
diff --git a/vulnerabilities/templates/pipeline_run_list.html b/vulnerabilities/templates/pipeline_run_list.html index 88b595ef8..cfd4c3714 100644 --- a/vulnerabilities/templates/pipeline_run_list.html +++ b/vulnerabilities/templates/pipeline_run_list.html @@ -29,7 +29,7 @@ {% block content %} -
+
diff --git a/vulnerabilities/templates/vulnerabilities.html b/vulnerabilities/templates/vulnerabilities.html index 023d3f97f..241d050bd 100644 --- a/vulnerabilities/templates/vulnerabilities.html +++ b/vulnerabilities/templates/vulnerabilities.html @@ -7,7 +7,7 @@ {% endblock %} {% block content %} -
+
{% include "vulnerability_search_box.html" %}
diff --git a/vulnerabilities/templates/vulnerability_details.html b/vulnerabilities/templates/vulnerability_details.html index 7001c8f3b..d4ad535f5 100644 --- a/vulnerabilities/templates/vulnerability_details.html +++ b/vulnerabilities/templates/vulnerability_details.html @@ -10,7 +10,7 @@ {% endblock %} {% block content %} -
+
{% include "vulnerability_search_box.html" %}
diff --git a/vulnerabilities/templates/vulnerability_package_details.html b/vulnerabilities/templates/vulnerability_package_details.html index 5c1e5e800..4c5e76ace 100644 --- a/vulnerabilities/templates/vulnerability_package_details.html +++ b/vulnerabilities/templates/vulnerability_package_details.html @@ -12,7 +12,7 @@ {% block content %} {% if vulnerability %} -
+
diff --git a/vulnerabilities/templates/vulnerability_search_box.html b/vulnerabilities/templates/vulnerability_search_box.html index cf7fba134..5486800c1 100644 --- a/vulnerabilities/templates/vulnerability_search_box.html +++ b/vulnerabilities/templates/vulnerability_search_box.html @@ -1,5 +1,5 @@ {% load widget_tweaks %} -
+
Search for vulnerabilities
diff --git a/vulnerabilities/templatetags/utils.py b/vulnerabilities/templatetags/utils.py index cea889808..1f8d48a9e 100644 --- a/vulnerabilities/templatetags/utils.py +++ b/vulnerabilities/templatetags/utils.py @@ -39,3 +39,16 @@ def active_item(context, url_name): @register.filter def get_item(dictionary, key): return dictionary.get(key) + + +@register.simple_tag +def querystring(request, **kwargs): + query = request.GET.copy() + + for key, value in kwargs.items(): + if value in [None, ""]: + query.pop(key, None) + continue + query[key] = value + + return query.urlencode() diff --git a/vulnerabilities/views.py b/vulnerabilities/views.py index 3aff06768..6ef3f39a2 100644 --- a/vulnerabilities/views.py +++ b/vulnerabilities/views.py @@ -6,6 +6,7 @@ # See https://github.com/aboutcode-org/vulnerablecode for support or download. # See https://aboutcode.org for more information about nexB OSS projects. # + import logging from collections import defaultdict from typing import List @@ -36,11 +37,14 @@ from vulnerabilities import models from vulnerabilities.forms import AdminLoginForm from vulnerabilities.forms import AdvisorySearchForm +from vulnerabilities.forms import AdvisoryToDoForm from vulnerabilities.forms import ApiUserCreationForm from vulnerabilities.forms import PackageSearchForm from vulnerabilities.forms import PipelineSchedulePackageForm from vulnerabilities.forms import VulnerabilitySearchForm +from vulnerabilities.models import ISSUE_TYPE_CHOICES from vulnerabilities.models import AdvisorySetMember +from vulnerabilities.models import AdvisoryToDoV2 from vulnerabilities.models import AdvisoryV2 from vulnerabilities.models import Group from vulnerabilities.models import GroupedAdvisory @@ -1040,3 +1044,45 @@ def get_context_data(self, **kwargs): context["site_title"] = "VulnerableCode site admin" context["site_header"] = "VulnerableCode Administration" return context + + +class AdvisoryToDoListView(ListView, FormMixin): + model = AdvisoryToDoV2 + context_object_name = "todo_list" + template_name = "advisory_todos.html" + paginate_by = 20 + form_class = AdvisoryToDoForm + + def get_form_kwargs(self): + kwargs = super().get_form_kwargs() + kwargs["data"] = self.request.GET + return kwargs + + def get_queryset(self): + form = self.form_class(self.request.GET) + resolved = self.request.GET.get("resolved") + issue_type = self.request.GET.get("issue_type") + + qs = ( + super() + .get_queryset() + .filter(is_todo_stale=False) + .order_by("-advisories_count", "-oldest_advisory_date") + ) + if resolved in ["True", "False"]: + qs = qs.filter(is_resolved=(resolved == "True")) + + if issue_type: + qs = qs.filter(issue_type=issue_type) + + qs.prefetch_related("advisories__aliases") + if form.is_valid() and (search := form.cleaned_data.get("search")): + return qs.filter(advisories__aliases__alias__icontains=search) + + return qs + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["issue_choices"] = ISSUE_TYPE_CHOICES + + return context diff --git a/vulnerablecode/urls.py b/vulnerablecode/urls.py index eb1bc006b..c9bee1247 100644 --- a/vulnerablecode/urls.py +++ b/vulnerablecode/urls.py @@ -32,6 +32,7 @@ from vulnerabilities.views import AdminLoginView from vulnerabilities.views import AdvisoryDetails from vulnerabilities.views import AdvisoryPackagesDetails +from vulnerabilities.views import AdvisoryToDoListView from vulnerabilities.views import AffectedByAdvisoriesListView from vulnerabilities.views import ApiUserCreateView from vulnerabilities.views import FixingAdvisoriesListView @@ -99,6 +100,11 @@ def __init__(self, *args, **kwargs): PipelineScheduleListView.as_view(), name="dashboard", ), + path( + "advisories/todos/", + AdvisoryToDoListView.as_view(), + name="todo-list", + ), path( "pipelines//runs/", PipelineRunListView.as_view(),