From a051e546ade9c5c10acf7466c927bbb7f9cd637f Mon Sep 17 00:00:00 2001 From: Tushar Goel Date: Wed, 5 Jul 2023 13:29:10 +0530 Subject: [PATCH 1/4] Remove unresolved_vulnerabilities from API response Signed-off-by: Tushar Goel --- vulnerabilities/api.py | 5 ----- vulnerabilities/tests/test_api.py | 26 -------------------------- 2 files changed, 31 deletions(-) diff --git a/vulnerabilities/api.py b/vulnerabilities/api.py index af8e5d889..2c8e913ba 100644 --- a/vulnerabilities/api.py +++ b/vulnerabilities/api.py @@ -124,11 +124,6 @@ class PackageSerializer(serializers.HyperlinkedModelSerializer): Lookup software package using Package URLs """ - def to_representation(self, instance): - data = super().to_representation(instance) - data["unresolved_vulnerabilities"] = data["affected_by_vulnerabilities"] - return data - purl = serializers.CharField(source="package_url") affected_by_vulnerabilities = serializers.SerializerMethodField("get_affected_vulnerabilities") diff --git a/vulnerabilities/tests/test_api.py b/vulnerabilities/tests/test_api.py index d02808e16..5ead38a2d 100644 --- a/vulnerabilities/tests/test_api.py +++ b/vulnerabilities/tests/test_api.py @@ -362,16 +362,6 @@ def test_api_with_single_vulnerability_and_fixed_package(self): "aliases": ["CVE-2029-1234"], }, ], - "unresolved_vulnerabilities": [ - { - "url": f"http://testserver/api/vulnerabilities/{self.vuln1.id}", - "vulnerability_id": self.vuln1.vulnerability_id, - "summary": "test-vuln1", - "references": [], - "fixed_packages": [], - "aliases": ["CVE-2019-1234", "GMS-1234-4321"], - } - ], } def test_api_with_single_vulnerability_and_vulnerable_package(self): @@ -402,22 +392,6 @@ def test_api_with_single_vulnerability_and_vulnerable_package(self): } ], "fixing_vulnerabilities": [], - "unresolved_vulnerabilities": [ - { - "url": f"http://testserver/api/vulnerabilities/{self.vuln.id}", - "vulnerability_id": self.vuln.vulnerability_id, - "summary": "test-vuln", - "references": [], - "fixed_packages": [ - { - "url": f"http://testserver/api/packages/{self.package.id}", - "purl": "pkg:generic/nginx/test@11", - "is_vulnerable": True, - } - ], - "aliases": ["CVE-2029-1234"], - } - ], } def test_api_with_all_vulnerable_packages(self): From 1394a99be2a52de2f3c8c96e48799c3d45e6cca3 Mon Sep 17 00:00:00 2001 From: Tushar Goel Date: Wed, 5 Jul 2023 13:29:45 +0530 Subject: [PATCH 2/4] Add missing quotes for href values in template Signed-off-by: Tushar Goel --- vulnerabilities/templates/package_details.html | 4 ++-- vulnerabilities/templates/vulnerabilities.html | 2 +- vulnerabilities/templates/vulnerability_details.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vulnerabilities/templates/package_details.html b/vulnerabilities/templates/package_details.html index 9d30c13f0..6a391d3d3 100644 --- a/vulnerabilities/templates/package_details.html +++ b/vulnerabilities/templates/package_details.html @@ -66,7 +66,7 @@ {% for alias in vulnerability.alias %} {% if alias.url %} - {{ alias }} + {{ alias }}
{% else %} {{ alias }} @@ -113,7 +113,7 @@ {% for alias in vulnerability.alias %} {% if alias.url %} - {{ alias }} + {{ alias }}
{% else %} {{ alias }} diff --git a/vulnerabilities/templates/vulnerabilities.html b/vulnerabilities/templates/vulnerabilities.html index dcca5213d..023d3f97f 100644 --- a/vulnerabilities/templates/vulnerabilities.html +++ b/vulnerabilities/templates/vulnerabilities.html @@ -48,7 +48,7 @@ {% for alias in vulnerability.alias %} {% if alias.url %} - {{ alias }} + {{ alias }} {% else %} diff --git a/vulnerabilities/templates/vulnerability_details.html b/vulnerabilities/templates/vulnerability_details.html index d7ee67bd4..d6162f211 100644 --- a/vulnerabilities/templates/vulnerability_details.html +++ b/vulnerabilities/templates/vulnerability_details.html @@ -68,7 +68,7 @@ {% for alias in aliases %} {% if alias.url %} - {{ alias }} + {{ alias }} {% else %} {{ alias }} {% endif %} From 542ef4425029ed214ed831e65f3c97de6e29e9b5 Mon Sep 17 00:00:00 2001 From: Tushar Goel Date: Wed, 5 Jul 2023 13:58:02 +0530 Subject: [PATCH 3/4] Remove ubuntu OVAL link from source Signed-off-by: Tushar Goel --- SOURCES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SOURCES.rst b/SOURCES.rst index 8cf65d02d..bc0963a10 100644 --- a/SOURCES.rst +++ b/SOURCES.rst @@ -13,7 +13,7 @@ +----------------+------------------------------------------------------------------------------------------------------+----------------------------------------------------+ |ruby | https://github.com/rubysec/ruby-advisory-db.git |ruby gems | +----------------+------------------------------------------------------------------------------------------------------+----------------------------------------------------+ -|ubuntu | https://people.canonical.com/~ubuntu-security/oval/ |ubuntu packages | +|ubuntu | |ubuntu packages | +----------------+------------------------------------------------------------------------------------------------------+----------------------------------------------------+ |retiredotnet | https://github.com/RetireNet/Packages.git |.NET packages | +----------------+------------------------------------------------------------------------------------------------------+----------------------------------------------------+ From d7d7d0662c7f0063e51f7664f7b3b923c43cfbe9 Mon Sep 17 00:00:00 2001 From: Tushar Goel Date: Wed, 5 Jul 2023 14:05:16 +0530 Subject: [PATCH 4/4] Add CHANGELOG for v33.0.0 Signed-off-by: Tushar Goel --- CHANGELOG.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 214fe2e4a..b9bae75cf 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,13 @@ Release notes ============= +Version v33.0.0 +----------------- + +- We have dropped ``unresolved_vulnerabilities`` from /api/package endpoint API response. +- We have added missing quotes for href values in template. + + Version v32.0.1 -----------------