From 0120c027b0c49f28055a1682c8bd5ae24f7877e9 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Tue, 20 Apr 2021 17:48:22 +0300
Subject: [PATCH] Fixed run server bat script

---
 monkey/infection_monkey/Pipfile                |  2 +-
 monkey/infection_monkey/Pipfile.lock           | 15 ++++++++-------
 monkey/monkey_island/windows/run_server_py.bat |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/monkey/infection_monkey/Pipfile b/monkey/infection_monkey/Pipfile
index 4806ed5f3..c6ea85420 100644
--- a/monkey/infection_monkey/Pipfile
+++ b/monkey/infection_monkey/Pipfile
@@ -5,7 +5,6 @@ name = "pypi"
 
 [packages]
 cryptography = "==2.5" # We can't build 32bit ubuntu12 binary with newer versions of cryptography
-pyopenssl = "==0.14" # Later versions force cryptography >2.5, which fail 32 bit linux build
 cffi = ">=1.14"
 ecdsa = "==0.15"
 pyinstaller = {git = "git://github.com/guardicore/pyinstaller"}
@@ -27,6 +26,7 @@ simplejson = "*"
 "WinSys-3.x" = ">=0.5.2"
 WMI = "==1.5.1"
 ScoutSuite = {git = "git://github.com/guardicode/ScoutSuite"}
+pyopenssl = "==19.0.0" # We can't build 32bit ubuntu12 binary with newer versions of pyopenssl
 
 [dev-packages]
 
diff --git a/monkey/infection_monkey/Pipfile.lock b/monkey/infection_monkey/Pipfile.lock
index c2176bef2..3490a7653 100644
--- a/monkey/infection_monkey/Pipfile.lock
+++ b/monkey/infection_monkey/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "85c789ef74643b5c346cade5e9f0ad2b0e4c4b62a4f332e4d941a93ee2f83d72"
+            "sha256": "9e2bdb6ba58373ea908538ca0759468219562e5f867636c68c9656feab3188f1"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -233,7 +233,7 @@
             "hashes": [
                 "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"
             ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==0.18.2"
         },
         "httpagentparser": {
@@ -326,7 +326,7 @@
                 "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9",
                 "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"
             ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==0.10.0"
         },
         "ldap3": {
@@ -760,10 +760,11 @@
         },
         "pyopenssl": {
             "hashes": [
-                "sha256:a99db8e59c120138ad8a72eecedcc24b4510d2eed3ce48213b7e32f22cc4ee6e"
+                "sha256:aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200",
+                "sha256:c727930ad54b10fc157015014b666f2d8b41f70c0d03e83ab67624fd3dd5d1e6"
             ],
             "index": "pypi",
-            "version": "==0.14"
+            "version": "==19.0.0"
         },
         "pypykatz": {
             "hashes": [
@@ -794,7 +795,7 @@
                 "sha256:7e6584c74aeed623791615e26efd690f29817a27c73085b78e4bad02493df2fb",
                 "sha256:c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==2.8.0"
         },
         "pytz": {
@@ -895,7 +896,7 @@
                 "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
                 "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==1.15.0"
         },
         "sqlitedict": {
diff --git a/monkey/monkey_island/windows/run_server_py.bat b/monkey/monkey_island/windows/run_server_py.bat
index 07a587f49..90d81c9b7 100644
--- a/monkey/monkey_island/windows/run_server_py.bat
+++ b/monkey/monkey_island/windows/run_server_py.bat
@@ -1,5 +1,5 @@
 REM - Runs MongoDB Server & Monkey Island Server using python -
 if not exist db mkdir db
 start windows\run_mongodb.bat
-start windows\run_cc.bat
-start https://localhost:5000
\ No newline at end of file
+pipenv run windows\run_cc.bat
+start https://localhost:5000