From ae78ed79314615c900732def33243c26f32667b5 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Fri, 3 Jun 2022 07:29:57 -0400 Subject: [PATCH] Island: Add AgentBinaries to monkey_island.cc.resources package --- monkey/monkey_island/cc/app.py | 3 +-- monkey/monkey_island/cc/resources/__init__.py | 1 + monkey/monkey_island/cc/server_setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/monkey/monkey_island/cc/app.py b/monkey/monkey_island/cc/app.py index 0d21ca928..46dd8543a 100644 --- a/monkey/monkey_island/cc/app.py +++ b/monkey/monkey_island/cc/app.py @@ -10,9 +10,8 @@ from werkzeug.exceptions import NotFound from common import DIContainer from monkey_island.cc.database import database, mongo -from monkey_island.cc.resources import RemoteRun +from monkey_island.cc.resources import AgentBinaries, RemoteRun from monkey_island.cc.resources.AbstractResource import AbstractResource -from monkey_island.cc.resources.agent_binaries import AgentBinaries from monkey_island.cc.resources.agent_controls import StopAgentCheck, StopAllAgents from monkey_island.cc.resources.attack.attack_report import AttackReport from monkey_island.cc.resources.auth.auth import Authenticate, init_jwt diff --git a/monkey/monkey_island/cc/resources/__init__.py b/monkey/monkey_island/cc/resources/__init__.py index b5bbb1108..31ed641dd 100644 --- a/monkey/monkey_island/cc/resources/__init__.py +++ b/monkey/monkey_island/cc/resources/__init__.py @@ -1 +1,2 @@ from .remote_run import RemoteRun +from .agent_binaries import AgentBinaries diff --git a/monkey/monkey_island/cc/server_setup.py b/monkey/monkey_island/cc/server_setup.py index fdd222bc5..551048fad 100644 --- a/monkey/monkey_island/cc/server_setup.py +++ b/monkey/monkey_island/cc/server_setup.py @@ -21,7 +21,7 @@ from common.version import get_version # noqa: E402 from monkey_island.cc.app import init_app # noqa: E402 from monkey_island.cc.arg_parser import IslandCmdArgs # noqa: E402 from monkey_island.cc.arg_parser import parse_cli_args # noqa: E402 -from monkey_island.cc.resources.agent_binaries import AgentBinaries # noqa: E402 +from monkey_island.cc.resources import AgentBinaries # noqa: E402 from monkey_island.cc.server_utils.consts import ( # noqa: E402 GEVENT_EXCEPTION_LOG, MONGO_CONNECTION_TIMEOUT,