From 9f839c1743c184a550bd0792cf7ebae7c7a06b23 Mon Sep 17 00:00:00 2001 From: VakarisZ Date: Tue, 23 Mar 2021 14:15:07 +0200 Subject: [PATCH 1/2] Removed outdated ScoutSuite setup from deployment scripts --- deployment_scripts/deploy_linux.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/deployment_scripts/deploy_linux.sh b/deployment_scripts/deploy_linux.sh index 718773fad..408aa3148 100755 --- a/deployment_scripts/deploy_linux.sh +++ b/deployment_scripts/deploy_linux.sh @@ -66,7 +66,6 @@ MONGO_PATH="$ISLAND_PATH/bin/mongodb" ISLAND_BINARIES_PATH="$ISLAND_PATH/cc/binaries" INFECTION_MONKEY_DIR="$monkey_home/monkey/infection_monkey" MONKEY_BIN_DIR="$INFECTION_MONKEY_DIR/bin" -SCOUTSUITE_DIR="$monkey_home/monkey/common/cloud/scoutsuite" if ! has_sudo; then 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" ${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} # Download binaries if [ "$agents" = true ] ; then From 9c8e0a8270af82aa647244a43f35f9ddaa51fda6 Mon Sep 17 00:00:00 2001 From: VakarisZ Date: Tue, 23 Mar 2021 14:15:57 +0200 Subject: [PATCH 2/2] Removed unnecessary explicit ScoutSuite import in monkey spec file --- monkey/infection_monkey/monkey.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/monkey/infection_monkey/monkey.spec b/monkey/infection_monkey/monkey.spec index f9b656611..6248f4d2b 100644 --- a/monkey/infection_monkey/monkey.spec +++ b/monkey/infection_monkey/monkey.spec @@ -79,11 +79,9 @@ def get_linux_only_binaries(): def get_hidden_imports(): - imports = ['ScoutSuite'] + imports = ['_cffi_backend', '_mssql'] if is_windows(): - imports.extend(['_cffi_backend', 'queue', '_mssql']) - else: - imports.extend(['_cffi_backend', '_mssql']) + imports.append('queue') return imports