Merge pull request #500 from guardicore/bugfix/merge_requirements_files

Merge Infection Monkey requirements files

.travis.yml

@@ -15,7 +15,7 @@ install:
 # Python
 - pip install -r monkey/monkey_island/requirements.txt  # for unit tests
 - pip install flake8 pytest dlint  # for next stages
-- pip install -r monkey/infection_monkey/requirements_linux.txt  # for unit tests
+- pip install -r monkey/infection_monkey/requirements.txt  # for unit tests
 
 before_script:
 # Set the server config to `testing`. This is required for for the UTs to pass.

deployment_scripts/deploy_linux.sh

@@ -93,7 +93,7 @@ ${python_cmd} -m pip install --user --upgrade -r ${requirements} || handle_error
 log_message "Installing monkey requirements"
 sudo apt-get install libffi-dev upx libssl-dev libc++1
 cd ${monkey_home}/monkey/infection_monkey || handle_error
-${python_cmd} -m pip install -r requirements_linux.txt --user --upgrade || handle_error
+${python_cmd} -m pip install -r requirements.txt --user --upgrade || handle_error
 
 # Download binaries
 log_message "Downloading binaries"

deployment_scripts/deploy_windows.ps1

@@ -78,7 +78,7 @@ function Deploy-Windows([String] $monkey_home = (Get-Item -Path ".\").FullName,
     $islandRequirements = Join-Path -Path $monkey_home -ChildPath $MONKEY_ISLAND_DIR | Join-Path -ChildPath "\requirements.txt" -ErrorAction Stop
     & python -m pip install --user -r $islandRequirements
     "Installing python packages for monkey"
-    $monkeyRequirements = Join-Path -Path $monkey_home -ChildPath $MONKEY_DIR | Join-Path -ChildPath "\requirements_windows.txt"
+    $monkeyRequirements = Join-Path -Path $monkey_home -ChildPath $MONKEY_DIR | Join-Path -ChildPath "\requirements.txt"
     & python -m pip install --user -r $monkeyRequirements
 
     $user_python_dir = cmd.exe /c 'py -m site --user-site'

monkey/infection_monkey/readme.md

@@ -25,7 +25,7 @@ The monkey is composed of three separate parts.
         - 32bit: <https://aka.ms/vs/16/release/vc_redist.x86.exe>
         - 64bit: <https://go.microsoft.com/fwlink/?LinkId=746572>
 3. Download the dependent python packages using 
-        `pip install -r requirements_windows.txt`
+        `pip install -r requirements.txt`
 4. Download and extract UPX binary to monkey\infection_monkey\bin\upx.exe:
         <https://github.com/upx/upx/releases/download/v3.94/upx394w.zip>
 5. Build/Download Sambacry and Mimikatz binaries
@@ -51,7 +51,7 @@ Tested on Ubuntu 16.04.
 
 2. Install the python packages listed in requirements.txt using pip
     - `cd [code location]/infection_monkey`
-    - `python3.7 -m pip install -r requirements_linux.txt`
+    - `python3.7 -m pip install -r requirements.txt`
 
 3. Build Sambacry binaries
     - Build/Download according to sections at the end of this readme.

monkey/infection_monkey/requirements_linux.txt → monkey/infection_monkey/requirements.txt

@@ -10,5 +10,6 @@ ecdsa
 netifaces
 ipaddress
 wmi
+pywin32 ; sys_platform == 'win32'
 pymssql<3.0
 pyftpdlib