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

Agent: Rename os -> operating_system in caching_agent_repository 

The variable name "os" conflicts with the name of Python's `os` library.
This commit is contained in:
Mike Salvatore 2022-06-24 07:23:26 -04:00
parent ffd3464d8a
commit 858eb2302c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
monkey/infection_monkey/exploit/caching_agent_repository.py
View File

@ -23,17 +23,20 @@ class CachingAgentRepository(IAgentRepository):
self._proxies = proxies self._proxies = proxies
self._lock = threading.Lock() self._lock = threading.Lock()
def get_agent_binary(self, os: OperatingSystems, architecture: str = None) -> io.BytesIO: def get_agent_binary(
self, operating_system: OperatingSystems, architecture: str = None
) -> io.BytesIO:
# If multiple calls to get_agent_binary() are made simultaneously before the result of # If multiple calls to get_agent_binary() are made simultaneously before the result of
# _download_binary_from_island() is cached, then multiple requests will be sent to the # _download_binary_from_island() is cached, then multiple requests will be sent to the
# island. Add a mutex in front of the call to _download_agent_binary_from_island() so # island. Add a mutex in front of the call to _download_agent_binary_from_island() so
# that only one request per OS will be sent to the island. # that only one request per OS will be sent to the island.
with self._lock: with self._lock:
return io.BytesIO(self._download_binary_from_island(os)) return io.BytesIO(self._download_binary_from_island(operating_system))
@lru_cache(maxsize=None) @lru_cache(maxsize=None)
def _download_binary_from_island(self, os: OperatingSystems) -> bytes: def _download_binary_from_island(self, operating_system: OperatingSystems) -> bytes:
os_name = os.name.lower() os_name = operating_system.name.lower()
response = requests.get( # noqa: DUO123 response = requests.get( # noqa: DUO123
f"{self._island_url}/api/agent-binaries/{os_name}", f"{self._island_url}/api/agent-binaries/{os_name}",
verify=False, verify=False,