p34709852
/
monkey
forked from p15670423/monkey
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Island: Rename handle_scan_data to handle_ping_scan_event

This commit is contained in:
vakarisz 2022-09-28 12:17:31 +03:00 committed by Kekoa Kaaikala
parent ecb7ca0d8d
commit c807f97d18
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/monkey_island/cc/agent_event_handlers/__init__.py
View File

@ -1,3 +1,3 @@
from .handle_scan_data import handle_scan_data from .handle_ping_scan_event import handle_ping_scan_event
from .save_event_to_event_repository import save_event_to_event_repository from .save_event_to_event_repository import save_event_to_event_repository
from .save_stolen_credentials_to_repository import save_stolen_credentials_to_repository from .save_stolen_credentials_to_repository import save_stolen_credentials_to_repository

2
monkey/monkey_island/cc/agent_event_handlers/handle_scan_data.py → monkey/monkey_island/cc/agent_event_handlers/handle_ping_scan_event.py
View File

@ -15,7 +15,7 @@ from monkey_island.cc.repository import (
logger = getLogger(__name__) logger = getLogger(__name__)
class handle_scan_data: class handle_ping_scan_event:
def __init__( def __init__(
self, self,
agent_repository: IAgentRepository, agent_repository: IAgentRepository,

4
monkey/monkey_island/cc/setup/agent_event_handlers.py
View File

@ -2,7 +2,7 @@ from common import DIContainer
from common.agent_events import CredentialsStolenEvent, PingScanEvent from common.agent_events import CredentialsStolenEvent, PingScanEvent
from common.event_queue import IAgentEventQueue from common.event_queue import IAgentEventQueue
from monkey_island.cc.agent_event_handlers import ( from monkey_island.cc.agent_event_handlers import (
handle_scan_data, handle_ping_scan_event,
save_event_to_event_repository, save_event_to_event_repository,
save_stolen_credentials_to_repository, save_stolen_credentials_to_repository,
) )
@ -39,6 +39,6 @@ def _subscribe_ping_scan_event(container: DIContainer):
machine_repository = container.resolve(IMachineRepository) # type: ignore machine_repository = container.resolve(IMachineRepository) # type: ignore
node_repository = container.resolve(INodeRepository) # type: ignore node_repository = container.resolve(INodeRepository) # type: ignore
handler = handle_scan_data(agent_repository, machine_repository, node_repository) handler = handle_ping_scan_event(agent_repository, machine_repository, node_repository)
agent_event_queue.subscribe_type(PingScanEvent, handler) agent_event_queue.subscribe_type(PingScanEvent, handler)

16
monkey/tests/unit_tests/monkey_island/cc/agent_event_handlers/test_handle_scan_data.py
View File

@ -8,7 +8,7 @@ import pytest
from common import OperatingSystem from common import OperatingSystem
from common.agent_events import PingScanEvent from common.agent_events import PingScanEvent
from common.types import PingScanData, SocketAddress from common.types import PingScanData, SocketAddress
from monkey_island.cc.agent_event_handlers import handle_scan_data from monkey_island.cc.agent_event_handlers import handle_ping_scan_event
from monkey_island.cc.models import Agent, CommunicationType, Machine from monkey_island.cc.models import Agent, CommunicationType, Machine
from monkey_island.cc.repository import ( from monkey_island.cc.repository import (
IAgentRepository, IAgentRepository,
@ -65,8 +65,8 @@ def node_repository() -> INodeRepository:
@pytest.fixture @pytest.fixture
def handler(agent_repository, machine_repository, node_repository) -> handle_scan_data: def handler(agent_repository, machine_repository, node_repository) -> handle_ping_scan_event:
return handle_scan_data(agent_repository, machine_repository, node_repository) return handle_ping_scan_event(agent_repository, machine_repository, node_repository)
machines = {MACHINE_ID: MACHINE, STORED_MACHINE.id: STORED_MACHINE} machines = {MACHINE_ID: MACHINE, STORED_MACHINE.id: STORED_MACHINE}
@ -77,7 +77,7 @@ def machine_from_id(id: int):
def test_handle_scan_data__upserts_machine( def test_handle_scan_data__upserts_machine(
handler: handle_scan_data, handler: handle_ping_scan_event,
machine_repository: IMachineRepository, machine_repository: IMachineRepository,
): ):
machine_repository.get_machine_by_id = MagicMock(side_effect=machine_from_id) machine_repository.get_machine_by_id = MagicMock(side_effect=machine_from_id)
@ -90,7 +90,7 @@ def test_handle_scan_data__upserts_machine(
def test_handle_scan_data__upserts_node( def test_handle_scan_data__upserts_node(
handler: handle_scan_data, handler: handle_ping_scan_event,
machine_repository: IMachineRepository, machine_repository: IMachineRepository,
node_repository: INodeRepository, node_repository: INodeRepository,
): ):
@ -103,7 +103,7 @@ def test_handle_scan_data__upserts_node(
def test_handle_scan_data__node_not_upserted_if_no_matching_agent( def test_handle_scan_data__node_not_upserted_if_no_matching_agent(
handler: handle_scan_data, handler: handle_ping_scan_event,
agent_repository: IAgentRepository, agent_repository: IAgentRepository,
machine_repository: IMachineRepository, machine_repository: IMachineRepository,
node_repository: INodeRepository, node_repository: INodeRepository,
@ -117,7 +117,7 @@ def test_handle_scan_data__node_not_upserted_if_no_matching_agent(
def test_handle_scan_data__node_not_upserted_if_no_matching_machine( def test_handle_scan_data__node_not_upserted_if_no_matching_machine(
handler: handle_scan_data, handler: handle_ping_scan_event,
machine_repository: IMachineRepository, machine_repository: IMachineRepository,
node_repository: INodeRepository, node_repository: INodeRepository,
): ):
@ -129,7 +129,7 @@ def test_handle_scan_data__node_not_upserted_if_no_matching_machine(
def test_handle_scan_data__upserts_machine_if_not_existed( def test_handle_scan_data__upserts_machine_if_not_existed(
handler: handle_scan_data, machine_repository: IMachineRepository handler: handle_ping_scan_event, machine_repository: IMachineRepository
): ):
machine_repository.get_machine_by_id = MagicMock(side_effect=machine_from_id) machine_repository.get_machine_by_id = MagicMock(side_effect=machine_from_id)
handler(EVENT) handler(EVENT)