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

Agent: Sort scan targets by IP

This commit is contained in:
Mike Salvatore 2021-12-16 09:08:39 -05:00
parent c8469f5521
commit ed16826b87
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monkey/infection_monkey/network/scan_target_generator.py
View File

@ -1,5 +1,6 @@
import itertools
import logging
import socket
from collections import namedtuple
from typing import List
@ -32,7 +33,7 @@ def compile_scan_target_list(
scan_targets = _remove_interface_ips(scan_targets, local_network_interfaces)
scan_targets = _remove_blocklisted_ips(scan_targets, blocklisted_ips)
scan_targets = _remove_redundant_targets(scan_targets)
scan_targets.sort()
scan_targets.sort(key=lambda network_address: socket.inet_aton(network_address.ip))
return scan_targets

15
monkey/tests/unit_tests/infection_monkey/network/test_scan_target_generator.py
View File

@ -466,3 +466,18 @@ def test_invalid_blocklisted_ip():
blocklisted_ips=blocklisted,
enable_local_network_scan=False,
)
def test_sorted_scan_targets():
expected_results = [f"10.1.0.{i}" for i in range(0, 255)]
expected_results.extend([f"10.2.0.{i}" for i in range(0, 255)])
expected_results.extend([f"10.10.0.{i}" for i in range(0, 255)])
expected_results.extend([f"10.20.0.{i}" for i in range(0, 255)])
scan_targets = compile_scan_target_list(
[], ["10.1.0.0/24", "10.10.0.0/24", "10.20.0.0/24", "10.2.0.0/24"], [], [], False
)
actual_results = [network_address.ip for network_address in scan_targets]
assert expected_results == actual_results