Skip to content

Commit

Permalink
Merge pull request #2385 from guardicore/2269-propagation-event
Browse files Browse the repository at this point in the history
Define Propagation Event
  • Loading branch information
mssalvatore authored Oct 3, 2022
2 parents 82c81c2 + d1af356 commit 07839a4
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 4 deletions.
1 change: 1 addition & 0 deletions monkey/common/agent_events/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
from .credentials_stolen_events import CredentialsStolenEvent
from .ping_scan_event import PingScanEvent
from .tcp_scan_event import TCPScanEvent
from .propagation_event import PropagationEvent
22 changes: 22 additions & 0 deletions monkey/common/agent_events/propagation_event.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
from ipaddress import IPv4Address

from pydantic import Field

from . import AbstractAgentEvent


class PropagationEvent(AbstractAgentEvent):
"""
An event that occurs when the Agent propagates on a host
Attributes:
:param target: IP address of the propagated system
:param success: Status of the propagation
:param exploiter_name: Name of the exploiter that propagated
:param error_message: Message if an error occurs during propagation
"""

target: IPv4Address
success: bool
exploiter_name: str
error_message: str = Field(default="")
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
from ipaddress import IPv4Address
from uuid import UUID

import pytest

from common.agent_events import PropagationEvent

TARGET_IP_STR = "192.168.1.10"
AGENT_ID = UUID("012e7238-7b81-4108-8c7f-0787bc3f3c10")
TIMESTAMP = 1664371327.4067292

PROPAGATION_EVENT = PropagationEvent(
source=AGENT_ID,
timestamp=TIMESTAMP,
target=IPv4Address(TARGET_IP_STR),
success=True,
exploiter_name="SSHExploiter",
)

PROPAGATION_OBJECT_DICT = {
"source": AGENT_ID,
"timestamp": TIMESTAMP,
"target": IPv4Address(TARGET_IP_STR),
"success": True,
"exploiter_name": "SSHExploiter",
"error_message": "",
}

PROPAGATION_SIMPLE_DICT = {
"source": str(AGENT_ID),
"timestamp": TIMESTAMP,
"target": TARGET_IP_STR,
"success": "true",
"exploiter_name": "SSHExploiter",
"error_message": "",
}


@pytest.mark.parametrize(
"propagation_event_dict", [PROPAGATION_OBJECT_DICT, PROPAGATION_SIMPLE_DICT]
)
def test_constructor(propagation_event_dict):
assert PropagationEvent(**propagation_event_dict) == PROPAGATION_EVENT


@pytest.mark.parametrize(
"key, value",
[
("target", None),
("success", "not-a-bool"),
("exploiter_name", None),
("error_message", None),
],
)
def test_construct_invalid_field__type_error(key, value):
invalid_type_dict = PROPAGATION_SIMPLE_DICT.copy()
invalid_type_dict[key] = value

with pytest.raises(TypeError):
PropagationEvent(**invalid_type_dict)


@pytest.mark.parametrize(
"key, value",
[
("target", "not-an-ip"),
],
)
def test_construct_invalid_field__value_error(key, value):
invalid_type_dict = PROPAGATION_SIMPLE_DICT.copy()
invalid_type_dict[key] = value

with pytest.raises(ValueError):
PropagationEvent(**invalid_type_dict)


def test_construct__extra_fields_forbidden():
extra_field_dict = PROPAGATION_SIMPLE_DICT.copy()
extra_field_dict["extra_field"] = 99 # red balloons

with pytest.raises(ValueError):
PropagationEvent(**extra_field_dict)
8 changes: 4 additions & 4 deletions vulture_allowlist.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
CustomPBAConfiguration,
ScanTargetConfiguration,
)
from common.agent_events import PingScanEvent, TCPScanEvent
from common.agent_events import PingScanEvent, PropagationEvent, TCPScanEvent
from common.credentials import Credentials, LMHash, NTHash
from common.types import NetworkPort
from infection_monkey.exploit.log4shell_utils.ldap_server import LDAPServerFactory
Expand Down Expand Up @@ -311,13 +311,13 @@
IAgentLogRepository.upsert_agent_log
IAgentLogRepository.get_agent_log

# TODO: Remove once #2268 is closed
PingScanEvent

# TODO: Remove once #2267 is closed
TCPScanEvent
TCPScanEvent.port_status

# TODO: Remove once #2269 is close
PropagationEvent

# pydantic base models
underscore_attrs_are_private
extra
Expand Down

0 comments on commit 07839a4

Please sign in to comment.