Merge branch 'develop' of https://github.com/guardicore/monkey into develop

monkey/infection_monkey/network/tools.py

@@ -128,10 +128,9 @@ def check_tcp_ports(ip, ports, timeout=DEFAULT_TIMEOUT, get_banner=False):
 
         if len(possible_ports) != 0:
             timeout = int(round(timeout))  # clamp to integer, to avoid checking input
-            time_left = timeout
             sockets_to_try = possible_ports[:]
             connected_ports_sockets = []
-            while (time_left >= 0) and len(sockets_to_try):
+            while (timeout >= 0) and len(sockets_to_try):
                 sock_objects = [s[1] for s in sockets_to_try]
 
                 _, writeable_sockets, _ = select.select(sock_objects, sock_objects, sock_objects, 0)

monkey/monkey_island/cc/app.py

@@ -1,4 +1,5 @@
 import os
+import uuid
 from datetime import datetime
 
 import bson
@@ -83,7 +84,7 @@ def init_app(mongo_url):
 
     app.config['MONGO_URI'] = mongo_url
 
-    app.config['SECRET_KEY'] = os.urandom(32)
+    app.config['SECRET_KEY'] = uuid.getnode()
     app.config['JWT_AUTH_URL_RULE'] = '/api/auth'
     app.config['JWT_EXPIRATION_DELTA'] = env.get_auth_expiration_time()