p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Agent: Consistent format string for set proxy

This commit is contained in:
Ilija Lazoroski 2021-10-06 18:05:30 +02:00
parent 87b882cb45
commit 3f33bc4a41
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
monkey/infection_monkey/control.py
View File

@ -36,8 +36,6 @@ PBA_FILE_DOWNLOAD = "https://%s/api/pba/download/%s"
# elsewhere. # elsewhere.
TIMEOUT_IN_SECONDS = 15 TIMEOUT_IN_SECONDS = 15
PROXY_SCHEMA = "%s:%s"
class ControlClient(object): class ControlClient(object):
proxies = {} proxies = {}
@ -132,13 +130,9 @@ class ControlClient(object):
proxy_address, proxy_port = proxy_find proxy_address, proxy_port = proxy_find
logger.info("Found tunnel at %s:%s" % (proxy_address, proxy_port)) logger.info("Found tunnel at %s:%s" % (proxy_address, proxy_port))
if is_windows_os(): if is_windows_os():
ControlClient.proxies["https"] = "http://%s:%s" % ( ControlClient.proxies["https"] = f"http://{proxy_address}:{proxy_port}"
proxy_address,
proxy_port,
)
else: else:
ControlClient.proxies["https"] = PROXY_SCHEMA % (proxy_address, proxy_port) ControlClient.proxies["https"] = f"{proxy_address}:{proxy_port}"
logger.info(ControlClient.proxies)
@staticmethod @staticmethod
def keepalive(): def keepalive():