Update pscan rule handling

Signed-off-by: kingthorin <[email protected]>

Author: kingthorin

CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Update minimum ZAP version to 2.16.0 and compile with Java 17.
 - Add cautionary note to help and readme.
 - Maintenance and documentation changes.
+- Updated scan_rule_list.js to work with ZAP 2.16.0 and later.
 
 ### Fixed 
 - The following scripts were not being loaded as scan rules:

standalone/alertAndPluginDetails.js

@@ -1,7 +1,7 @@
 /* Output sample:
- *     Alert_Name	Source:PluginName	WASC	CWE
- *     Cross Site Scripting (DOM Based)	ACTIVE:Cross Site Scripting (DOM Based)	8	79
- *     Non-Storable Content	PASSIVE:Content Cacheability	13	524
+ *     Alert_Name    Source:PluginName   WASC    CWE
+ *     Cross Site Scripting (DOM Based) ACTIVE:Cross Site Scripting (DOM Based) 8   79
+ *     Non-Storable Content PASSIVE:Content Cacheability    13  524
  * It's tab separated so you can simply copy/paste it into Excel (or whatever).
  */
 
@@ -11,7 +11,7 @@ extAlert = control
 
 extPscan = control
   .getExtensionLoader()
-  .getExtension(org.zaproxy.zap.extension.pscan.ExtensionPassiveScan.NAME);
+  .getExtension(org.zaproxy.addon.pscan.ExtensionPassiveScan2.NAME);
 
 var pf = Java.type("org.parosproxy.paros.core.scanner.PluginFactory");
 
@@ -43,7 +43,7 @@ function printAlert(alert) {
     }
   }
   if (alert.getSource() == Alert.Source.PASSIVE && extPscan != null) {
-    plugin = extPscan.getPluginPassiveScanner(alert.getPluginId());
+    plugin = extPscan.getPassiveScannersManager().getScanRule(alert.getPluginId());
     if (plugin != null) {
       scanner = plugin.getName();
     }

standalone/scan_rule_list.js

@@ -29,9 +29,9 @@ for (var i = 0; i < plugins.length; i++) {
 
 extPscan = control
   .getExtensionLoader()
-  .getExtension(org.zaproxy.zap.extension.pscan.ExtensionPassiveScan.NAME);
+  .getExtension(org.zaproxy.addon.pscan.ExtensionPassiveScan2.NAME);
 
-plugins = extPscan.getPluginPassiveScanners().toArray();
+plugins = extPscan.getPassiveScannersManager().getScanRules();
 
 for (var i = 0; i < plugins.length; i++) {
   try {