From 80c6ee88051af5a64d8dd288e54d0ad78c0cf059 Mon Sep 17 00:00:00 2001 From: Shreya Malviya Date: Thu, 4 Aug 2022 12:59:18 +0530 Subject: [PATCH] Island: Inject local_ip_addresses into LocalMonkeyRunService's constructor --- monkey/monkey_island/cc/services/run_local_monkey.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/monkey/monkey_island/cc/services/run_local_monkey.py b/monkey/monkey_island/cc/services/run_local_monkey.py index 529b67926..f47a73a74 100644 --- a/monkey/monkey_island/cc/services/run_local_monkey.py +++ b/monkey/monkey_island/cc/services/run_local_monkey.py @@ -4,10 +4,10 @@ import stat import subprocess from pathlib import Path from shutil import copyfileobj +from typing import Sequence from monkey_island.cc.repository import IAgentBinaryRepository, RetrievalError from monkey_island.cc.server_utils.consts import ISLAND_PORT -from monkey_island.cc.services.utils.network_utils import get_local_ip_addresses logger = logging.getLogger(__name__) @@ -15,9 +15,15 @@ AGENT_NAMES = {"linux": "monkey-linux-64", "windows": "monkey-windows-64.exe"} class LocalMonkeyRunService: - def __init__(self, data_dir: Path, agent_binary_repository: IAgentBinaryRepository): + def __init__( + self, + data_dir: Path, + agent_binary_repository: IAgentBinaryRepository, + local_ip_addresses: Sequence[str], + ): self._data_dir = data_dir self._agent_binary_repository = agent_binary_repository + self._local_ips = local_ip_addresses def run_local_monkey(self): # get the monkey executable suitable to run on the server @@ -59,7 +65,7 @@ class LocalMonkeyRunService: # run the monkey try: - ip = get_local_ip_addresses()[0] + ip = self._local_ips[0] port = ISLAND_PORT args = [str(dest_path), "m0nk3y", "-s", f"{ip}:{port}"]