Skip to content

Commit 1ae345a

Browse files
committed
Added proxy and script configuration to ZAP Global config.
1 parent 0545160 commit 1ae345a

14 files changed

Lines changed: 338 additions & 174 deletions

‎scanners/zap-extended/scanner/scbzapv2/zap_context.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ def _configure_context_authentication_script(self, zap: ZAPv2, script_config: co
167167
"""
168168

169169
if(not script_config == None and "scriptName" in script_config and "scriptFilePath" in script_config and "scriptEngine" in script_config):
170-
self._configure_load_script(zap, script_config, context_id, 'authentication')
170+
self._configure_load_script(zap=zap, script_config=script_config, script_type='authentication')
171171

172-
# Create ZAP Script parameters based on given configruation object
172+
# Create ZAP Script parameters based on given configuration object
173173
auth_params = [
174174
'scriptName=' + script_config["scriptName"],
175175
]
@@ -353,7 +353,7 @@ def _configure_context_create_users(self, zap: ZAPv2, users: collections.Ordered
353353
zap.forcedUser.set_forced_user(contextid=context_id, userid=user_id)
354354
zap.forcedUser.set_forced_user_mode_enabled(True)
355355

356-
def _configure_load_script(self, zap: ZAPv2, script: collections.OrderedDict, script_type:str, context_id: int):
356+
def _configure_load_script(self, zap: ZAPv2, script_config: collections.OrderedDict, script_type: str):
357357
"""Protected method to load a new ZAP Script based on a given ZAP config.
358358
359359
Parameters
@@ -366,26 +366,26 @@ def _configure_load_script(self, zap: ZAPv2, script: collections.OrderedDict, sc
366366
The zap context id tot configure the ZAP authentication for (based on the class ZapConfiguration).
367367
"""
368368

369-
if(script and "scriptName" in script and "scriptFilePath" in script and "scriptEngine" in script):
369+
if((script_config is not None) and "scriptName" in script_config and "scriptFilePath" in script_config and "scriptEngine" in script_config):
370370
# Remove exisitng Script if already exisiting
371-
logging.debug("Removing Auth script '%s' at '%s'", script["scriptName"], script["scriptFilePath"])
372-
zap.script.remove(scriptname=script["scriptName"])
371+
logging.debug("Removing pre-existing Auth script '%s' at '%s'", script_config["scriptName"], script_config["scriptFilePath"])
372+
zap.script.remove(scriptname=script_config["scriptName"])
373373

374374
# Add Script again
375-
logging.debug("Loading Authentication Script '%s' at '%s' with type: '%s' and engine '%s'", script["scriptName"], script["scriptFilePath"], script_type, script["scriptEngine"])
375+
logging.debug("Loading Authentication Script '%s' at '%s' with type: '%s' and engine '%s'", script_config["scriptName"], script_config["scriptFilePath"], script_type, script_config["scriptEngine"])
376376
response = zap.script.load(
377-
scriptname=script["scriptName"],
377+
scriptname=script_config["scriptName"],
378378
scripttype=script_type,
379-
scriptengine=script["scriptEngine"],
380-
filename=script["scriptFilePath"],
381-
scriptdescription=script["scriptDescription"]
379+
scriptengine=script_config["scriptEngine"],
380+
filename=script_config["scriptFilePath"],
381+
scriptdescription=script_config["scriptDescription"]
382382
)
383383

384384
if response != "OK":
385385
logging.warning("Script Response: %s", response)
386-
raise RuntimeError("The Script (%s) couldnt be loaded due to errors: %s", script, response)
386+
raise RuntimeError("The script (%s) couldn't be loaded due to errors: %s", script_config, response)
387387

388-
zap.script.enable(scriptname=script["scriptName"])
388+
zap.script.enable(scriptname=script_config["scriptName"])
389389

390390
self._show_all_scripts(zap)
391391
else:
@@ -427,7 +427,7 @@ def _configure_context_session_management(self, zap: ZAPv2, sessions_config: col
427427
script_config = sessions_config["scriptBasedSessionManagement"]
428428
logging.debug("Script Config: %s", str(script_config))
429429
if(not script_config == None and "scriptName" in script_config and "scriptFilePath" in script_config and "scriptEngine" in script_config):
430-
self._configure_load_script(zap, script=script_config, script_type="session", context_id=context_id)
430+
self._configure_load_script(zap=zap, script_config=script_config, script_type="session")
431431
# Here they say that only "cookieBasedSessionManagement"; "httpAuthSessionManagement"
432432
# is possible, but maybe this is outdated and it works anyway, hopefully:
433433
# https://github.com/zaproxy/zap-api-python/blob/9bab9bf1862df389a32aab15ea4a910551ba5bfc/src/examples/zap_example_api_script.py#L97

‎scanners/zap-extended/scanner/scbzapv2/zap_extended.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def __init__(self, zap: ZAPv2, config_dir: str):
5757
self.__zap_spider = None
5858
self.__zap_scan = None
5959

60-
def scb_scan(self, target:str):
60+
def scb_scan(self, target: str):
6161

6262
# wait at least 3 minutes for ZAP to start
6363
self.wait_for_zap_start(3 * 60)

0 commit comments

Comments
 (0)