From 01a21f744f33b306f0c1d6683fff40bc99a43b1b Mon Sep 17 00:00:00 2001
From: Mike Salvatore <mike.s.salvatore@gmail.com>
Date: Mon, 28 Feb 2022 07:52:37 -0500
Subject: [PATCH] Agent: Remove disused VictimHost.monkey_exe
---
monkey/infection_monkey/model/host.py | 2 --
.../infection_monkey/telemetry/test_exploit_telem.py | 9 +++++++--
.../infection_monkey/telemetry/test_scan_telem.py | 1 -
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/monkey/infection_monkey/model/host.py b/monkey/infection_monkey/model/host.py
index 3bbd1dfb8..95cc85810 100644
--- a/monkey/infection_monkey/model/host.py
+++ b/monkey/infection_monkey/model/host.py
@@ -8,7 +8,6 @@ class VictimHost(object):
self.os = {}
self.services = {}
self.icmp = False
- self.monkey_exe = None
self.default_tunnel = None
self.default_server = None
@@ -42,7 +41,6 @@ class VictimHost(object):
for k, v in list(self.services.items()):
victim += "%s-%s " % (k, v)
victim += "] ICMP: %s " % (self.icmp)
- victim += "target monkey: %s" % self.monkey_exe
return victim
def set_island_address(self, ip: str, port: Optional[str]):
diff --git a/monkey/tests/unit_tests/infection_monkey/telemetry/test_exploit_telem.py b/monkey/tests/unit_tests/infection_monkey/telemetry/test_exploit_telem.py
index 5d6c81f56..600e1db20 100644
--- a/monkey/tests/unit_tests/infection_monkey/telemetry/test_exploit_telem.py
+++ b/monkey/tests/unit_tests/infection_monkey/telemetry/test_exploit_telem.py
@@ -16,7 +16,6 @@ HOST_AS_DICT = {
"os": {},
"services": {},
"icmp": False,
- "monkey_exe": None,
"default_tunnel": None,
"default_server": None,
}
@@ -37,7 +36,13 @@ ERROR_MSG = "failed because yolo"
@pytest.fixture
def exploit_telem_test_instance():
- return ExploitTelem(EXPLOITER_NAME, HOST, ExploiterResultData(RESULT, RESULT, OS_LINUX, EXPLOITER_INFO, EXPLOITER_ATTEMPTS, ERROR_MSG))
+ return ExploitTelem(
+ EXPLOITER_NAME,
+ HOST,
+ ExploiterResultData(
+ RESULT, RESULT, OS_LINUX, EXPLOITER_INFO, EXPLOITER_ATTEMPTS, ERROR_MSG
+ ),
+ )
def test_exploit_telem_send(exploit_telem_test_instance, spy_send_telemetry):
diff --git a/monkey/tests/unit_tests/infection_monkey/telemetry/test_scan_telem.py b/monkey/tests/unit_tests/infection_monkey/telemetry/test_scan_telem.py
index 07c6fbf41..a369fe4cf 100644
--- a/monkey/tests/unit_tests/infection_monkey/telemetry/test_scan_telem.py
+++ b/monkey/tests/unit_tests/infection_monkey/telemetry/test_scan_telem.py
@@ -14,7 +14,6 @@ HOST_AS_DICT = {
"os": {},
"services": {},
"icmp": False,
- "monkey_exe": None,
"default_tunnel": None,
"default_server": None,
}