Merge pull request #3677 from levihackerman-102/Issue#7022

zaproxy · Apr 22, 2024 · bd576c8 · bd576c8
2 parents 2a1de50 + 694fce3
commit bd576c8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/addOns/automation/CHANGELOG.md b/addOns/automation/CHANGELOG.md
@@ -4,7 +4,8 @@ All notable changes to this add-on will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
-
+### Added
+- Allow reports to know the number of Sites tree nodes actively scanned (Issue 7022).
 
 ## [0.38.0] - 2024-04-11
 ### Fixed

diff --git a/...s/automation/src/main/java/org/zaproxy/addon/automation/jobs/ActiveScanJobResultData.java b/...s/automation/src/main/java/org/zaproxy/addon/automation/jobs/ActiveScanJobResultData.java
@@ -41,12 +41,15 @@ public class ActiveScanJobResultData extends JobResultData {
 
     private Map<Integer, RuleData> ruleDataMap = new HashMap<>();
     private Map<Integer, Alert> alertDataMap = new HashMap<>();
+    private int numberScannedNodes;
 
     public ActiveScanJobResultData(String jobName, ActiveScan activeScan) {
         super(jobName);
 
         RuleData data;
         for (HostProcess hp : activeScan.getHostProcesses()) {
+            numberScannedNodes += hp.getTestTotalCount();
+
             for (Plugin plugin : hp.getCompleted()) {
                 data =
                         ruleDataMap.computeIfAbsent(
@@ -71,6 +74,10 @@ public ActiveScanJobResultData(String jobName, ActiveScan activeScan) {
         }
     }
 
+    public int getNumberScannedNodes() {
+        return numberScannedNodes;
+    }
+
     public RuleData getRuleData(int ruleId) {
         return ruleDataMap.get(ruleId);
     }

diff --git a/addOns/reports/CHANGELOG.md b/addOns/reports/CHANGELOG.md
@@ -4,7 +4,9 @@ All notable changes to this add-on will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
-
+### Changed
+- The following reports now include the number of Sites tree nodes actively scanned:
+  - Traditional HTML with Requests and Responses
 
 ## [0.31.0] - 2024-03-25
 ### Changed

diff --git a/addOns/reports/src/main/zapHomeFiles/reports/traditional-html-plus/report.html b/addOns/reports/src/main/zapHomeFiles/reports/traditional-html-plus/report.html
@@ -190,6 +190,11 @@ <h3 th:text="#{report.template.pass.list}">Passing Rules</h3>
 	</th:block>
 
 	<h2 th:text="#{report.sites.title}">Sites</h2>
+
+	<strong>Number of Sites tree nodes actively scanned:</strong>
+	<th:block
+		th:text="${reportData.reportObjects.get('activeScanData') != null ? reportData.reportObjects.get('activeScanData').numberScannedNodes : 0}">42</th:block>
+
 	<th:block th:each="site: ${reportData.sites}">
 		<h3 th:text="${site}">Site</h3>
 		<th:block th:if="${reportData.isIncludeSection('statistics')}">

diff --git a/...s/src/test/resources/org/zaproxy/addon/reports/resources/basic-traditional-html-plus.html b/...s/src/test/resources/org/zaproxy/addon/reports/resources/basic-traditional-html-plus.html
@@ -191,7 +191,9 @@ <h3>Passing Rules</h3>
 
 
 	<h2>!reports.report.sites.title!</h2>
-
+
+		<strong>Number of Sites tree nodes actively scanned:</strong>0
+
 		<h3>http://example.com</h3>
 
 			<table class="summary">