diff --git a/vulnerabilities/templates/advisory_todos.html b/vulnerabilities/templates/advisory_todos.html index f5ce62c2a..c1d054760 100644 --- a/vulnerabilities/templates/advisory_todos.html +++ b/vulnerabilities/templates/advisory_todos.html @@ -177,7 +177,7 @@

Advisory To-Dos

{{ todo.get_issue_type_display }} - {% if todo.issue_type in supported_curation.split %} + {% if todo.issue_type in supported_curation.split or todo.issue_type == "CONFLICTING_SEVERITY_SCORES" or todo.issue_type == "CONFLICTING_WEAKNESSES" or todo.issue_type == "MISSING_FIXED_BY_PACKAGE" %} {% endif %} {% endwith %} diff --git a/vulnerabilities/templates/mitigation_curation.html b/vulnerabilities/templates/mitigation_curation.html index ce25fa8bd..ea0391f09 100644 --- a/vulnerabilities/templates/mitigation_curation.html +++ b/vulnerabilities/templates/mitigation_curation.html @@ -101,10 +101,12 @@

Extra Mitigation Curation

+ {% if avid %} {{ avid }} + {% endif %}

diff --git a/vulnerabilities/tests/test_view.py b/vulnerabilities/tests/test_view.py index bcee104ac..7869a2893 100644 --- a/vulnerabilities/tests/test_view.py +++ b/vulnerabilities/tests/test_view.py @@ -18,6 +18,8 @@ from packageurl import PackageURL from univers import versions +from vulnerabilities.models import AdvisoryToDoV2 +from vulnerabilities.models import AdvisoryV2 from vulnerabilities.models import AffectedByPackageRelatedVulnerability from vulnerabilities.models import Alias from vulnerabilities.models import FixingPackageRelatedVulnerability @@ -379,3 +381,96 @@ def test_throttle_after_15_requests(self): HTTP_USER_AGENT="test-agent", ) assert response.status_code == 429 + + +class AdvisoryCurationViewTestCase(TestCase): + def setUp(self): + self.client = Client() + session = self.client.session + session["altcha_verified_at"] = time.time() + session.save() + + def test_mitigation_curation_view_with_empty_and_whitespace_summary(self): + """Verify that AdvisoryMitigationCurationView does not crash with StopIteration + or AttributeError when advisories have empty or whitespace-only summaries.""" + adv1 = AdvisoryV2.objects.create( + datasource_id="test_ds", + advisory_id="TEST-ADV-1", + pipeline_id="test_pipeline", + avid="test_ds/TEST-ADV-1", + unique_content_id="unique_content_id_1", + url="https://example.com/advisory1", + date_collected="2026-11-16T00:00:00Z", + summary="", + ) + adv2 = AdvisoryV2.objects.create( + datasource_id="test_ds", + advisory_id="TEST-ADV-2", + pipeline_id="test_pipeline", + avid="test_ds/TEST-ADV-2", + unique_content_id="unique_content_id_2", + url="https://example.com/advisory2", + date_collected="2026-11-16T00:00:00Z", + summary=" ", + ) + todo = AdvisoryToDoV2.objects.create( + related_advisories_id="hash_empty_summary", + alias="CVE-2026-0001", + advisories_count=2, + issue_type="MISSING_FIXED_BY_PACKAGE", + ) + todo.advisories.add(adv1, adv2) + + url = reverse("todo-mitigation-detail", kwargs={"todo_id": todo.todo_id}) + response = self.client.get(url) + + self.assertEqual(response.status_code, 200) + self.assertEqual(response.context["advisory_summaries"], {}) + self.assertEqual(response.context["avid"], adv1.avid) + self.assertEqual(response.context["curation_items"], []) + + def test_mitigation_curation_view_with_no_advisories(self): + """Verify that AdvisoryMitigationCurationView does not crash when todo has zero advisories.""" + todo = AdvisoryToDoV2.objects.create( + related_advisories_id="hash_no_advisories", + alias="CVE-2026-0002", + advisories_count=0, + issue_type="MISSING_FIXED_BY_PACKAGE", + ) + + url = reverse("todo-mitigation-detail", kwargs={"todo_id": todo.todo_id}) + response = self.client.get(url) + + self.assertEqual(response.status_code, 200) + self.assertEqual(response.context["advisory_summaries"], {}) + self.assertIsNone(response.context["avid"]) + self.assertEqual(response.context["curation_items"], []) + + def test_advisory_todos_template_renders_closed_anchors(self): + """Verify that advisory_todos.html properly closes tags for all issue types.""" + issue_types = [ + "CONFLICTING_FIXED_BY_PACKAGES", + "CONFLICTING_SEVERITY_SCORES", + "CONFLICTING_WEAKNESSES", + "MISSING_FIXED_BY_PACKAGE", + ] + for idx, itype in enumerate(issue_types): + AdvisoryToDoV2.objects.create( + related_advisories_id=f"hash_issue_{idx}", + alias=f"TEST-TODO-{idx}", + advisories_count=1, + issue_type=itype, + ) + + url = reverse("todo-list") + response = self.client.get(url) + + self.assertEqual(response.status_code, 200) + content = response.content.decode("utf-8") + open_anchors = content.count('class="has-text-info"') + self.assertEqual(open_anchors, 4) + # Verify all 4 issue type links are rendered + self.assertIn("mitigation/curate/", content) + self.assertIn("severity/curate/", content) + self.assertIn("weakness/curate/", content) + self.assertIn("package/curate/", content) diff --git a/vulnerabilities/views.py b/vulnerabilities/views.py index b5ba74214..8e18208f6 100644 --- a/vulnerabilities/views.py +++ b/vulnerabilities/views.py @@ -1241,14 +1241,26 @@ def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) todo = self.object - context["advisory_summaries"] = { - adv.avid: adv.summary for adv in todo.advisories.all() if adv.summary.strip() + advisory_summaries = { + adv.avid: adv.summary + for adv in todo.advisories.all() + if adv.summary and adv.summary.strip() } - context["avid"] = next(iter(context["advisory_summaries"])) - context["curation_items"] = [ - a.base_purl - for a in todo.advisories.first().impacted_packages.filter( - fixed_by_packages__isnull=True - ) - ] + context["advisory_summaries"] = advisory_summaries + + first_advisory = todo.advisories.first() + if advisory_summaries: + context["avid"] = next(iter(advisory_summaries)) + elif first_advisory: + context["avid"] = first_advisory.avid + else: + context["avid"] = None + + if first_advisory: + context["curation_items"] = [ + a.base_purl + for a in first_advisory.impacted_packages.filter(fixed_by_packages__isnull=True) + ] + else: + context["curation_items"] = [] return context