Merge pull request #563 from thc202/rm-pscan-help

Remove/update passive scanner help
zaproxy · Nov 25, 2024 · 7e52466 · 7e52466
2 parents 92c8c4f + eb2eaf3
commit 7e52466
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 209 deletions.
diff --git a/addOns/help/src/main/javahelp/contents/start/features/pscan.html b/addOns/help/src/main/javahelp/contents/start/features/pscan.html
@@ -9,48 +9,8 @@
 <BODY>
 <H1>Passive Scan</H1>
 <p>
-ZAP by default passively scans all HTTP messages (requests and responses) sent to the web application being tested.<br/>
-Passive scanning does not change the requests nor the responses in any way and is therefore safe to use.<br/>
-Scanning is performed in a background thread to ensure that it does not slow down the exploration
-of an application.
-</p>
-<p>
-The (main) behaviour of the passive scanner can be configured using the 
-<a href="../../ui/dialogs/options/pscanner.html">Options Passive Scanner Screen</a>.
-</p>
-<p>
-Passive scanning can also be used for automatically adding <a href="tags.html">tags</a>
-and raising <a href="alerts.html">alerts</a> for potential issues.<br>
-A set of rules for automatic tagging are provided by default. These can be changed, deleted or
-added to via the <a href="../../ui/dialogs/options/pscan.html">Options Passive Scan Tags screen</a>.
-</p>
-
-<p>
-The alerts raised by passive scan rules can be configured using the 
-<a href="../../ui/dialogs/options/pscanrules.html">Options Passive Scan Rules screen</a>.<br/>
-</p>
-
-<H2>See also</H2>
-<table>
-<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td>
-<a href="../../ui/overview.html">UI Overview</a></td><td>for an overview of the user interface</td></tr>
-<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td>
-<a href="features.html">Features</a></td><td>provided by ZAP</td></tr>
-<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td>
-<a href="ascan.html">Active scanning</a></td><td></td></tr>
-<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td>
-<a href="../checks.html">Scanner Rules</a></td><td>supported by default</td></tr>
-</table>
-
-<H2>Official Videos</H2>
-<table>
-<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-<td><a href="https://play.sonatype.com/watch/vDWpoYjHi7fSLYFDQPWgMF">ZAP In Ten: Passive Scanning</a> (10:27)</td></tr>
-<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-<td><a href="https://play.vidyard.com/HfENJ3GJB3zbD6sMscDrjD">ZAP In Ten: Passive Scan Scripts</a> (11:53)</td></tr>
-<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-<td><a href="https://www.youtube.com/watch?v=Rx42kyrB0nk">Deep Dive: Passive Scanning</a> (27:35)</td></tr>
-</table>
+The passive scanner is provided by the <a href="https://www.zaproxy.org/docs/desktop/addons/passive-scanner/">Passive Scanner add-on</a>,
+which allows to passively scan messages (e.g. HTTP, WebSocket) proxied/sent through/by ZAP.
 
 </BODY>
 </HTML>
diff --git a/addOns/help/src/main/javahelp/contents/ui/dialogs/options/options.html b/addOns/help/src/main/javahelp/contents/ui/dialogs/options/options.html
@@ -25,9 +25,6 @@ <H1>Options dialog</H1>
 <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="jvm.html">JVM</a></td><td></td></tr>
 <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="keyboard.html">Keyboard</a></td><td></td></tr>
 <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="language.html">Language</a></td><td></td></tr>
-<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="pscanrules.html">Passive Scan Rules</a></td><td></td></tr>
-<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="pscan.html">Passive Scan Tags</a></td><td></td></tr>
-<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="pscanner.html">Passive Scanner</a></td><td></td></tr>
 <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="ruleconfig.html">Rule Configuration</a></td><td></td></tr>
 <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="script.html">Scripts</a></td><td></td></tr>
 <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a href="search.html">Search</a></td><td></td></tr>

diff --git a/addOns/help/src/main/javahelp/contents/ui/dialogs/options/pscan.html b/addOns/help/src/main/javahelp/contents/ui/dialogs/options/pscan.html
diff --git a/addOns/help/src/main/javahelp/contents/ui/dialogs/options/pscanner.html b/addOns/help/src/main/javahelp/contents/ui/dialogs/options/pscanner.html
diff --git a/addOns/help/src/main/javahelp/contents/ui/dialogs/options/pscanrules.html b/addOns/help/src/main/javahelp/contents/ui/dialogs/options/pscanrules.html
diff --git a/addOns/help/src/main/javahelp/contents/ui/dialogs/scanpolicy.html b/addOns/help/src/main/javahelp/contents/ui/dialogs/scanpolicy.html
@@ -13,10 +13,6 @@ <H1>Scan Policy Dialog</H1>
 The first screen allows you to define the default levels as well as the levels for all of the rules in a specific category.<br>
 <br>
 The category screens allow you to define the levels for every individual rule.<br>
-<br>
-<br>
-Note that <a href="../../start/features/pscan.html">passive scan</a> rules are no longer managed via this dialog but are instead 
-managed via the <a href="../../ui/dialogs/options/pscanrules.html">Options Passive Scan Rules</a>.
 </p>
 
 <H3>Threshold</H3>

diff --git a/commonFiles/src/main/resources/map.jhm b/commonFiles/src/main/resources/map.jhm
@@ -134,9 +134,6 @@
      	<mapID target="ui.dialogs.options.jvm" url="contents/ui/dialogs/options/jvm.html"/>
      	<mapID target="ui.dialogs.options.keyboard" url="contents/ui/dialogs/options/keyboard.html"/>
      	<mapID target="ui.dialogs.options.language" url="contents/ui/dialogs/options/language.html"/>
-     	<mapID target="ui.dialogs.options.pscan" url="contents/ui/dialogs/options/pscan.html"/>
-     	<mapID target="ui.dialogs.options.pscanrules" url="contents/ui/dialogs/options/pscanrules.html"/>
-     	<mapID target="ui.dialogs.options.pscan.main" url="contents/ui/dialogs/options/pscanner.html"/>
      	<mapID target="ui.dialogs.options.ruleconfig" url="contents/ui/dialogs/options/ruleconfig.html" />
      	<mapID target="ui.dialogs.options.script" url="contents/ui/dialogs/options/script.html" />
      	<mapID target="ui.dialogs.options.search" url="contents/ui/dialogs/options/search.html" />