Skip to content
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

Jump to bottom

Presentation of evaluation characteristics #223

Merged
merged 3 commits into from
Jan 24, 2024
Merged

Presentation of evaluation characteristics #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dff5ee4
Add title
Honny1 Jan 22, 2024
432b0e1
Create two-tier display of Evaluation Characteristics
Honny1 Jan 22, 2024
39a970c
Use macro for generation of list items
Honny1 Jan 24, 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
190 changes: 36 additions & 154 deletions openscap_report/report_generators/html_templates/evaluation_characteristics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@
{# Copyright 2022, Red Hat, Inc. #}
{# SPDX-License-Identifier: LGPL-2.1-or-later #}
<div class="pf-c-accordion pf-m-display-lg">
{%- from './macros/list_item.html' import list_item -%}
<div>
<ul class="pf-c-data-list" role="list">

{{- list_item("Evaluation target:", report.scan_result.target) -}}

{{- list_item("Profile ID:", report.profile_info.profile_id) -}}

{%- if report.profile_info.extends -%}
{{- list_item("Extends Profile ID:", report.profile_info.extends) -}}
{%- endif -%}

{{- list_item("Scanner:", report.scan_result.scanner + "&nbsp;" + report.scan_result.scanner_version) -}}

{{- list_item("Started at:", report.scan_result.start_time) -}}

{{- list_item("Finished at:", report.scan_result.end_time) -}}

</ul>
<div class="pf-c-accordion">
<h3>
<button class="pf-c-accordion__toggle" type="button" onclick="show_evaluation_characteristics(this);">
<span class="pf-c-accordion__toggle-text">Evaluation Characteristics</span>
<span class="pf-c-accordion__toggle-text">More Evaluation Characteristics</span>
<span class="pf-c-accordion__toggle-icon">
<i class="fas fa-angle-right"></i>
</span>
Expand All @@ -13,163 +32,26 @@ <h3>
<div class="pf-c-accordion__expanded-content-body">
<ul class="pf-c-data-list" role="list">

<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>Profile ID:</b></div>
<div class="pf-c-data-list__cell">
{{- report.profile_info.profile_id -}}
</div>
</div>
</div>
</li>
{%- if report.profile_info.extends -%}
<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>Extends Profile ID:</b></div>
<div class="pf-c-data-list__cell">
{{- report.profile_info.extends -}}
</div>
</div>
</div>
</li>
{%- endif -%}
<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>This profile is applicable for this CPE platforms:</b></div>
<div class="pf-c-data-list__cell">
{{- report.profile_info.get_applicable_cpe_platforms_for_profile() -}}
</div>
</div>
</div>
</li>

<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>CPE platforms that were found applicable on the evaluated machine:</b></div>
<div class="pf-c-data-list__cell">
{{- report.profile_info.get_cpe_platforms_that_satisfy_evaluation_target() -}}
</div>
</div>
</div>
</li>

<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>Evaluation target:</b></div>
<div class="pf-c-data-list__cell">
{{- report.scan_result.target -}}
</div>
</div>
</div>
</li>

<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>Performed by:</b></div>
<div class="pf-c-data-list__cell">
{{- report.scan_result.identity -}}
</div>
</div>
</div>
</li>

<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>Scanner:</b></div>
<div class="pf-c-data-list__cell">
{{- report.scan_result.scanner -}}&nbsp;{{- report.scan_result.scanner_version -}}
</div>
</div>
</div>
</li>

<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>Benchmark ID:</b></div>
<div class="pf-c-data-list__cell">
{{- report.scan_result.benchmark_id -}}
</div>
</div>
</div>
</li>

<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>Benchmark url:</b></div>
<div class="pf-c-data-list__cell">
{{- report.scan_result.benchmark_url -}}
</div>
</div>
</div>
</li>

<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>Benchmark version:</b></div>
<div class="pf-c-data-list__cell">
{{- report.scan_result.benchmark_version -}}
</div>
</div>
</div>
</li>

<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>Started at:</b></div>
<div class="pf-c-data-list__cell">
{{- report.scan_result.start_time -}}
</div>
</div>
</div>
</li>

<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>Finished at:</b></div>
<div class="pf-c-data-list__cell">
{{- report.scan_result.end_time -}}
</div>
</div>
</div>
</li>

<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>Test system:</b></div>
<div class="pf-c-data-list__cell">
{{- report.scan_result.test_system -}}
</div>
</div>
</div>
</li>
{{- list_item("This profile is applicable for this CPE platforms:", report.profile_info.get_applicable_cpe_platforms_for_profile()) -}}

{{- list_item("CPE platforms that were found applicable on the evaluated machine:", report.profile_info.get_cpe_platforms_that_satisfy_evaluation_target()) -}}

{{- list_item("Performed by:", report.scan_result.identity) -}}

{{- list_item("Benchmark ID:", report.scan_result.benchmark_id) -}}

{{- list_item("Benchmark url:", report.scan_result.benchmark_url) -}}

{{- list_item("Benchmark version:", report.scan_result.benchmark_version) -}}

{{- list_item("Test system:", report.scan_result.test_system) -}}

{%- for type, addresses in report.scan_result.target_addresses.items() -%}
<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>Target {{ type }} addresses:</b></div>
<div class="pf-c-data-list__cell">
{{- ", ".join(addresses) -}}
</div>
</div>
</div>
</li>
{{- list_item("Target " + type + " addresses:", ", ".join(addresses)) -}}
{%- endfor -%}

</ul>
</div>
</div>
</div>
</div>
14 changes: 14 additions & 0 deletions openscap_report/report_generators/html_templates/macros/list_item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{# Copyright 2022, Red Hat, Inc. #}
{# SPDX-License-Identifier: LGPL-2.1-or-later #}
{% macro list_item(title, value) -%}
<li class="pf-c-data-list__item">
<div class="pf-c-data-list__item-row">
<div class="pf-c-data-list__item-content">
<div class="pf-c-data-list__cell"><b>{{- title -}}</b></div>
<div class="pf-c-data-list__cell">
{{- value -}}
</div>
</div>
</div>
</li>
{%- endmacro %}
2 changes: 1 addition & 1 deletion openscap_report/report_generators/html_templates/template_report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ <h2 class="pf-c-title pf-m-2xl">Score&nbsp;<i class="pf-icon pf-icon-help" aria-

{% include 'score_bar.html' %}
<br>

<h2 class="pf-c-title pf-m-3xl">Evaluation Characteristics</h2>
<br>
{% include 'evaluation_characteristics.html' %}
<br>
Expand Down