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

Agent: Seperate the generation of PingScanEvents

This commit is contained in:
Ilija Lazoroski 2022-09-28 12:15:46 +02:00 committed by Shreya Malviya
parent 3202bfa2c1
commit aa2b49bc66
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
monkey/infection_monkey/network_scanning/ping_scanner.py
View File

@ -38,9 +38,8 @@ def _ping(host: str, timeout: float, agent_event_queue: IAgentEventQueue) -> Pin
ping_scan_data = _process_ping_command_output(ping_command_output)
logger.debug(f"{host} - {ping_scan_data}")
agent_event_queue.publish(
PingScanEvent(source=get_agent_id(), target=IPv4Address(host), scan_data=ping_scan_data)
)
ping_scan_event = _generate_ping_scan_event(host, ping_scan_data)
agent_event_queue.publish(ping_scan_event)
return ping_scan_data
@ -98,3 +97,12 @@ def _build_ping_command(host: str, timeout: float):
# on older version of ping the timeout must be an integer, thus we use ceil
return ["ping", ping_count_flag, "1", ping_timeout_flag, str(math.ceil(timeout)), host]
def _generate_ping_scan_event(host: str, ping_scan_data: PingScanData) -> PingScanEvent:
return PingScanEvent(
source=get_agent_id(),
target=IPv4Address(host),
response_received=ping_scan_data.response_received,
os=ping_scan_data.os,
)