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

Table captions #2217

Merged
merged 6 commits into from
Dec 29, 2023
Merged

Table captions #2217

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ea49d52
Adds and updates captions where needed. Fixes a couple of invalid htm…
HeleenSG Dec 28, 2023
5e4a63a
remove json files
noamblitz Dec 28, 2023
6e823e1
add rpki cache to gitignore
noamblitz Dec 28, 2023
67cfc9e
Caption fix
HeleenSG Dec 28, 2023
703fe6a
Merge branch 'main' into fix/report-table-captions
underdarknl Dec 28, 2023
eefd779
fix lang
Rieven Dec 28, 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
1 change: 1 addition & 0 deletions boefjes/boefjes/plugins/kat_rpki/rpki-meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"timestamp": "2023-12-28T10:21:19Z", "source": "https://console.rpki-client.org/vrps.json"}
497,417 changes: 497,417 additions & 0 deletions boefjes/boefjes/plugins/kat_rpki/rpki.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion rocky/reports/report_types/aggregate_organisation_report/basic_security.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h3>{% translate "Overview of the basic security status" %}</h3>
</p>
<div class="horizontal-scroll">
<table>
<caption class="visually-hidden">{% translate "IPV6 overview:" %}</caption>
<caption class="visually-hidden">{% translate "Basic security status:" %}</caption>
<thead>
<tr>
<th scope="col">{% translate "System type" %}</th>
Expand Down
1 change: 1 addition & 0 deletions rocky/reports/report_types/aggregate_organisation_report/system_specific.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ <h4>{{ type }}</h4>
{% if findings %}
<h5>{{ ip }}</h5>
<table>
<caption class="visually-hidden">{% translate "Findings:" %}</caption>
<thead>
<tr>
<th>{% translate "Compliance issue" %}</th>
Expand Down
83 changes: 43 additions & 40 deletions rocky/reports/report_types/dns_report/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,53 @@

<h2>{% translate "IP address lookup" %}</h2>
<div class="horizontal-scroll">
<div class="column-2">
{% if data.ipv4 %}
<table>
<thead>
<tr>
<th scope="col">IPv4</th>
</tr>
</thead>
<tbody>
<tr>
{% for ip in data.ipv4 %}<td>{{ ip }}</td>{% endfor %}
</tr>
</tbody>
</table>
{% endif %}
{% if not data.enough_ipv6_webservers %}
<div class="warning" role="group" aria-label="{% translate "warning" %}">
<span>IPv6 {% translate "Warning" %}:</span>
<p>
{% blocktranslate trimmed %}
You have less than one webserver that is reachable over IPv6,
which is <strong>not</strong> in compliance to internet.nl standards.
{% endblocktranslate %}
</p>
</div>
{% else %}
<table class="summary">
<thead>
<tr>
<th scope="col">IPv6</th>
</tr>
</thead>
<tbody>
<tr>
{% for ip in data.ipv6 %}<td>{{ ip }}</td>{% endfor %}
</tr>
</tbody>
</table>
{% endif %}
</div>
{% if data.ipv4 %}
<table>
<caption class="visually-hidden">IPv4:</caption>
<thead>
<tr>
<th scope="col">IPv4</th>
</tr>
</thead>
<tbody>
<tr>
{% for ip in data.ipv4 %}<td>{{ ip }}</td>{% endfor %}
</tr>
</tbody>
</table>
{% endif %}
{% if not data.enough_ipv6_webservers %}
<h3 class="heading-xs">IPv6</h3>
<div class="warning" role="group" aria-label="{% translate "warning" %}">
<span>{% translate "Warning" %}:</span>
<p>
{% blocktranslate trimmed %}
You have less than one webserver that is reachable over IPv6,
which is <strong>not</strong> in compliance to internet.nl standards.
{% endblocktranslate %}
</p>
</div>
{% else %}
<table class="summary">
<caption class="visually-hidden">IPv6:</caption>
<thead>
<tr>
<th scope="col">IPv6</th>
</tr>
</thead>
<tbody>
<tr>
{% for ip in data.ipv6 %}<td>{{ ip }}</td>{% endfor %}
</tr>
</tbody>
</table>
{% endif %}
</div>
{% if data.other_records %}
<h2>{% translate "Other records found" %}</h2>
<div class="horizontal-scroll">
<table>
<caption class="visually-hidden">{% translate "Other records found" %}</caption>
<thead>
<tr>
<th>{% translate "Record" %}</th>
Expand All @@ -69,6 +71,7 @@ <h2>{% translate "Security measures" %}</h2>
<div class="horizontal-scroll">
<div class="column-3">
<table>
<caption class="visually-hidden">{% translate "Security measures" %}</caption>
<thead>
<tr>
<th>{% translate "Enabled" %}</th>
Expand Down
76 changes: 38 additions & 38 deletions rocky/reports/report_types/mail_report/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
{% load i18n %}

<p class="horizontal-scroll">
<p class="column-2">
<div class="horizontal-scroll">
<table>
<caption class="visually-hidden">{% translate "Mailserver compliance:" %}</caption>
<thead>
<tr>
<th scope="col">{% translate "Check" %}</th>
<th scope="col">{% translate "Compliance" %}</th>
</tr>
</thead>
<tbody>
<tr>
<td>SPF</td>
<td>{{ data.number_of_spf }}/{{ data.number_of_hostnames }} {% translate "mailservers compliant" %}</td>
</tr>
<tr>
<td>DKIM</td>
<td>{{ data.number_of_dkim }}/{{ data.number_of_hostnames }} {% translate "mailservers compliant" %}</td>
</tr>
<tr>
<td>DMARC</td>
<td>{{ data.number_of_dmarc }}/{{ data.number_of_hostnames }} {% translate "mailservers compliant" %}</td>
</tr>
</tbody>
</table>
</div>
{% if data.finding_types.measures %}
<div class="horizontal-scroll">
<table>
<caption class="visually-hidden">{% translate "Findings:" %}</caption>
<thead>
<tr>
<th scope="col">{% translate "Check" %}</th>
<th scope="col">{% translate "Compliance" %}</th>
<th scope="col">{% translate "Compliance issue" %}</th>
<th scope="col">{% translate "Risk level" %}</th>
</tr>
</thead>
<tbody>
<tr>
<td>SPF</td>
<td>{{ data.number_of_spf }}/{{ data.number_of_hostnames }} {% translate "mailservers compliant" %}</td>
</tr>
<tr>
<td>DKIM</td>
<td>{{ data.number_of_dkim }}/{{ data.number_of_hostnames }} {% translate "mailservers compliant" %}</td>
</tr>
<tr>
<td>DMARC</td>
<td>{{ data.number_of_dmarc }}/{{ data.number_of_hostnames }} {% translate "mailservers compliant" %}</td>
</tr>
</tbody>
</table>
</p>
{% if data.finding_types.measures %}
<p class="column-2">
<table>
<thead>
{% for measure in data.finding_types.values %}
<tr>
<th scope="col">{% translate "Compliance issue" %}</th>
<th scope="col">{% translate "Risk level" %}</th>
<td>{{ measure.description }}</td>
<td>{{ measure.risk_severity }}</td>
</tr>
</thead>
<tbody>
{% for measure in data.finding_types.values %}
<tr>
<td>{{ measure.description }}</td>
<td>{{ measure.risk_severity }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</p>
{% endif %}
</p>
{% endfor %}
</tbody>
</table>
</div>
{% endif %}
88 changes: 44 additions & 44 deletions rocky/reports/report_types/name_server_report/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
{% load i18n %}

<p class="horizontal-scroll">
<p class="column-2">
<div class="horizontal-scroll">
<table>
<caption class="visually-hidden">{% translate "Name server compliance:" %}</caption>
<thead>
<tr>
<th scope="col">{% translate "Check" %}</th>
<th scope="col">{% translate "Compliance" %}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{% translate "DNSSEC Present" %}</td>
<td>
{{ data.name_server_checks.has_dnssec }}/{{ data.name_server_checks|length }} {% translate "name servers compliant" %}
</td>
</tr>
<tr>
<td>{% translate "Valid DNSSEC" %}</td>
<td>
{{ data.name_server_checks.has_valid_dnssec }}/{{ data.name_server_checks|length }} {% translate "name servers compliant" %}
</td>
</tr>
<tr>
<td>{% translate "No unnecessary ports open" %}</td>
<td>
{{ data.name_server_checks.no_uncommon_ports }}/{{ data.name_server_checks|length }} {% translate "name servers compliant" %}
</td>
</tr>
</tbody>
</table>
</div>
{% if data.finding_types %}
<div class="horizontal-scroll">
<table>
<caption class="visually-hidden">{% translate "Findings:" %}</caption>
<thead>
<tr>
<th scope="col">{% translate "Check" %}</th>
<th scope="col">{% translate "Compliance" %}</th>
<th scope="col">{% translate "Compliance issue" %}</th>
<th scope="col">{% translate "Risk level" %}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{% translate "DNSSEC Present" %}</td>
<td>
{{ data.name_server_checks.has_dnssec }}/{{ data.name_server_checks|length }} {% translate "name servers compliant" %}
</td>
</tr>
<tr>
<td>{% translate "Valid DNSSEC" %}</td>
<td>
{{ data.name_server_checks.has_valid_dnssec }}/{{ data.name_server_checks|length }} {% translate "name servers compliant" %}
</td>
</tr>
<tr>
<td>{% translate "No unnecessary ports open" %}</td>
<td>
{{ data.name_server_checks.no_uncommon_ports }}/{{ data.name_server_checks|length }} {% translate "name servers compliant" %}
</td>
</tr>
</tbody>
</table>
</p>
{% if data.finding_types %}
<p class="column-2">
<table>
<thead>
{% for finding_type in data.finding_types %}
<tr>
<th scope="col">{% translate "Compliance issue" %}</th>
<th scope="col">{% translate "Risk level" %}</th>
<td>{{ finding_type.description }}</td>
<td>{{ finding_type.risk_severity }}</td>
</tr>
</thead>
<tbody>
{% for finding_type in data.finding_types %}
<tr>
<td>{{ finding_type.description }}</td>
<td>{{ finding_type.risk_severity }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</p>
{% endif %}
</p>
{% endfor %}
</tbody>
</table>
</div>
{% endif %}
3 changes: 2 additions & 1 deletion rocky/reports/report_types/rpki_report/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h4>{{ type }}</h4>
{% if data.rpki_ips %}
<div class="horizontal-scroll">
<table>
<caption class="visually-hidden">{% translate "RPKI overview:" %}</caption>
<caption class="visually-hidden">{% translate "RPKI compliance:" %}</caption>
<thead>
<tr>
<th>{% translate "Check" %}</th>
Expand Down Expand Up @@ -61,6 +61,7 @@ <h4>{{ type }}</h4>
{% if not info.valid or not info.exists %}
<h5>{{ ip }}</h5>
<table>
<caption class="visually-hidden">{% translate "RPKI compliance:" %}</caption>
<thead>
<tr>
<th>{% translate "Compliance issue" %}</th>
Expand Down
2 changes: 2 additions & 0 deletions rocky/reports/report_types/safe_connections_report/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ <h4>{{ type }}</h4>
{% if data.sc_ips %}
<div class="horizontal-scroll">
<table>
<caption class="visually-hidden">{% translate "Safe connections compliance:" %}</caption>
<thead>
<tr>
<th>{% translate "Check" %}</th>
Expand All @@ -48,6 +49,7 @@ <h4>{{ type }}</h4>
{% if findings %}
<h5>{{ ip }}</h5>
<table>
<caption class="visually-hidden">{% translate "Safe connections compliance:" %}</caption>
<thead>
<tr>
<th scope="col">{% translate "Compliance issue" %}</th>
Expand Down
2 changes: 1 addition & 1 deletion rocky/reports/report_types/systems_report/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="horizontal-scroll">
<table>
<caption class="visually-hidden">{% translate "Overzicht Handmatig gevrijwaarde gescande assets:" %}</caption>
<caption class="visually-hidden">{% translate "Declared scanned assets:" %}</caption>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should just say:

"Selected assets", as its not limited to just declared assets if the user makes a different choice earlier on in the flow.

<thead>
<tr>
<th scope="col">{% translate "IP address" %}</th>
Expand Down
1 change: 1 addition & 0 deletions rocky/reports/report_types/tls_report/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ <h3>Ciphers</h3>
{% if data.suites %}
<div class="horizontal-scroll">
<table>
<caption class="visually-hidden">{% translate "Ciphers:" %}</caption>
<thead>
<tr>
<th>{% translate "Status" %}</th>
Expand Down
2 changes: 1 addition & 1 deletion rocky/reports/report_types/vulnerability_report/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{% if vulnerability_data.summary.total_findings > 0 %}
<div class="horizontal-scroll">
<table>
<caption class="visually-hidden">{% translate "Basic example table:" %}</caption>
<caption class="visually-hidden">{% translate "Vulnerabilities:" %}</caption>
<thead>
<tr>
<th scope="col">{% translate "Vulnerabilities" %}</th>
Expand Down
Loading
Loading