Merge pull request #2542 from guardicore/2272-remove-old-agent-registration-logic

Remove old Agent registration logic

Author: shreyamalviya

CHANGELOG.md

@@ -142,6 +142,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/).
 - "POST /api/log" endpoint. #2485
 - "GET /api/local-monkey" endpoint. #2506
 - "/api/telemetry" endpoint. #2503
+- "/api/agent" endpoint. #2542
 
 ### Fixed
 - A bug in network map page that caused delay of telemetry log loading. #1545

monkey/infection_monkey/control.py

@@ -28,7 +28,6 @@
     notify_relay_on_propagation,
 )
 from infection_monkey.config import GUID
-from infection_monkey.control import ControlClient
 from infection_monkey.credential_collectors import (
     MimikatzCredentialCollector,
     SSHCredentialCollector,
@@ -93,7 +92,6 @@ def __init__(self, args):
         self._cmd_island_ip = self._island_address.ip
         self._cmd_island_port = self._island_address.port
 
-        self._control_client = ControlClient(server_address=self._island_address)
         self._control_channel = ControlChannel(
             str(self._island_address), self._agent_id, self._island_api_client
         )
@@ -182,8 +180,6 @@ def start(self):
         logger.info("Agent is starting...")
         logger.info(f"Agent GUID: {GUID}")
 
-        self._control_client.wakeup(parent=self._opts.parent)
-
         should_stop = self._control_channel.should_agent_stop()
         if should_stop:
             logger.info("The Monkey Island has instructed this agent to stop")
@@ -338,7 +334,7 @@ def _subscribe_events(self):
         )
 
     def _running_on_island(self, local_network_interfaces: List[IPv4Interface]) -> bool:
-        server_ip = self._control_client.server_address.ip
+        server_ip = self._island_address.ip
         return server_ip in {interface.ip for interface in local_network_interfaces}
 
     def _is_another_monkey_running(self):

monkey/infection_monkey/monkey.py

@@ -34,7 +34,6 @@
 from monkey_island.cc.resources.exploitations.monkey_exploitation import MonkeyExploitation
 from monkey_island.cc.resources.island_mode import IslandMode
 from monkey_island.cc.resources.local_run import LocalRun
-from monkey_island.cc.resources.monkey import Monkey
 from monkey_island.cc.resources.ransomware_report import RansomwareReport
 from monkey_island.cc.resources.root import Root
 from monkey_island.cc.resources.security_report import SecurityReport
@@ -150,7 +149,6 @@ def init_restful_endpoints(api: FlaskDIWrapper):
     api.add_resource(RegistrationStatus)
     api.add_resource(Authenticate)
     api.add_resource(Agents)
-    api.add_resource(Monkey)
     api.add_resource(LocalRun)
 
     api.add_resource(IslandMode)

monkey/monkey_island/cc/app.py

@@ -1,7 +1,6 @@
 # Order of importing matters here, for registering the embedded and referenced documents before
 # using them.
 from .monkey import Monkey
-from .monkey_ttl import MonkeyTtl
 from monkey_island.cc.models.report.report import Report
 from .simulation import Simulation, IslandMode
 from .user_credentials import UserCredentials

monkey/monkey_island/cc/models/__init__.py

@@ -2,23 +2,16 @@
 Define a Document Schema for the Monkey document.
 
 """
-import ring
 from mongoengine import (
-    BooleanField,
     DateTimeField,
     Document,
-    DoesNotExist,
     DynamicField,
     FloatField,
     ListField,
     ReferenceField,
     StringField,
 )
 
-from common.network.network_utils import get_my_ip_addresses_legacy
-from monkey_island.cc.models.monkey_ttl import MonkeyTtl, create_monkey_ttl_document
-from monkey_island.cc.server_utils.consts import DEFAULT_MONKEY_TTL_EXPIRY_DURATION_IN_SECONDS
-
 
 class Monkey(Document):
     """
@@ -31,8 +24,6 @@ class Monkey(Document):
 
     # SCHEMA
     guid = StringField(required=True)
-    should_stop = BooleanField()
-    dead = BooleanField()
     hostname = StringField()
     ip_addresses = ListField(StringField())
     launch_time = FloatField()
@@ -43,70 +34,15 @@ class Monkey(Document):
     # (even with required=False of null=True).
     # See relevant issue: https://github.com/MongoEngine/mongoengine/issues/1904
     parent = ListField(ListField(DynamicField()))
-    ttl_ref = ReferenceField(MonkeyTtl)
     tunnel = ReferenceField("self")
 
     # This field only exists when the monkey is running on an AWS
     aws_instance_id = StringField(required=False)
 
     # instance. See https://github.com/guardicore/monkey/issues/426.
 
-    # LOGIC
-    @staticmethod
-    def get_single_monkey_by_id(db_id):
-        try:
-            return Monkey.objects.get(id=db_id)
-        except DoesNotExist as ex:
-            raise MonkeyNotFoundError("info: {0} | id: {1}".format(ex, str(db_id)))
-
-    @staticmethod
-    # See https://www.python.org/dev/peps/pep-0484/#forward-references
-    def get_single_monkey_by_guid(monkey_guid) -> "Monkey":
-        try:
-            return Monkey.objects.get(guid=monkey_guid)
-        except DoesNotExist as ex:
-            raise MonkeyNotFoundError("info: {0} | guid: {1}".format(ex, str(monkey_guid)))
-
     @staticmethod
     def get_latest_modifytime():
         if Monkey.objects.count() > 0:
             return Monkey.objects.order_by("-modifytime").first().modifytime
         return None
-
-    @ring.lru()
-    @staticmethod
-    def get_label_by_id(object_id):
-        current_monkey = Monkey.get_single_monkey_by_id(object_id)
-        label = Monkey.get_hostname_by_id(object_id) + " : " + current_monkey.ip_addresses[0]
-        local_ips = map(str, get_my_ip_addresses_legacy())
-        if len(set(current_monkey.ip_addresses).intersection(local_ips)) > 0:
-            label = "MonkeyIsland - " + label
-        return label
-
-    @ring.lru()
-    @staticmethod
-    def get_hostname_by_id(object_id):
-        """
-        :param object_id: the object ID of a Monkey in the database.
-        :return: The hostname of that machine.
-        :note: Use this and not monkey.hostname for performance - this is lru-cached.
-        """
-        return Monkey.get_single_monkey_by_id(object_id).hostname
-
-    # data has TTL of 1 second. This is useful for rapid calls for report generation.
-    @ring.lru(expire=1)
-    @staticmethod
-    def is_monkey(object_id):
-        try:
-            _ = Monkey.get_single_monkey_by_id(object_id)
-            return True
-        except:  # noqa: E722
-            return False
-
-    def renew_ttl(self, duration=DEFAULT_MONKEY_TTL_EXPIRY_DURATION_IN_SECONDS):
-        self.ttl_ref = create_monkey_ttl_document(duration)
-        self.save()
-
-
-class MonkeyNotFoundError(Exception):
-    pass

monkey/monkey_island/cc/models/monkey.py

@@ -26,8 +26,6 @@ def _get_monkey_island_abs_path() -> str:
 
 DEFAULT_DATA_DIR = expand_path(get_default_data_dir())
 
-DEFAULT_MONKEY_TTL_EXPIRY_DURATION_IN_SECONDS = 60 * 5
-
 _MONGO_BINARY_DIR = os.path.join(MONKEY_ISLAND_ABS_PATH, "bin", "mongodb")
 _MONGO_EXECUTABLE_PATH_WIN = os.path.join(_MONGO_BINARY_DIR, "mongod.exe")
 _MONGO_EXECUTABLE_PATH_LINUX = os.path.join(_MONGO_BINARY_DIR, "bin", "mongod")