diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f849b433..66bf63f90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/). - Internet access check on agent start. #1402 - The "internal.monkey.internet_services" configuration option that enabled internet access checks. #1402 +- Disused traceroute binaries. #1397 ### Fixed - Misaligned buttons and input fields on exploiter and network configuration diff --git a/deployment_scripts/config b/deployment_scripts/config index 101dadd0f..74c13145e 100644 --- a/deployment_scripts/config +++ b/deployment_scripts/config @@ -37,10 +37,6 @@ export WINDOWS_32_BINARY_URL="https://github.com/guardicore/monkey/releases/down export WINDOWS_64_BINARY_NAME="monkey-windows-64.exe" export WINDOWS_64_BINARY_URL="https://github.com/guardicore/monkey/releases/download/$MONKEY_LATEST_RELEASE/monkey-windows-64.exe" -# Other binaries for monkey -export TRACEROUTE_64_BINARY_URL="https://github.com/guardicore/monkey/releases/download/$MONKEY_LATEST_RELEASE/traceroute64" -export TRACEROUTE_32_BINARY_URL="https://github.com/guardicore/monkey/releases/download/$MONKEY_LATEST_RELEASE/traceroute32" - export SAMBACRY_64_BINARY_URL="https://github.com/guardicore/monkey/releases/download/$MONKEY_LATEST_RELEASE/sc_monkey_runner64.so" export SAMBACRY_32_BINARY_URL="https://github.com/guardicore/monkey/releases/download/$MONKEY_LATEST_RELEASE/sc_monkey_runner32.so" diff --git a/deployment_scripts/config.ps1 b/deployment_scripts/config.ps1 index 54ad20be9..66de5fb7e 100644 --- a/deployment_scripts/config.ps1 +++ b/deployment_scripts/config.ps1 @@ -24,8 +24,6 @@ $SAMBA_32_BINARY_URL = $MONKEY_DOWNLOAD_URL + "sc_monkey_runner32.so" $SAMBA_32_BINARY_NAME = "sc_monkey_runner32.so" $SAMBA_64_BINARY_URL = $MONKEY_DOWNLOAD_URL + "sc_monkey_runner64.so" $SAMBA_64_BINARY_NAME = "sc_monkey_runner64.so" -$TRACEROUTE_64_BINARY_URL = $MONKEY_DOWNLOAD_URL + "traceroute64" -$TRACEROUTE_32_BINARY_URL = $MONKEY_DOWNLOAD_URL + "traceroute32" # Other directories and paths ( most likely you dont need to configure) $MONKEY_ISLAND_DIR = Join-Path "\monkey" -ChildPath "monkey_island" diff --git a/deployment_scripts/deploy_linux.sh b/deployment_scripts/deploy_linux.sh index 0d3fc82d2..39dab4432 100755 --- a/deployment_scripts/deploy_linux.sh +++ b/deployment_scripts/deploy_linux.sh @@ -227,16 +227,6 @@ else curl -o ${MONKEY_BIN_DIR}/sc_monkey_runner64.so ${SAMBACRY_64_BINARY_URL} curl -o ${MONKEY_BIN_DIR}/sc_monkey_runner32.so ${SAMBACRY_32_BINARY_URL} fi -# Download traceroute binaries -log_message "Downloading traceroute binaries" -# shellcheck disable=SC2086 -if exists wget; then - wget -c -N -P "${MONKEY_BIN_DIR}" ${TRACEROUTE_64_BINARY_URL} - wget -c -N -P "${MONKEY_BIN_DIR}" ${TRACEROUTE_32_BINARY_URL} -else - curl -o ${MONKEY_BIN_DIR}/traceroute64 ${TRACEROUTE_64_BINARY_URL} - curl -o ${MONKEY_BIN_DIR}/traceroute32 ${TRACEROUTE_32_BINARY_URL} -fi # Download Swimm log_message "Downloading swimm" diff --git a/monkey/infection_monkey/monkey.spec b/monkey/infection_monkey/monkey.spec index 3691ac470..6ed615ec2 100644 --- a/monkey/infection_monkey/monkey.spec +++ b/monkey/infection_monkey/monkey.spec @@ -67,15 +67,7 @@ def process_datas(orig_datas): def get_binaries(): - binaries = [] if is_windows() else get_linux_only_binaries() - binaries += get_sc_binaries() - return binaries - - -def get_linux_only_binaries(): - binaries = [] - binaries += get_traceroute_binaries() - return binaries + return get_sc_binaries() def get_hidden_imports(): @@ -89,11 +81,6 @@ def get_sc_binaries(): return [(x, get_bin_file_path(x), 'BINARY') for x in ['sc_monkey_runner32.so', 'sc_monkey_runner64.so']] -def get_traceroute_binaries(): - traceroute_name = 'traceroute32' if is_32_bit() else 'traceroute64' - return [(traceroute_name, get_bin_file_path(traceroute_name), 'BINARY')] - - def get_monkey_filename(): name = 'monkey-' if is_windows(): diff --git a/monkey/infection_monkey/readme.md b/monkey/infection_monkey/readme.md index d52091595..29816d941 100644 --- a/monkey/infection_monkey/readme.md +++ b/monkey/infection_monkey/readme.md @@ -7,7 +7,6 @@ The monkey is composed of three separate parts. - The Infection Monkey itself - PyInstaller compressed python archives - Sambacry binaries - Two linux binaries, 32/64 bit. -- Traceroute binaries - Two linux binaries, 32/64bit. ## Windows @@ -57,11 +56,7 @@ Tested on Ubuntu 16.04. - Build/Download according to sections at the end of this readme. - Place the binaries under [code location]/infection_monkey/bin, under the names 'sc_monkey_runner32.so', 'sc_monkey_runner64.so' -4. Build Traceroute binaries - - Build/Download according to sections at the end of this readme. - - Place the binaries under [code location]/infection_monkey/bin, under the names 'traceroute32', 'traceroute64' - -5. To build, run in terminal: +4. To build, run in terminal: - `cd [code location]/infection_monkey` - `chmod +x build_linux.sh` - `pipenv run ./build_linux.sh` @@ -83,21 +78,6 @@ Sambacry requires two standalone binaries to execute remotely. - 32bit: - 64bit: -### Traceroute - -Traceroute requires two standalone binaries to execute remotely. -The monkey carries the standalone binaries since traceroute isn't built in all Linux distributions. -You can either build them yourself or download pre-built binaries. - -1. Build traceroute yourself - - The sources of traceroute are available here with building instructions: -1. Download our pre-built traceroute binaries - - Available here: - - 32bit: - - 64bit: - - - ### Troubleshooting Some of the possible errors that may come up while trying to build the infection monkey: