p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Moved scoutsuit submodule directory, because island might want to call it's method to check for setup

This commit is contained in:
VakarisZ 2020-10-01 12:39:45 +03:00
parent 04b00febd1
commit 9dc0211341
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -5,5 +5,5 @@
path = docs/themes/learn
url = https://github.com/guardicode/hugo-theme-learn.git
[submodule "monkey/infection_monkey/system_info/collectors/scoutsuite"]
path = monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite
path = monkey/common/cloud/scoutsuite
url = https://github.com/ShayNehmad/ScoutSuite.git

1
monkey/common/cloud/scoutsuite Submodule

@ -0,0 +1 @@
Subproject commit 6d7178d7a1249024bea0ec20985f73aa35ab4809

1
monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite

@ -1 +0,0 @@
Subproject commit e5f9760a822cc8856a1be3da691c511ad32ad7dd

5
monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite_api.py
View File

@ -2,8 +2,7 @@ import pkgutil
import sys
from pathlib import PurePath
_scoutsuite_api_package = pkgutil.get_loader('infection_monkey.system_info.collectors.'
'scoutsuite_collector.scoutsuite.ScoutSuite.__main__')
_scoutsuite_api_package = pkgutil.get_loader('common.cloud.scoutsuite.ScoutSuite.__main__')
def _add_scoutsuite_to_python_path():
@ -13,7 +12,7 @@ def _add_scoutsuite_to_python_path():
_add_scoutsuite_to_python_path()
import infection_monkey.system_info.collectors.scoutsuite_collector.scoutsuite.ScoutSuite.api_run as scoutsuite_api
import common.cloud.scoutsuite.ScoutSuite.api_run as scoutsuite_api
def run(*args, **kwargs):

2
monkey/infection_monkey/telemetry/scoutsuite_telem.py
View File

@ -1,5 +1,5 @@
from common.common_consts.telem_categories import TelemCategoryEnum
from infection_monkey.system_info.collectors.scoutsuite_collector.scoutsuite.ScoutSuite.output.result_encoder import \
from common.cloud.scoutsuite.ScoutSuite.output.result_encoder import \
ScoutJsonEncoder
from infection_monkey.telemetry.base_telem import BaseTelem