Skip to content

Match affected and fixed-by Packages #1528

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
pombredanne merged 11 commits into from
Sep 28, 2024
Merged

Match affected and fixed-by Packages #1528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7346411
Add CSS for collapsed navbar, adjust vuln template nesting #1287
johnmhoran Jul 30, 2024
38991d9
Merge branch 'main' into 1287-resume-combining-affected-fixed-tabs
johnmhoran Jul 30, 2024
3d644bc
Merge branch 'main' into 1287-resume-combining-affected-fixed-tabs
TG1999 Aug 6, 2024
e5ca080
Add matched affected/fixed-by Packages with correct sorting #1287
johnmhoran Aug 7, 2024
b3e8b40
Merge branch '1287-resume-combining-affected-fixed-tabs' of github.co…
johnmhoran Aug 7, 2024
8333952
Merge branch 'main' into 1287-resume-combining-affected-fixed-tabs
johnmhoran Aug 7, 2024
7e740a6
Refactor sort and version_class functions and add tests #1287
johnmhoran Aug 12, 2024
ebd8cdc
Merge branch 'main' into 1287-resume-combining-affected-fixed-tabs
johnmhoran Aug 12, 2024
76c5eda
Run 'make valid' #1287
johnmhoran Aug 13, 2024
515cd70
Merge branch 'main' into 1287-resume-combining-affected-fixed-tabs
TG1999 Sep 12, 2024
a4a3b3e
Merge branch 'main' into 1287-resume-combining-affected-fixed-tabs
pombredanne Sep 28, 2024
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
40 changes: 17 additions & 23 deletions vulnerabilities/templates/package_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{% load humanize %}
{% load widget_tweaks %}
{% load static %}
{% load url_filters %}

{% block title %}
VulnerableCode Package Details - {{ package.purl }}
Expand Down Expand Up @@ -91,7 +92,7 @@
</td>
<td class="two-col-right">
{% if fixed_package_details.next_non_vulnerable.version %}
<a href="/packages/{{ fixed_package_details.next_non_vulnerable }}?search={{ fixed_package_details.next_non_vulnerable }}"
<a href="/packages/{{ fixed_package_details.next_non_vulnerable|url_quote }}?search={{ fixed_package_details.next_non_vulnerable }}"
target="_self">{{ fixed_package_details.next_non_vulnerable.version }}</a>
{% else %}
<span class="emphasis-vulnerable">None.</span>
Expand All @@ -104,7 +105,7 @@
</td>
<td class="two-col-right">
{% if fixed_package_details.latest_non_vulnerable.version %}
<a href="/packages/{{ fixed_package_details.latest_non_vulnerable }}?search={{ fixed_package_details.latest_non_vulnerable }}"
<a href="/packages/{{ fixed_package_details.latest_non_vulnerable|url_quote }}?search={{ fixed_package_details.latest_non_vulnerable }}"
target="_self">{{ fixed_package_details.latest_non_vulnerable.version }}</a>
{% else %}
<span class="emphasis-vulnerable">None.</span>
Expand All @@ -119,15 +120,15 @@

<div class="content ml-3 mr-3 pb-1">
<div class="has-text-weight-bold ml-1 mb-0 pb-0">
<span class="affected-fixed">Vulnerabilities affecting</span> this package ({{ affected_by_vulnerabilities|length }})
Vulnerabilities affecting this package ({{ affected_by_vulnerabilities|length }})
</div>

<table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
<thead>
<tr>
<th style="width: 200px;">Vulnerability</th>
<th>Summary</th>
<th style="width: 310px;"><span class="affected-fixed">Fixed by</span></th>
<th style="width: 310px;">Fixed by</th>
</tr>
</thead>

Expand Down Expand Up @@ -160,32 +161,28 @@
{% for vuln in value %}
{% if vuln.vulnerability.vulnerability_id == vulnerability.vulnerability_id %}
{% if vuln.fixed_by_package_details is None %}
<span class="emphasis-vulnerable">There are no reported <span
class="affected-fixed">fixed by</span> versions.</span>
<span class="emphasis-vulnerable">There are no reported fixed by versions.</span>
{% else %}
{% for fixed_pkg in vuln.fixed_by_package_details %}
<section>
{% if fixed_pkg.fixed_by_purl_vulnerabilities|length == 0 %}
<a href="/packages/{{ fixed_pkg.fixed_by_purl }}?search={{ fixed_pkg.fixed_by_purl }}"
<a href="/packages/{{ fixed_pkg.fixed_by_purl|url_quote }}?search={{ fixed_pkg.fixed_by_purl }}"
target="_self">{{ fixed_pkg.fixed_by_purl.version }}</a>
<br />
<span class="emphasis-not-vulnerable"><span class="affected-fixed">Affected
by</span> 0 other vulnerabilities.</span>
<span class="emphasis-not-vulnerable">Affected by 0 other vulnerabilities.</span>
{% else %}
<a href="/packages/{{ fixed_pkg.fixed_by_purl }}?search={{ fixed_pkg.fixed_by_purl }}"
<a href="/packages/{{ fixed_pkg.fixed_by_purl|url_quote }}?search={{ fixed_pkg.fixed_by_purl }}"
target="_self">{{ fixed_pkg.fixed_by_purl.version }}</a>
{% if fixed_pkg.fixed_by_purl_vulnerabilities|length != 1 %}
<br />
<span class="emphasis-vulnerable"><span class="affected-fixed">Affected
by</span> {{ fixed_pkg.fixed_by_purl_vulnerabilities|length }} other
<span class="emphasis-vulnerable">Affected by {{ fixed_pkg.fixed_by_purl_vulnerabilities|length }} other
vulnerabilities.</span>
{% else %}
<br />
<span class="emphasis-vulnerable"><span class="affected-fixed">Affected
by</span> {{ fixed_pkg.fixed_by_purl_vulnerabilities|length }} other
<span class="emphasis-vulnerable">Affected by {{ fixed_pkg.fixed_by_purl_vulnerabilities|length }} other
vulnerability.</span>
{% endif %}

<div class="dropdown is-hoverable has-text-weight-normal is-right">
<div class="dropdown-trigger">
<i
Expand All @@ -196,8 +193,7 @@
<div class="dropdown-content dropdown-instructions-box-shadow">
<div class="dropdown-item">
<div style="max-height: 200px; overflow-y: auto;">
This version is <span class="affected-fixed">affected
by</span> these other vulnerabilities:
This version is affected by these other vulnerabilities:
<div style="padding-top: 5px;">
{% for fixed_by_vuln in fixed_pkg.fixed_by_purl_vulnerabilities %}
<div>
Expand Down Expand Up @@ -226,8 +222,7 @@
{% empty %}
<tr>
<td colspan="3">
<span class="emphasis-not-vulnerable">This package is not known to be <span
class="affected-fixed">affected by</span> vulnerabilities.</span>
<span class="emphasis-not-vulnerable">This package is not known to be affected by vulnerabilities.</span>
</td>
</tr>
{% endfor %}
Expand All @@ -237,7 +232,7 @@

<div class="content ml-3 mr-3 pb-0 mb-0">
<div class="has-text-weight-bold ml-1 mb-0 pb-0">
<span class="affected-fixed">Vulnerabilities fixed by</span> this package ({{ fixing_vulnerabilities|length }})
Vulnerabilities fixed by this package ({{ fixing_vulnerabilities|length }})
</div>

<table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
Expand Down Expand Up @@ -273,8 +268,7 @@
{% empty %}
<tr>
<td colspan="3">
This package is not known to <span class="affected-fixed">fix</span>
vulnerabilities.
This package is not known to fix vulnerabilities.
</td>
</tr>
{% endfor %}
Expand Down Expand Up @@ -340,4 +334,4 @@
</section>
<script src="{% static 'js/main.js' %}" crossorigin="anonymous"></script>
{% endif %}
{% endblock %}
{% endblock %}
4 changes: 2 additions & 2 deletions vulnerabilities/templates/packages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
<span
class="has-tooltip-multiline has-tooltip-black has-tooltip-arrow has-tooltip-text-left"
data-tooltip="This is the number of vulnerabilities that affect the package.">
<span class="affected-fixed">Affected by</span> vulnerabilities
Affected by vulnerabilities
</span>
</th>
<th style="width: 225px;">
<span
class="has-tooltip-multiline has-tooltip-black has-tooltip-arrow has-tooltip-text-left"
data-tooltip="This is the number of vulnerabilities fixed by the package.">
<span class="affected-fixed">Fixing</span> vulnerabilities
Fixing vulnerabilities
</span>
</th>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions vulnerabilities/templates/vulnerabilities.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<tr>
<th>Vulnerability id</th>
<th style="width: 225px;">Aliases</th>
<th style="width: 225px;"><span class="affected-fixed">Affected</span> packages</th>
<th style="width: 225px;"><span class="affected-fixed">Fixed by</span> packages</th>
<th style="width: 225px;">Affected packages</th>
<th style="width: 225px;">Fixed by packages</th>
</tr>
</thead>
<tbody>
Expand Down
Loading