p59342861
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
VakarisZ 2018-10-01 09:03:02 +03:00
parent 1df40008d8 fb4381d412
commit 1f65799828
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monkey/infection_monkey/network/tools.py
View File

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

3
monkey/monkey_island/cc/app.py
View File

@ -1,4 +1,5 @@
import os import os
import uuid
from datetime import datetime from datetime import datetime
import bson import bson
@ -83,7 +84,7 @@ def init_app(mongo_url):
app.config['MONGO_URI'] = 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_AUTH_URL_RULE'] = '/api/auth'
app.config['JWT_EXPIRATION_DELTA'] = env.get_auth_expiration_time() app.config['JWT_EXPIRATION_DELTA'] = env.get_auth_expiration_time()