From cf3bf89df537223b1dc3f5180ac83c9934138c04 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Thu, 24 Jan 2019 14:32:19 +0200
Subject: [PATCH] Improved linux commands in deployment scripts and separated
 linux and windows dependency files

---
 deployment_scripts/deploy_linux.sh              | 10 +++++-----
 deployment_scripts/deploy_windows.ps1           |  4 ++--
 monkey/infection_monkey/requirements_linux.txt  | 17 +++++++++++++++++
 ...equirements.txt => requirements_windows.txt} |  0
 ...{requirements.txt => requirements_linux.txt} |  0
 monkey/monkey_island/requirements_windows.txt   | 16 ++++++++++++++++
 6 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 monkey/infection_monkey/requirements_linux.txt
 rename monkey/infection_monkey/{requirements.txt => requirements_windows.txt} (100%)
 rename monkey/monkey_island/{requirements.txt => requirements_linux.txt} (100%)
 create mode 100644 monkey/monkey_island/requirements_windows.txt

diff --git a/deployment_scripts/deploy_linux.sh b/deployment_scripts/deploy_linux.sh
index c9bb7c176..4eb5a9225 100644
--- a/deployment_scripts/deploy_linux.sh
+++ b/deployment_scripts/deploy_linux.sh
@@ -69,7 +69,7 @@ log_message "Installing pip"
 sudo apt-get install python-pip
 
 log_message "Installing island requirements"
-requirements="$ISLAND_PATH/requirements.txt"
+requirements="$ISLAND_PATH/requirements_linux.txt"
 python -m pip install --user -r ${requirements} || handle_error
 
 # Download binaries
@@ -121,7 +121,7 @@ openssl req -new -key cc/server.key -out cc/server.csr \
 openssl x509 -req -days 366 -in cc/server.csr -signkey cc/server.key -out cc/server.crt || handle_error
 
 
-chmod +x ${ISLAND_PATH}/linux/create_certificate.sh || handle_error
+sudo chmod +x ${ISLAND_PATH}/linux/create_certificate.sh || handle_error
 ${ISLAND_PATH}/linux/create_certificate.sh || handle_error
 
 # Install npm
@@ -142,16 +142,16 @@ npm run dist
 log_message "Installing monkey requirements"
 sudo apt-get install python-pip python-dev libffi-dev upx libssl-dev libc++1
 cd ${monkey_home}/monkey/infection_monkey || handle_error
-python -m pip install --user -r requirements.txt || handle_error
+python -m pip install --user -r requirements_linux.txt || handle_error
 
 # Build samba
 log_message "Building samba binaries"
 sudo apt-get install gcc-multilib
 cd ${monkey_home}/monkey/infection_monkey/monkey_utils/sambacry_monkey_runner
-chmod +x ./build.sh || handle_error
+sudo chmod +x ./build.sh || handle_error
 ./build.sh
 
-chmod +x ${monkey_home}/monkey/infection_monkey/build_linux.sh
+sudo chmod +x ${monkey_home}/monkey/infection_monkey/build_linux.sh
 
 log_message "Deployment script finished."
 exit 0
\ No newline at end of file
diff --git a/deployment_scripts/deploy_windows.ps1 b/deployment_scripts/deploy_windows.ps1
index c72c29b5e..9ff7d7d5d 100644
--- a/deployment_scripts/deploy_windows.ps1
+++ b/deployment_scripts/deploy_windows.ps1
@@ -76,7 +76,7 @@ function Deploy-Windows([String] $monkey_home = (Get-Item -Path ".\").FullName,
     Remove-Item $TEMP_VC_FOR_PYTHON27_INSTALLER
 
     # Install requirements for island
-    $islandRequirements = Join-Path -Path $monkey_home -ChildPath $MONKEY_ISLAND_DIR | Join-Path -ChildPath "\requirements.txt" -ErrorAction Stop
+    $islandRequirements = Join-Path -Path $monkey_home -ChildPath $MONKEY_ISLAND_DIR | Join-Path -ChildPath "\requirements_windows.txt" -ErrorAction Stop
     "Upgrading pip..."
     $output = cmd.exe /c 'python -m pip install --user --upgrade pip 2>&1'
     $output
@@ -86,7 +86,7 @@ function Deploy-Windows([String] $monkey_home = (Get-Item -Path ".\").FullName,
     }
     & python -m pip install --user -r $islandRequirements
     # Install requirements for monkey
-    $monkeyRequirements = Join-Path -Path $monkey_home -ChildPath $MONKEY_DIR | Join-Path -ChildPath "\requirements.txt"
+    $monkeyRequirements = Join-Path -Path $monkey_home -ChildPath $MONKEY_DIR | Join-Path -ChildPath "\requirements_windows.txt"
     & python -m pip install --user -r $monkeyRequirements
 
     # Download mongodb
diff --git a/monkey/infection_monkey/requirements_linux.txt b/monkey/infection_monkey/requirements_linux.txt
new file mode 100644
index 000000000..468b748e8
--- /dev/null
+++ b/monkey/infection_monkey/requirements_linux.txt
@@ -0,0 +1,17 @@
+enum34
+impacket
+PyCrypto
+pyasn1
+cffi
+twisted
+rdpy
+requests
+odict
+paramiko
+psutil==3.4.2
+PyInstaller
+six
+ecdsa
+netifaces
+ipaddress
+wmi
\ No newline at end of file
diff --git a/monkey/infection_monkey/requirements.txt b/monkey/infection_monkey/requirements_windows.txt
similarity index 100%
rename from monkey/infection_monkey/requirements.txt
rename to monkey/infection_monkey/requirements_windows.txt
diff --git a/monkey/monkey_island/requirements.txt b/monkey/monkey_island/requirements_linux.txt
similarity index 100%
rename from monkey/monkey_island/requirements.txt
rename to monkey/monkey_island/requirements_linux.txt
diff --git a/monkey/monkey_island/requirements_windows.txt b/monkey/monkey_island/requirements_windows.txt
new file mode 100644
index 000000000..29c364c9f
--- /dev/null
+++ b/monkey/monkey_island/requirements_windows.txt
@@ -0,0 +1,16 @@
+python-dateutil
+tornado
+werkzeug
+jinja2
+markupsafe
+itsdangerous
+click
+flask
+Flask-Pymongo
+Flask-Restful
+Flask-JWT
+jsonschema
+netifaces
+ipaddress
+enum34
+PyCrypto