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

Agent: Set proxy schema for different OS

This commit is contained in:
Ilija Lazoroski 2021-10-06 15:13:09 +02:00
parent cafd983622
commit 87b882cb45
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
monkey/infection_monkey/control.py
View File

@ -22,6 +22,7 @@ from infection_monkey.config import GUID, WormConfiguration
from infection_monkey.network.info import local_ips from infection_monkey.network.info import local_ips
from infection_monkey.transport.http import HTTPConnectProxy from infection_monkey.transport.http import HTTPConnectProxy
from infection_monkey.transport.tcp import TcpProxy from infection_monkey.transport.tcp import TcpProxy
from infection_monkey.utils.environment import is_windows_os
requests.packages.urllib3.disable_warnings() requests.packages.urllib3.disable_warnings()
@ -113,27 +114,32 @@ class ControlClient(object):
logger.info("Starting tunnel lookup...") logger.info("Starting tunnel lookup...")
proxy_find = tunnel.find_tunnel(default=default_tunnel) proxy_find = tunnel.find_tunnel(default=default_tunnel)
if proxy_find: if proxy_find:
proxy_address, proxy_port = proxy_find ControlClient.set_proxies(proxy_find)
logger.info("Found tunnel at %s:%s" % (proxy_address, proxy_port))
from infection_monkey.utils.environment import is_windows_os
logger.info(f"requests version: {requests.__version__}")
import urllib3
logger.info(f"urllib3 version: {urllib3.__version__}")
if is_windows_os():
ControlClient.proxies["https"] = "http://%s:%s" % (
proxy_address,
proxy_port,
)
else:
ControlClient.proxies["https"] = PROXY_SCHEMA % (proxy_address, proxy_port)
logger.info(ControlClient.proxies)
return ControlClient.find_server() return ControlClient.find_server()
else: else:
logger.info("No tunnel found") logger.info("No tunnel found")
return False return False
@staticmethod
def set_proxies(proxy_find):
"""
Note: Proxy schema changes! When upgrading to newer python version or
when urllib3 and requests are updated there is possibility that the proxy
schema is changed.
https://github.com/psf/requests/issues/5297
https://github.com/psf/requests/issues/5855
"""
proxy_address, proxy_port = proxy_find
logger.info("Found tunnel at %s:%s" % (proxy_address, proxy_port))
if is_windows_os():
ControlClient.proxies["https"] = "http://%s:%s" % (
proxy_address,
proxy_port,
)
else:
ControlClient.proxies["https"] = PROXY_SCHEMA % (proxy_address, proxy_port)
logger.info(ControlClient.proxies)
@staticmethod @staticmethod
def keepalive(): def keepalive():
if not WormConfiguration.current_server: if not WormConfiguration.current_server: