From 89c5321d0564ba065f8ccd211b9f69a7c4e01993 Mon Sep 17 00:00:00 2001
From: Raynald <raynald@easi-services.fr>
Date: Wed, 15 Nov 2023 15:00:40 +0100
Subject: [PATCH 1/8] Add a check to not load datatables twice

---
 web/startScan/templates/startScan/detail_scan.html | 5 +++++
 web/targetApp/templates/target/summary.html        | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/web/startScan/templates/startScan/detail_scan.html b/web/startScan/templates/startScan/detail_scan.html
index ffecb9b88..14f93b05c 100644
--- a/web/startScan/templates/startScan/detail_scan.html
+++ b/web/startScan/templates/startScan/detail_scan.html
@@ -2111,6 +2111,11 @@ <h4 class="header-title mb-0"><span id="endpoint_change_count"><span class="spin
 	{% endif %}
 
 	$("#pills-subdomain-tab").click(function() {
+		// prevent table loading twice
+		// https://datatables.net/manual/tech-notes/3
+		if ( $.fn.dataTable.isDataTable( '#subdomain_scan_results' ) ) {
+			return false;
+		}
 		var subdomain_ajax_url = '/api/listDatatableSubdomain/?project={{current_project.slug}}&scan_id={{scan_history_id}}&format=datatables';
 		var is_subd_grouping = false;
 		var subd_grouping_col = 8;
diff --git a/web/targetApp/templates/target/summary.html b/web/targetApp/templates/target/summary.html
index 052c1b91b..7704d177f 100644
--- a/web/targetApp/templates/target/summary.html
+++ b/web/targetApp/templates/target/summary.html
@@ -903,6 +903,11 @@ <h4 class="header-title mb-0"><span id="technologies-count"><span class="spinner
 	chart.render()
 
 	$("#pills-subdomain-tab").click(function() {
+		// prevent table loading twice
+		// https://datatables.net/manual/tech-notes/3
+		if ( $.fn.dataTable.isDataTable( '#subdomain_scan_results' ) ) {
+			return false;
+		}
 		var subdomain_ajax_url = '/api/listDatatableSubdomain/?project={{current_project.slug}}&scan_id={{target.id}}&format=datatables';
 		var is_subd_grouping = false;
 		var subd_grouping_col = 8;

From 24574d955e7d28a80585997b5b2a5e15e9f34997 Mon Sep 17 00:00:00 2001
From: Raynald <raynald@easi-services.fr>
Date: Wed, 15 Nov 2023 15:42:33 +0100
Subject: [PATCH 2/8] Prevent reload on click for vuln DT + add reload btn

---
 web/startScan/templates/startScan/detail_scan.html       | 9 +++++++++
 web/startScan/templates/startScan/vulnerabilities.html   | 3 +++
 web/targetApp/templates/target/summary.html              | 9 +++++++--
 web/templates/base/_items/vulnerability_tab_content.html | 3 +++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/web/startScan/templates/startScan/detail_scan.html b/web/startScan/templates/startScan/detail_scan.html
index 14f93b05c..88de5a42b 100644
--- a/web/startScan/templates/startScan/detail_scan.html
+++ b/web/startScan/templates/startScan/detail_scan.html
@@ -1536,6 +1536,11 @@ <h4 class="header-title mb-0"><span id="endpoint_change_count"><span class="spin
 		// vulnerability datatable
 		const ps2 = new PerfectScrollbar(document.querySelector('.vulnerability-search'));
 		$("#pills-vulnerabilities-tab").click(function() {
+			// prevent table loading twice
+			// https://datatables.net/manual/tech-notes/3
+			if ( $.fn.dataTable.isDataTable( '#subdomain_scan_results' ) ) {
+				return false;
+			}
 			var is_grouping = false;
 			var grouping_col = 3;
 			var vuln_ajax_url = '/api/listVulnerability/?scan_history={{scan_history_id}}&format=datatables';
@@ -1777,6 +1782,10 @@ <h4 class="header-title mb-0"><span id="endpoint_change_count"><span class="spin
 				});
 			});
 
+			$('#reload_vulnerabilities_table_btn').click(function () {
+				vulnerability_table.ajax.reload();
+			});
+			
 			$('#vulnerability-search-button').click(function () {
 				vulnerability_table.search($('#vulnerability-search').val()).draw() ;
 			});
diff --git a/web/startScan/templates/startScan/vulnerabilities.html b/web/startScan/templates/startScan/vulnerabilities.html
index 9c7c4631e..65c339228 100644
--- a/web/startScan/templates/startScan/vulnerabilities.html
+++ b/web/startScan/templates/startScan/vulnerabilities.html
@@ -323,6 +323,9 @@
 			}
 		});
 	});
+	$('#reload_vulnerabilities_table_btn').click(function () {
+		vulnerability_table.ajax.reload();
+	});
 });
 
 var vulnerability_cols = [
diff --git a/web/targetApp/templates/target/summary.html b/web/targetApp/templates/target/summary.html
index 7704d177f..ca4afc12a 100644
--- a/web/targetApp/templates/target/summary.html
+++ b/web/targetApp/templates/target/summary.html
@@ -915,7 +915,7 @@ <h4 class="header-title mb-0"><span id="technologies-count"><span class="spinner
 			"headerCallback": function(e, a, t, n, s) {
 				e.getElementsByTagName("th")[0].innerHTML='<div class="form-check ms-1 form-check-primary"><input type="checkbox" class="float-start form-check-input chk-parent" id="head_checkbox" onclick=mainCheckBoxSelected(this)>\n<span class="new-control-indicator"></span><span style="visibility:hidden">c</span></div>\n'
 			},
-			"destroy": true,
+			"destroy": false,
 			"processing": true,
 			"oLanguage": subdomain_oLanguage,
 			"fnCreatedRow": function (nRow, aData, iDataIndex) {
@@ -1340,11 +1340,16 @@ <h4 class="header-title mb-0"><span id="technologies-count"><span class="spinner
 	});
 
 	$("#pills-vulnerabilities-tab").click(function() {
+		// prevent table loading twice
+		// https://datatables.net/manual/tech-notes/3
+		if ( $.fn.dataTable.isDataTable( '#subdomain_scan_results' ) ) {
+			return false;
+		}
 		var is_grouping = false;
 		var grouping_col = 3;
 		var vuln_ajax_url = '/api/listVulnerability/?target_id={{target.id}}&format=datatables';
 		var vulnerability_table = $('#vulnerability_results').DataTable({
-			"destroy": true,
+			"destroy": false,
 			"oLanguage": {
 				"oPaginate": {
 					"sPrevious": '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" class="feather feather-arrow-left"><line x1="19" y1="12" x2="5" y2="12"></line><polyline points="12 19 5 12 12 5"></polyline></svg>',
diff --git a/web/templates/base/_items/vulnerability_tab_content.html b/web/templates/base/_items/vulnerability_tab_content.html
index 675f13578..4f0d7e16b 100644
--- a/web/templates/base/_items/vulnerability_tab_content.html
+++ b/web/templates/base/_items/vulnerability_tab_content.html
@@ -87,6 +87,9 @@
 							</div>
 						</div>
 					</div>
+					<a class="btn btn-soft-primary ms-2 me-2" data-toggle="tooltip" data-placement="top" title="Reload Vulnerabilities" id="reload_vulnerabilities_table_btn">
+						<i class="fe-refresh-cw"></i>
+					</a>
 					<div class="col-12">
 						<table id="vulnerability_results" class="table dt-responsive w-100">
 							<thead>

From 3ceff80a6bf5464f62bec2d3d798e734fcb54518 Mon Sep 17 00:00:00 2001
From: Raynald <raynald@easi-services.fr>
Date: Wed, 15 Nov 2023 15:50:43 +0100
Subject: [PATCH 3/8] Replace bad id

---
 web/startScan/templates/startScan/detail_scan.html | 2 +-
 web/targetApp/templates/target/summary.html        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/startScan/templates/startScan/detail_scan.html b/web/startScan/templates/startScan/detail_scan.html
index 88de5a42b..e48c23808 100644
--- a/web/startScan/templates/startScan/detail_scan.html
+++ b/web/startScan/templates/startScan/detail_scan.html
@@ -1538,7 +1538,7 @@ <h4 class="header-title mb-0"><span id="endpoint_change_count"><span class="spin
 		$("#pills-vulnerabilities-tab").click(function() {
 			// prevent table loading twice
 			// https://datatables.net/manual/tech-notes/3
-			if ( $.fn.dataTable.isDataTable( '#subdomain_scan_results' ) ) {
+			if ( $.fn.dataTable.isDataTable( '#vulnerability_results' ) ) {
 				return false;
 			}
 			var is_grouping = false;
diff --git a/web/targetApp/templates/target/summary.html b/web/targetApp/templates/target/summary.html
index ca4afc12a..1c3f0c8c5 100644
--- a/web/targetApp/templates/target/summary.html
+++ b/web/targetApp/templates/target/summary.html
@@ -1342,7 +1342,7 @@ <h4 class="header-title mb-0"><span id="technologies-count"><span class="spinner
 	$("#pills-vulnerabilities-tab").click(function() {
 		// prevent table loading twice
 		// https://datatables.net/manual/tech-notes/3
-		if ( $.fn.dataTable.isDataTable( '#subdomain_scan_results' ) ) {
+		if ( $.fn.dataTable.isDataTable( '#vulnerability_results' ) ) {
 			return false;
 		}
 		var is_grouping = false;

From ee7f8538f2f11170c3b5163ea0a841514421c8f1 Mon Sep 17 00:00:00 2001
From: Raynald <raynald@easi-services.fr>
Date: Wed, 15 Nov 2023 16:07:12 +0100
Subject: [PATCH 4/8] Move reload button

---
 .../base/_items/vulnerability_tab_content.html         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/templates/base/_items/vulnerability_tab_content.html b/web/templates/base/_items/vulnerability_tab_content.html
index 4f0d7e16b..8c309842b 100644
--- a/web/templates/base/_items/vulnerability_tab_content.html
+++ b/web/templates/base/_items/vulnerability_tab_content.html
@@ -25,7 +25,7 @@
 							<button class="btn btn-soft-primary dropdown-toggle ms-1" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-toggle="tooltip" data-placement="left" title="Filter Columns">
 								<i class="fe-filter"></i>
 							</button>
-							<div class="dropdown-menu" style="">
+							<div class="dropdown-menu">
 								<div class="dropdown-item">
 									<div class="form-check">
 										<input type="checkbox" class="form-check-input" id="vuln_source_checkbox" name="vuln_source_checkbox" checked>
@@ -54,12 +54,15 @@
 									</div>
 								</div>
 							</div>
+							<a class="btn btn-soft-primary ms-2 me-2" data-toggle="tooltip" data-placement="top" title="Reload Vulnerabilities" id="reload_vulnerabilities_table_btn">
+								<i class="fe-refresh-cw"></i>
+							</a>
 						</div>
 						<div class="btn-group mb-2 float-end dropstart">
 							<button class="btn btn-soft-info dropdown-toggle ms-1" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-toggle="tooltip" data-placement="left" title="Vulnerability Grouping">
 								<i class="fe-layout"></i>
 							</button>
-							<div class="dropdown-menu" style="">
+							<div class="dropdown-menu">
 								<div class="dropdown-item">
 									<div class="form-check">
 										<input type="radio" id="vulnerability_name_grouping" name="grouping_vuln_row" class="form-check-input" value="name">
@@ -87,9 +90,6 @@
 							</div>
 						</div>
 					</div>
-					<a class="btn btn-soft-primary ms-2 me-2" data-toggle="tooltip" data-placement="top" title="Reload Vulnerabilities" id="reload_vulnerabilities_table_btn">
-						<i class="fe-refresh-cw"></i>
-					</a>
 					<div class="col-12">
 						<table id="vulnerability_results" class="table dt-responsive w-100">
 							<thead>

From fe9c64f11b0cf08dd630f5e78dcbef762e20decb Mon Sep 17 00:00:00 2001
From: Raynald <raynald@easi-services.fr>
Date: Wed, 15 Nov 2023 16:13:40 +0100
Subject: [PATCH 5/8] Add missing reload js listener on target page

---
 web/targetApp/templates/target/summary.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/targetApp/templates/target/summary.html b/web/targetApp/templates/target/summary.html
index 1c3f0c8c5..48a3ed7cf 100644
--- a/web/targetApp/templates/target/summary.html
+++ b/web/targetApp/templates/target/summary.html
@@ -1568,6 +1568,9 @@ <h4 class="header-title mb-0"><span id="technologies-count"><span class="spinner
 					}
 				});
 			});
+			$('#reload_vulnerabilities_table_btn').click(function() {
+				vulnerability_table.ajax.reload();
+			});
 			// column visibility
 			vulnerability_datatable_col_visibility(vulnerability_table);
 		},

From ed3661cc0e4360b546215997e2f73ca21b2ca397 Mon Sep 17 00:00:00 2001
From: Raynald <raynald@easi-services.fr>
Date: Wed, 15 Nov 2023 16:33:25 +0100
Subject: [PATCH 6/8] Don't load screenshots if table is not empty

---
 web/startScan/static/startScan/js/detail_scan.js   | 3 +++
 web/startScan/templates/startScan/detail_scan.html | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/web/startScan/static/startScan/js/detail_scan.js b/web/startScan/static/startScan/js/detail_scan.js
index b2241da97..b88a1f46d 100644
--- a/web/startScan/static/startScan/js/detail_scan.js
+++ b/web/startScan/static/startScan/js/detail_scan.js
@@ -483,6 +483,9 @@ function get_osint_users(scan_id){
 }
 
 function get_screenshot(scan_id){
+	if($('#screenshots-table').children().length > 0) {
+		return false;
+	}
 	var port_array = [];
 	var service_array = [];
 	var tech_array = [];
diff --git a/web/startScan/templates/startScan/detail_scan.html b/web/startScan/templates/startScan/detail_scan.html
index e48c23808..82c07d6f0 100644
--- a/web/startScan/templates/startScan/detail_scan.html
+++ b/web/startScan/templates/startScan/detail_scan.html
@@ -1034,7 +1034,7 @@ <h5 class="text-center mt-3">Loading Screenshots...</h5>
 								</div>
 							</div>
 							<div class="col-12">
-								<div class="gridzy">
+								<div class="gridzy" id="screenshots-table">
 								</div>
 							</div>
 						</div>
@@ -2020,6 +2020,10 @@ <h4 class="header-title mb-0"><span id="endpoint_change_count"><span class="spin
 
 	{% if 'screenshot' in history.tasks %}
 		$("#pills-screenshot-tab").click(function() {
+			// prevent table loading twice because it loads image twice and fails search
+			if ( $.fn.dataTable.isDataTable( '#vulnerability_results' ) ) {
+				return false;
+			}
 			get_screenshot({{scan_history_id}});
 
 			//animate search placeholder

From 0c1924fbd75e891e14ac1c54b6e26f3df500f1fc Mon Sep 17 00:00:00 2001
From: Raynald <raynald@easi-services.fr>
Date: Wed, 15 Nov 2023 16:57:49 +0100
Subject: [PATCH 7/8] Move screenshot condition to correct location

---
 web/startScan/static/startScan/js/detail_scan.js   | 3 ---
 web/startScan/templates/startScan/detail_scan.html | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/web/startScan/static/startScan/js/detail_scan.js b/web/startScan/static/startScan/js/detail_scan.js
index b88a1f46d..b2241da97 100644
--- a/web/startScan/static/startScan/js/detail_scan.js
+++ b/web/startScan/static/startScan/js/detail_scan.js
@@ -483,9 +483,6 @@ function get_osint_users(scan_id){
 }
 
 function get_screenshot(scan_id){
-	if($('#screenshots-table').children().length > 0) {
-		return false;
-	}
 	var port_array = [];
 	var service_array = [];
 	var tech_array = [];
diff --git a/web/startScan/templates/startScan/detail_scan.html b/web/startScan/templates/startScan/detail_scan.html
index 82c07d6f0..afb7bbd53 100644
--- a/web/startScan/templates/startScan/detail_scan.html
+++ b/web/startScan/templates/startScan/detail_scan.html
@@ -2020,8 +2020,7 @@ <h4 class="header-title mb-0"><span id="endpoint_change_count"><span class="spin
 
 	{% if 'screenshot' in history.tasks %}
 		$("#pills-screenshot-tab").click(function() {
-			// prevent table loading twice because it loads image twice and fails search
-			if ( $.fn.dataTable.isDataTable( '#vulnerability_results' ) ) {
+			if($('#screenshots-table').children().length > 0) {
 				return false;
 			}
 			get_screenshot({{scan_history_id}});

From 66f2dba118181382e3492236423b250ffa9e7c69 Mon Sep 17 00:00:00 2001
From: Raynald <raynald@easi-services.fr>
Date: Fri, 17 Nov 2023 23:47:07 +0100
Subject: [PATCH 8/8] Prevent reload from visualization (which dup the graph)

---
 web/startScan/templates/startScan/detail_scan.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/startScan/templates/startScan/detail_scan.html b/web/startScan/templates/startScan/detail_scan.html
index afb7bbd53..2e3dc6471 100644
--- a/web/startScan/templates/startScan/detail_scan.html
+++ b/web/startScan/templates/startScan/detail_scan.html
@@ -2107,6 +2107,9 @@ <h4 class="header-title mb-0"><span id="endpoint_change_count"><span class="spin
 	});
 
 	$("#pills-visualisation-tab").click(function() {
+		if($('#visualisation').children().length > 0) {
+			return false;
+		}
 		visualise_scan_results({{scan_history_id}});
 	});