Skip to content

Drop duplicated fields from API response and add missing quotes for href values in template #1222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TG1999 merged 4 commits into from
Jul 5, 2023
Merged

Drop duplicated fields from API response and add missing quotes for href values in template #1222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a051e54
Remove unresolved_vulnerabilities from API response
TG1999 Jul 5, 2023
1394a99
Add missing quotes for href values in template
TG1999 Jul 5, 2023
542ef44
Remove ubuntu OVAL link from source
TG1999 Jul 5, 2023
d7d7d06
Add CHANGELOG for v33.0.0
TG1999 Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----------------

Expand Down
2 changes: 1 addition & 1 deletion SOURCES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
+----------------+------------------------------------------------------------------------------------------------------+----------------------------------------------------+
Expand Down
5 changes: 0 additions & 5 deletions vulnerabilities/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions vulnerabilities/templates/package_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<td>
{% for alias in vulnerability.alias %}
{% if alias.url %}
<a href={{ alias.url }} target="_blank">{{ alias }}<i class="fa fa-external-link fa_link_custom"></i></a>
<a href="{{ alias.url }}" target="_blank">{{ alias }}<i class="fa fa-external-link fa_link_custom"></i></a>
<br />
{% else %}
{{ alias }}
Expand Down Expand Up @@ -113,7 +113,7 @@
<td>
{% for alias in vulnerability.alias %}
{% if alias.url %}
<a href={{ alias.url }} target="_blank">{{ alias }}<i class="fa fa-external-link fa_link_custom"></i></a>
<a href="{{ alias.url }}" target="_blank">{{ alias }}<i class="fa fa-external-link fa_link_custom"></i></a>
<br />
{% else %}
{{ alias }}
Expand Down
2 changes: 1 addition & 1 deletion vulnerabilities/templates/vulnerabilities.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<td>
{% for alias in vulnerability.alias %}
{% if alias.url %}
<a href={{ alias.url }} target="_blank">{{ alias }}
<a href="{{ alias.url }}" target="_blank">{{ alias }}
<i class="fa fa-external-link fa_link_custom"></i>
</a>
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion vulnerabilities/templates/vulnerability_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<td class="two-col-right">
{% for alias in aliases %}
{% if alias.url %}
<a href={{ alias.url }} target="_blank">{{ alias }}<i class="fa fa-external-link fa_link_custom"></i></a>
<a href="{{ alias.url }}" target="_blank">{{ alias }}<i class="fa fa-external-link fa_link_custom"></i></a>
{% else %}
{{ alias }}
{% endif %}
Expand Down
26 changes: 0 additions & 26 deletions vulnerabilities/tests/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down