Skip to content

Commit bd11d0b

Browse files
kevoreillykevoreilly
authored
Merge pull request kevoreilly#2879 from josh-feather/bootstrap-5-ui-fixes
Bootstrap 5 UI fixes
2 parents 8226757 + 50194c8 commit bd11d0b

14 files changed

Lines changed: 33899 additions & 33409 deletions

File tree

‎report.html‎

Lines changed: 32833 additions & 32833 deletions
Large diffs are not rendered by default.

‎web/static/css/style.css‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -405,27 +405,27 @@ pre {
405405
color: black;
406406
}
407407

408-
.btn-cat-filesystem { background-color: #ffe3c5; color: black; border-color: #ffe3c5; }
408+
.btn-cat-filesystem { background-color: #ffe3c5 !important; color: black; border-color: #ffe3c5; }
409409
.btn-cat-filesystem:hover { color: black; }
410-
.btn-cat-registry { background-color: #ffc5c5; color: black; border-color: #ffc5c5; }
410+
.btn-cat-registry { background-color: #ffc5c5 !important; color: black; border-color: #ffc5c5; }
411411
.btn-cat-registry:hover { color: black; }
412-
.btn-cat-process { background-color: #c5e0ff; color: black; border-color: #c5e0ff; }
412+
.btn-cat-process { background-color: #c5e0ff !important; color: black; border-color: #c5e0ff; }
413413
.btn-cat-process:hover { color: black; }
414-
.btn-cat-threading { background-color: #d3e0ff; color: black; border-color: #d3e0ff; }
414+
.btn-cat-threading { background-color: #d3e0ff !important; color: black; border-color: #d3e0ff; }
415415
.btn-cat-threading:hover { color: black; }
416-
.btn-cat-services { background-color: #ccc5ff; color: black; border-color: #ccc5ff; }
416+
.btn-cat-services { background-color: #ccc5ff !important; color: black; border-color: #ccc5ff; }
417417
.btn-cat-services:hover { color: black; }
418-
.btn-cat-device { background-color: #d3c5cc; color: black; border-color: #d3c5cc; }
418+
.btn-cat-device { background-color: #d3c5cc !important; color: black; border-color: #d3c5cc; }
419419
.btn-cat-device:hover { color: black; }
420-
.btn-cat-network { background-color: #d3ffc5; color: black; border-color: #d3ffc5; }
420+
.btn-cat-network { background-color: #d3ffc5 !important; color: black; border-color: #d3ffc5; }
421421
.btn-cat-network:hover { color: black; }
422-
.btn-cat-socket { background-color: #d3ffc5; color: black; border-color: #d3ffc5; }
422+
.btn-cat-socket { background-color: #d3ffc5 !important; color: black; border-color: #d3ffc5; }
423423
.btn-cat-socket:hover { color: black; }
424-
.btn-cat-synchronization { background-color: #f9c5ff; color: black; border-color: #f9c5ff; }
424+
.btn-cat-synchronization { background-color: #f9c5ff !important; color: black; border-color: #f9c5ff; }
425425
.btn-cat-synchronization:hover { color: black; }
426-
.btn-cat-browser { background-color: #dfffdf; color: black; border-color: #dfffdf; }
426+
.btn-cat-browser { background-color: #dfffdf !important; color: black; border-color: #dfffdf; }
427427
.btn-cat-browser:hover { color: black; }
428-
.btn-cat-crypto { background-color: #f0f2c5; color: black; border-color: #f0f2c5; }
428+
.btn-cat-crypto { background-color: #f0f2c5 !important; color: black; border-color: #f0f2c5; }
429429
.btn-cat-crypto:hover { color: black; }
430430

431431
/* Remove default underline, add on hover (exclude buttons if needed) */

‎web/templates/analysis/behavior/_processes.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242

4343
$("#top_pagination").removeClass("d-none");
4444
$("#bottom_pagination").removeClass("d-none");
45-
$(".badge-filter").removeClass("badge-light text-dark").addClass("badge-dark");
46-
$("#badge_default_" + pid).removeClass("badge-dark").addClass("badge-light text-dark");
45+
$(".badge-filter").removeClass("bg-light text-dark").addClass("bg-dark");
46+
$("#badge_default_" + pid).removeClass("bg-dark").addClass("bg-light text-dark");
4747
}
4848

4949
function show_tab(id, callback) {
@@ -91,8 +91,8 @@
9191

9292
$("#top_pagination").addClass("d-none");
9393
$("#bottom_pagination").addClass("d-none");
94-
$(".badge-filter").removeClass("badge-light text-dark").addClass("badge-dark");
95-
$("#badge_" + category + "_" + pid).removeClass("badge-dark").addClass("badge-light text-dark");
94+
$(".badge-filter").removeClass("bg-light text-dark").addClass("bg-dark");
95+
$("#badge_" + category + "_" + pid).removeClass("bg-dark").addClass("bg-light text-dark");
9696
}
9797
</script>
9898

‎web/templates/analysis/generic/_virustotal.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% if file.virustotal and not file.virustotal.error == True %}
2-
<div class="card bg-dark border-secondary mb-4">
2+
<div class="card bg-dark border-secondary mx-2 mb-4">
33
<div class="card-header border-secondary d-flex justify-content-between align-items-center">
44
<h5 class="mb-0 text-white">
55
<i class="fas fa-shield-virus me-2 text-danger"></i> VirusTotal

‎web/templates/analysis/network/_tcp.html‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,43 @@
11
<script src="{{ STATIC_URL }}js/hexdump.js"></script>
22
<section id="tcp" class="tcpudp">
3-
{% if network.tcp %}
4-
<h4>TCP</h4>
5-
<div class="row">
6-
<div class="col-md-6">
7-
<table class="table table-dark table-bordered">
8-
<tr>
9-
<th>Source</th>
10-
<th>Source Port</th>
11-
<th>Destination</th>
12-
<th>Destination Port</th>
13-
</tr>
14-
{% for p in network.tcp %}
15-
<tr class="connrow" data="{{p.src}},{{p.sport}},{{p.dst}},{{p.dport}},tcp">
16-
<td>{{p.src}}</td>
17-
<td>{{p.sport}}</td>
18-
<td>{{p.dst}}
19-
{% if network.iplookups %}
20-
{{ network.iplookups|get_item:p.dst }}
21-
{% endif %}
22-
</td>
23-
<td>{{p.dport}}</td>
24-
</tr>
25-
{% endfor %}
26-
</table>
27-
</div>
28-
<div class="stream col-md-6"></div>
3+
<div class="card bg-dark border-secondary">
4+
<div class="card-header border-secondary">
5+
<h5 class="mb-0 text-white"><i class="fas fa-network-wired me-2 text-info"></i>TCP Connections</h5>
296
</div>
30-
{% else %}
31-
<p>No TCP connections recorded.</p>
32-
{% endif %}
7+
{% if network.tcp %}
8+
<div class="card-body">
9+
<div class="row">
10+
<div class="col-md-6">
11+
<table class="table table-dark table-striped table-bordered">
12+
<tr>
13+
<th>Source</th>
14+
<th>Source Port</th>
15+
<th>Destination</th>
16+
<th>Destination Port</th>
17+
</tr>
18+
{% for p in network.tcp %}
19+
<tr class="connrow" data="{{p.src}},{{p.sport}},{{p.dst}},{{p.dport}},tcp">
20+
<td>{{p.src}}</td>
21+
<td>{{p.sport}}</td>
22+
<td>{{p.dst}}
23+
{% if network.iplookups %}
24+
{{ network.iplookups|get_item:p.dst }}
25+
{% endif %}
26+
</td>
27+
<td>{{p.dport}}</td>
28+
</tr>
29+
{% endfor %}
30+
</table>
31+
</div>
32+
<div class="stream col-md-6"></div>
33+
</div>
34+
</div>
35+
{% else %}
36+
<div class="card-body">
37+
<div class="alert alert-info">No TCP connections recorded.</div>
38+
</div>
39+
{% endif %}
40+
</div>
3341
</section>
3442
<script type='text/javascript'>
3543
$(function () {

‎web/templates/analysis/network/index.html‎

Lines changed: 97 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,113 @@
11
{% if network.pcap_sha256 %}
22

3-
<div class="alert alert-primary center">
4-
<a class="btn btn-secondary btn-sm" href="{% url "file" "pcap" id network.pcap_sha256 %}"><span class="fas fa-download"></span> PCAP</a>
3+
<div class="alert alert-secondary center">
4+
<a class="btn btn-primary btn-sm" href="{% url "file" "pcap" id network.pcap_sha256 %}"><span class="fas fa-download"></span> PCAP</a>
55
{% if config.pcap_ng %}
6-
<a class="btn btn-secondary btn-sm" title="PCAP with embedded TLS keys for use in WireShark." href="{% url "file" "pcapng" id "dump" %}"><span class="fas fa-download"></span> PCAP-NG</a>
6+
<a class="btn btn-primary btn-sm" title="PCAP with embedded TLS keys for use in WireShark." href="{% url "file" "pcapng" id "dump" %}"><span class="fas fa-download"></span> PCAP-NG</a>
77
{% endif %}
8-
<a class="btn btn-secondary btn-sm" href="{% url "file" "pcapzip" id network.pcap_sha256 %}"><span class="fas fa-file-archive"></span><span class="fas fa-download"></span> PCAP</a>
8+
<a class="btn btn-primary btn-sm" href="{% url "file" "pcapzip" id network.pcap_sha256 %}"><span class="fas fa-file-archive"></span><span class="fas fa-download"></span> PCAP</a>
99
{% if tlskeys_exists %}
10-
<a class="btn btn-secondary btn-sm" href="{% url "file" "tlskeys" id network.pcap_sha256 %}"><span class="fas fa-download"></span> TLS keys</a>
10+
<a class="btn btn-primary btn-sm" href="{% url "file" "tlskeys" id network.pcap_sha256 %}"><span class="fas fa-download"></span> TLS keys</a>
1111
{% endif %}
1212
{% if mitmdump_exists %}
13-
<a class="btn btn-secondary btn-sm" href="{% url "file" "mitmdump" id 0 %}"><span class="fas fa-download"></span> Mitmdump </a>
13+
<a class="btn btn-primary btn-sm" href="{% url "file" "mitmdump" id 0 %}"><span class="fas fa-download"></span> Mitmdump </a>
1414
{% endif %}
1515
</div>
1616
{% endif %}
17-
<ul class="nav nav-tabs flex-column flex-sm-row" style="margin-bottom: 0;">
18-
<li class="nav-item active"><a class="nav-link" href="#network_hosts_tab" data-bs-toggle="tab">Hosts ({{ network.hosts|length }})</a></li>
19-
<li class="nav-item"><a class="nav-link" href="#network_dns_tab" data-bs-toggle="tab">DNS ({{ network.domains|length }})</a></li>
20-
{% if network.tcp %}<li class="nav-item"><a class="nav-link" href="#network_tcp_tab" data-bs-toggle="tab">TCP ({{ network.tcp|length }})</a></li>{% endif %}
21-
{% if network.udp %}<li class="nav-item"><a class="nav-link" href="#network_udp_tab" data-bs-toggle="tab">UDP ({{ network.udp|length }})</a></li>{% endif %}
17+
<ul class="nav nav-pills nav-fill bg-dark rounded shadow-sm p-1 mb-3" id="networkTabs" role="tablist">
18+
<li class="nav-item">
19+
<a class="nav-link active" id="network_hosts-tab" href="#network_hosts_tab" data-bs-toggle="tab" role="tab" aria-controls="network_hosts_tab" aria-selected="true">
20+
<i class="fas fa-server me-2"></i>Hosts ({{ network.hosts|length }})
21+
</a>
22+
</li>
23+
<li class="nav-item">
24+
<a class="nav-link" id="network_dns-tab" href="#network_dns_tab" data-bs-toggle="tab" role="tab" aria-controls="network_dns_tab" aria-selected="false">
25+
<i class="fas fa-globe me-2"></i>DNS ({{ network.domains|length }})
26+
</a>
27+
</li>
28+
{% if network.tcp %}
29+
<li class="nav-item">
30+
<a class="nav-link" id="network_tcp-tab" href="#network_tcp_tab" data-bs-toggle="tab" role="tab" aria-controls="network_tcp_tab" aria-selected="false">
31+
<i class="fas fa-exchange-alt me-2"></i>TCP ({{ network.tcp|length }})
32+
</a>
33+
</li>
34+
{% endif %}
35+
{% if network.udp %}
36+
<li class="nav-item">
37+
<a class="nav-link" id="network_udp-tab" href="#network_udp_tab" data-bs-toggle="tab" role="tab" aria-controls="network_udp_tab" aria-selected="false">
38+
<i class="fas fa-broadcast-tower me-2"></i>UDP ({{ network.udp|length }})
39+
</a>
40+
</li>
41+
{% endif %}
2242
{% if network.http_ex or network.https_ex or network.http %}
23-
<li class="nav-item"><a class="nav-link" href="#network_http_tab" data-bs-toggle="tab">
24-
{% if network.http_ex or network.https_ex %}
25-
HTTP(S) <span class="button-badge">({{ network.http_ex|add:network.https_ex|length }})</span>
26-
{% else %}
27-
HTTP <span class="button-badge">({{ network.http|length }})</span>
28-
{% endif %}
29-
</a></li>
43+
<li class="nav-item">
44+
<a class="nav-link" id="network_http-tab" href="#network_http_tab" data-bs-toggle="tab" role="tab" aria-controls="network_http_tab" aria-selected="false">
45+
<i class="fas fa-globe-americas me-2"></i>
46+
{% if network.http_ex or network.https_ex %}
47+
HTTP(S) ({{ network.http_ex|add:network.https_ex|length }})
48+
{% else %}
49+
HTTP ({{ network.http|length }})
50+
{% endif %}
51+
</a>
52+
</li>
53+
{% endif %}
54+
{% if network.smtp_ex or network.smtp %}
55+
<li class="nav-item">
56+
<a class="nav-link" id="network_smtp-tab" href="#network_smtp_tab" data-bs-toggle="tab" role="tab" aria-controls="network_smtp_tab" aria-selected="false">
57+
<i class="fas fa-envelope me-2"></i>SMTP ({{ network.smtp|length }})
58+
</a>
59+
</li>
60+
{% endif %}
61+
{% if network.irc %}
62+
<li class="nav-item">
63+
<a class="nav-link" id="network_irc-tab" href="#network_irc_tab" data-bs-toggle="tab" role="tab" aria-controls="network_irc_tab" aria-selected="false">
64+
<i class="fas fa-comments me-2"></i>IRC ({{ network.irc|length }})
65+
</a>
66+
</li>
67+
{% endif %}
68+
{% if network.icmp %}
69+
<li class="nav-item">
70+
<a class="nav-link" id="network_icmp-tab" href="#network_icmp_tab" data-bs-toggle="tab" role="tab" aria-controls="network_icmp_tab" aria-selected="false">
71+
<i class="fas fa-heartbeat me-2"></i>ICMP ({{ network.icmp|length }})
72+
</a>
73+
</li>
74+
{% endif %}
75+
{% if config.cif and cif %}
76+
<li class="nav-item">
77+
<a class="nav-link" id="network_cif-tab" href="#network_cif_tab" data-bs-toggle="tab" role="tab" aria-controls="network_cif_tab" aria-selected="false">
78+
<i class="fas fa-shield-alt me-2"></i>CIF Results ({{ cif|length }})
79+
</a>
80+
</li>
3081
{% endif %}
31-
{% if network.smtp_ex or network.smtp %}<li class="nav-item"><a class="nav-link" href="#network_smtp_tab" data-bs-toggle="tab">SMTP ({{ network.smtp|length }})</a></li>{% endif %}
32-
{% if network.irc %}<li class="nav-item"><a class="nav-link" href="#network_irc_tab" data-bs-toggle="tab">IRC ({{ network.irc|length }})</a></li>{% endif %}
33-
{% if network.icmp %}<li class="nav-item"><a class="nav-link" href="#network_icmp_tab" data-bs-toggle="tab">ICMP ({{ network.icmp|length }})</a></li>{% endif %}
34-
{% if config.cif and cif %}<li class="nav-item"><a class="nav-link" href="#network_cif_tab" data-bs-toggle="tab">CIF Results ({{ cif|length }})</a></li>{% endif %}
3582
{% if config.suricata %}
36-
{% if suricata.alerts %}<li class="nav-item"><a class="nav-link" href="#network_suri_alerts_tab" data-bs-toggle="tab">Suricata Alerts ({{ suricata.alerts|length }})</a></li>{% endif %}
37-
{% if suricata.tls %}<li class="nav-item"><a class="nav-link" href="#network_suri_tls_tab" data-bs-toggle="tab">Suricata TLS ({{ suricata.tls|length }})</a></li>{% endif %}
38-
{% if suricata.http %}<li class="nav-item"><a class="nav-link" href="#network_suri_http_tab" data-bs-toggle="tab">Suricata HTTP ({{ suricata.http|length }})</a></li>{% endif %}
39-
{% if suricata.files %}<li class="nav-item"><a class="nav-link" href="#network_suri_files" data-bs-toggle="tab">Suricata Files ({{ suricata.files|length }})</a></li>{% endif %}
83+
{% if suricata.alerts %}
84+
<li class="nav-item">
85+
<a class="nav-link" id="network_suri_alerts-tab" href="#network_suri_alerts_tab" data-bs-toggle="tab" role="tab" aria-controls="network_suri_alerts_tab" aria-selected="false">
86+
<i class="fas fa-exclamation-triangle me-2"></i>Suricata Alerts ({{ suricata.alerts|length }})
87+
</a>
88+
</li>
89+
{% endif %}
90+
{% if suricata.tls %}
91+
<li class="nav-item">
92+
<a class="nav-link" id="network_suri_tls-tab" href="#network_suri_tls_tab" data-bs-toggle="tab" role="tab" aria-controls="network_suri_tls_tab" aria-selected="false">
93+
<i class="fas fa-lock me-2"></i>Suricata TLS ({{ suricata.tls|length }})
94+
</a>
95+
</li>
96+
{% endif %}
97+
{% if suricata.http %}
98+
<li class="nav-item">
99+
<a class="nav-link" id="network_suri_http-tab" href="#network_suri_http_tab" data-bs-toggle="tab" role="tab" aria-controls="network_suri_http_tab" aria-selected="false">
100+
<i class="fas fa-code me-2"></i>Suricata HTTP ({{ suricata.http|length }})
101+
</a>
102+
</li>
103+
{% endif %}
104+
{% if suricata.files %}
105+
<li class="nav-item">
106+
<a class="nav-link" id="network_suri_files-tab" href="#network_suri_files" data-bs-toggle="tab" role="tab" aria-controls="network_suri_files" aria-selected="false">
107+
<i class="fas fa-file-alt me-2"></i>Suricata Files ({{ suricata.files|length }})
108+
</a>
109+
</li>
110+
{% endif %}
40111
{% endif %}
41112
</ul>
42113
<div class="tab-content">

‎web/templates/analysis/overview/_info.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-info-circle me-2 text-primary"></i>
6363
<td class="text-nowrap">{{analysis.info.ended}}</td>
6464
<td>{{analysis.info.duration}}s</td>
6565
{% if analysis.info.options %}
66-
<td><button class="btn btn-sm btn-info" type="button" data-bs-toggle="collapse" data-bs-target="#options_collapse">View</button></td>
66+
<td><button class="btn btn-sm btn-outline-info" type="button" data-bs-toggle="collapse" data-bs-target="#options_collapse">View</button></td>
6767
{% endif %}
6868
{% if user.is_staff and analysis.distributed %}
6969
<td>{{analysis.distributed.name}} <small class="text-white-50">({{analysis.distributed.task_id}})</small></td>

‎web/templates/analysis/overview/index.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h5 class="mb-0 text-white"><i class="fas fa-cogs me-2 text-danger"></i> Malware
1515
{% for config_block in analysis.malware_conf %}
1616
{% for family, config in config_block.items %}
1717
{% if family|slice:":1" != "_" %}
18-
<div class="card bg-dark border-bottom border-secondary rounded-0">
18+
<div class="card bg-dark border-bottom border-secondary m-3">
1919
<div class="card-header p-0" id="heading{{family}}">
2020
<h2 class="mb-0">
2121
<button class="btn btn-block text-start p-3 d-flex align-items-center justify-content-between text-decoration-none shadow-none" type="button" data-bs-toggle="collapse" data-bs-target="#{{family}}_config" aria-expanded="true" aria-controls="{{family}}_config">
@@ -24,7 +24,6 @@ <h2 class="mb-0">
2424
{% if analysis.info.has_cents_rules %}
2525
<a class="btn btn-sm btn-outline-info me-3" href="{% url "filereport" analysis.info.id "cents" %}"><i class="fas fa-download me-1"></i> CENTS Rules</a>
2626
{% endif %}
27-
<i class="fas fa-chevron-down text-white-50"></i>
2827
</div>
2928
</button>
3029
</h2>

0 commit comments

Comments
 (0)