p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Island: Move JSONFileUserRepository to the repository package

This commit is contained in:
Mike Salvatore 2022-07-12 09:00:09 -04:00
parent 735514d61f
commit c1a9ad1e6f
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
monkey/monkey_island/cc/repository/__init__.py
View File

@ -17,4 +17,5 @@ from .file_repository_logging_decorator import FileRepositoryLoggingDecorator
from .agent_binary_repository import AgentBinaryRepository from .agent_binary_repository import AgentBinaryRepository
from .file_agent_configuration_repository import FileAgentConfigurationRepository from .file_agent_configuration_repository import FileAgentConfigurationRepository
from .file_simulation_repository import FileSimulationRepository from .file_simulation_repository import FileSimulationRepository
from .json_file_user_repository import JSONFileUserRepository
from .mongo_credentials_repository import MongoCredentialsRepository from .mongo_credentials_repository import MongoCredentialsRepository

0
monkey/monkey_island/cc/services/authentication/json_file_user_datastore.py → monkey/monkey_island/cc/repository/json_file_user_repository.py
View File

1
monkey/monkey_island/cc/services/__init__.py
View File

@ -1,5 +1,4 @@
from .authentication.authentication_service import AuthenticationService from .authentication.authentication_service import AuthenticationService
from .authentication.json_file_user_datastore import JSONFileUserRepository
from .aws import AWSService from .aws import AWSService
from .island_mode_service import IslandModeService from .island_mode_service import IslandModeService

3
monkey/monkey_island/cc/services/initialize.py
View File

@ -25,6 +25,7 @@ from monkey_island.cc.repository import (
IFileRepository, IFileRepository,
ISimulationRepository, ISimulationRepository,
IUserRepository, IUserRepository,
JSONFileUserRepository,
LocalStorageFileRepository, LocalStorageFileRepository,
MongoCredentialsRepository, MongoCredentialsRepository,
RetrievalError, RetrievalError,
@ -41,7 +42,7 @@ from monkey_island.cc.services.telemetry.processing.processing import (
) )
from monkey_island.cc.setup.mongo.mongo_setup import MONGO_URL from monkey_island.cc.setup.mongo.mongo_setup import MONGO_URL
from . import AuthenticationService, JSONFileUserRepository from . import AuthenticationService
from .reporting.report import ReportService from .reporting.report import ReportService
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

4
monkey/tests/unit_tests/monkey_island/cc/services/test_json_file_user_datastore.py → monkey/tests/unit_tests/monkey_island/cc/repository/test_json_file_user_repository.py
View File

@ -10,11 +10,11 @@ from common.utils.exceptions import (
UnknownUserError, UnknownUserError,
) )
from monkey_island.cc.models import UserCredentials from monkey_island.cc.models import UserCredentials
from monkey_island.cc.server_utils.file_utils import is_windows_os from monkey_island.cc.repository.json_file_user_repository import (
from monkey_island.cc.services.authentication.json_file_user_datastore import (
CREDENTIALS_FILE, CREDENTIALS_FILE,
JSONFileUserRepository, JSONFileUserRepository,
) )
from monkey_island.cc.server_utils.file_utils import is_windows_os
USERNAME = "test" USERNAME = "test"
PASSWORD_HASH = "DEADBEEF" PASSWORD_HASH = "DEADBEEF"