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

Merge pull request #1045 from guardicore/scoutsuite_fix 

Minor ScoutSuite related fixes
This commit is contained in:
VakarisZ 2021-03-23 14:42:47 +02:00 committed by GitHub
parent ef0c3c2f66 9c8e0a8270
commit 08df196a26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment_scripts/deploy_linux.sh
View File

@ -66,7 +66,6 @@ MONGO_PATH="$ISLAND_PATH/bin/mongodb"
ISLAND_BINARIES_PATH="$ISLAND_PATH/cc/binaries" ISLAND_BINARIES_PATH="$ISLAND_PATH/cc/binaries"
INFECTION_MONKEY_DIR="$monkey_home/monkey/infection_monkey" INFECTION_MONKEY_DIR="$monkey_home/monkey/infection_monkey"
MONKEY_BIN_DIR="$INFECTION_MONKEY_DIR/bin" MONKEY_BIN_DIR="$INFECTION_MONKEY_DIR/bin"
SCOUTSUITE_DIR="$monkey_home/monkey/common/cloud/scoutsuite"
if ! has_sudo; then if ! has_sudo; then
log_message "You need root permissions for some of this script operations. \ log_message "You need root permissions for some of this script operations. \
@ -142,10 +141,6 @@ sudo apt-get install -y libffi-dev upx libssl-dev libc++1
requirements_monkey="$INFECTION_MONKEY_DIR/requirements.txt" requirements_monkey="$INFECTION_MONKEY_DIR/requirements.txt"
${python_cmd} -m pip install -r "${requirements_monkey}" --user --upgrade || handle_error ${python_cmd} -m pip install -r "${requirements_monkey}" --user --upgrade || handle_error
log_message "Installing ScoutSuite requirements"
requirements_scoutsuite="$SCOUTSUITE_DIR/requirements.txt"
${python_cmd} -m pip install -r "${requirements_scoutsuite}" --user --upgrade || handle_error
agents=${3:-true} agents=${3:-true}
# Download binaries # Download binaries
if [ "$agents" = true ] ; then if [ "$agents" = true ] ; then

6
monkey/infection_monkey/monkey.spec
View File

@ -79,11 +79,9 @@ def get_linux_only_binaries():
def get_hidden_imports(): def get_hidden_imports():
imports = ['ScoutSuite'] imports = ['_cffi_backend', '_mssql']
if is_windows(): if is_windows():
imports.extend(['_cffi_backend', 'queue', '_mssql']) imports.append('queue')
else:
imports.extend(['_cffi_backend', '_mssql'])
return imports return imports