p34709852
/
monkey
forked from p15670423/monkey
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed scoutsuite bug that caused bad exception handling

This commit is contained in:
VakarisZ 2020-10-02 11:00:06 +03:00
parent d2a8597903
commit 672c19ef0d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/common/cloud/scoutsuite

@ -1 +1 @@
Subproject commit 6d7178d7a1249024bea0ec20985f73aa35ab4809 Subproject commit b806593875e7927f1b1b20cb5bc27da0025dbb51

2
monkey/infection_monkey/monkey.py
View File

@ -250,7 +250,7 @@ class InfectionMonkey(object):
LOG.debug("Running with depth: %d" % WormConfiguration.depth) LOG.debug("Running with depth: %d" % WormConfiguration.depth)
def collect_system_info_if_configured(self): def collect_system_info_if_configured(self):
LOG.debug("Calling system info collection") LOG.debug("Calling for system info collection")
system_info_collector = SystemInfoCollector() system_info_collector = SystemInfoCollector()
system_info = system_info_collector.get_info() system_info = system_info_collector.get_info()
SystemInfoTelem(system_info).send() SystemInfoTelem(system_info).send()

2
monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite_collector.py
View File

@ -11,7 +11,7 @@ logger = logging.getLogger(__name__)
def scan_cloud_security(cloud_type: PROVIDERS): def scan_cloud_security(cloud_type: PROVIDERS):
try: try:
results = run_scoutsuite(cloud_type.value) results = run_scoutsuite(cloud_type.value)
if 'error' in results and results['error']: if isinstance(results, dict) and 'error' in results and results['error']:
raise Exception(results['error']) raise Exception(results['error'])
send_results(results) send_results(results)
except Exception as e: except Exception as e: