Commit Graph

7055 Commits

Author SHA1 Message Date
Ilija Lazoroski deeb38e551 Docs: Remove MySQL fingerprinter 2021-12-14 14:51:09 +01:00
Ilija Lazoroski 0a44b1f12e UT: Remove MySQL fingerprinter from monkey test config 2021-12-14 14:50:32 +01:00
Ilija Lazoroski 2c4420ccff Island: Remove MySQL fingerprinter from config schema 2021-12-14 14:49:45 +01:00
Ilija Lazoroski cb2ca5be46 Agent: Remove MySQL fingerprinter 2021-12-14 14:48:44 +01:00
Mike Salvatore 7b2756bab0 UT: Mark some slow tests as "slow" 2021-12-14 07:26:27 -05:00
Mike Salvatore 0b6199e7eb UT: Fix misspelled stopable -> stoppable 2021-12-14 07:16:20 -05:00
Mike Salvatore b28f330e8f Agent: Remove duplicate functionality that checked for open port 2021-12-14 07:15:50 -05:00
Mike Salvatore 44479ef49e
Merge pull request #1653 from guardicore/1597-implement-fingerprinting
1597 implement fingerprinting
2021-12-14 07:14:29 -05:00
Mike Salvatore 7e3945dd02 Agent: Add TODO to Propagator 2021-12-13 14:21:04 -05:00
Mike Salvatore 2dc6e0600d Agent: Pass ping_scan_data and port_scan_data to IPuppet.fingerprint()
Fingerprinters can reuse the port scan data to avoid unnecessarily
rescanning the hosts' ports.
2021-12-13 14:13:10 -05:00
Mike Salvatore e524718960 Island: Reformat "finger_classes" config options before sending to Agent 2021-12-13 13:58:30 -05:00
Mike Salvatore d51af8a583 Agent: Add IPScanResults dataclass 2021-12-13 13:28:40 -05:00
Mike Salvatore 8067dc9ff8 Agent: Process fingerprinter results in Propagator 2021-12-13 13:06:44 -05:00
Mike Salvatore 438563af9c Agent: Add fingerprinting to IPScanner 2021-12-13 12:52:00 -05:00
Mike Salvatore 0ff45e3af1 Agent: Change return type of IPuppet.fingerprint() 2021-12-13 12:01:40 -05:00
Mike Salvatore af338be418 UT: Rename test_network_scanner.py -> test_ip_scanner.py 2021-12-13 11:02:10 -05:00
Mike Salvatore 96f59cc628 Agent: Remove unused "os-version" from fingerprinters 2021-12-13 10:20:33 -05:00
Mike Salvatore 27884ad44d Agent: Implement "enable_local_network_scan" IP address generation 2021-12-13 16:34:13 +02:00
Mike Salvatore 244bde320d Agent: Remove local IPs from scan targets 2021-12-13 16:34:13 +02:00
VakarisZ 4bc07442ac Agent: fix network_range.py to generate a correct range object for ip strings with /32 cidr notation
This will fix the case where user inputs 10.0.0.10/32 expecting 10.0.0.10 getting scanned, but getting an error instead
2021-12-13 16:34:13 +02:00
Mike Salvatore 913ba02e0b Agent: Remove blocklisted IPs from scan targets 2021-12-13 16:34:13 +02:00
Mike Salvatore 8d383d2832 Agent: Remove duplicate IPs in compile_scan_target_list() 2021-12-13 16:34:13 +02:00
VakarisZ a0d679285c Agent: strip whitespace from IP's when generating a list of ip's
This fixes a bug where get_range_object("10.0.0.0 - 10.0.0.6") doesn't work because of the whitespaces
2021-12-13 16:34:13 +02:00
Mike Salvatore 23a0f74b2b Agent: Add initial compile_scan_target_list()
For the moment, this only handles the ranges_to_scan parameter. Other
parameters need to be handled.
2021-12-13 16:34:13 +02:00
Mike Salvatore f2e95daa56
Merge pull request #1652 from guardicore/1597-implement-propagation-scanning
1597 implement propagation scanning
2021-12-13 09:33:16 -05:00
vakarisz 0058aa4f37 UT: Improve readability of test_network_scanner.py 2021-12-13 09:32:05 -05:00
Mike Salvatore 1a7135e13f Agent: Improve Callback type hint in IPScanner 2021-12-13 09:32:05 -05:00
Mike Salvatore 0c180a455c Agent: Improve "options" handling in IPScanner 2021-12-13 09:32:05 -05:00
Mike Salvatore 5a1e19391d Agent: Make tcp/ping timeouts consistent
* Ping takes a `timeout: float` instead of `options: Dict` the same way
  that `scan_tcp_port()` does.
* Timeouts are floats instead of ints
2021-12-13 09:32:05 -05:00
Mike Salvatore 11e3c5d6e4 UT: Remove superfluous Asserts in test_network_scanner.py 2021-12-13 09:32:05 -05:00
Mike Salvatore 88608c1cf1 Agent: Fix some type hints in automated master 2021-12-13 09:32:05 -05:00
Mike Salvatore 6147d635d6 Agent: Extract propagation logic into Propagator class 2021-12-13 09:32:05 -05:00
Mike Salvatore abec851ed0 Agent: Make minor code cleanliness changes 2021-12-13 09:32:05 -05:00
Mike Salvatore 8091a0c4a5 Agent: Join on system info collector thread
This was mistakenly commented out somewhere along the way.
2021-12-13 09:32:05 -05:00
Mike Salvatore 037d63c9f3 Agent: Move VictimHost construction to AutomatedMaster 2021-12-13 09:32:05 -05:00
Mike Salvatore b3c520f272 Agent: Fix incorrect port status in MockPuppet 2021-12-13 09:32:05 -05:00
Mike Salvatore 8d361777bc Agent: Return PingScanData from IPuppet.ping() 2021-12-13 09:32:05 -05:00
Mike Salvatore 75cfa252c9 Agent: Modify AutomatedMaster to handle propagation config options 2021-12-13 09:32:05 -05:00
Mike Salvatore 80707dac8e Island: Reformat "propagation" config options before sending to Agent 2021-12-13 09:32:05 -05:00
Mike Salvatore 81d4afab52 Agent: Extract network scanner into its own class 2021-12-13 09:32:05 -05:00
Mike Salvatore 3f7dbbccc2 Agent: Move _create_daemon_thread to threading_utils.py 2021-12-13 09:32:05 -05:00
Mike Salvatore 86203c8138 Agent: Add AutomatedMaster to master/__init__.py 2021-12-13 09:32:05 -05:00
Mike Salvatore da8e814b95 Island: Add units TCP and ICMP timeout option
The timeout option for TCP and ICMP scans is in milliseconds. Change
"timeout" -> "timeout_ms" to avoid confusion.
2021-12-13 09:32:05 -05:00
Mike Salvatore 25410716d3 Agent: Integrate scan configuration with network scanning thread 2021-12-13 09:32:05 -05:00
Mike Salvatore 8c47d113c3 Agent: Add "options" parameter to IPuppet.ping() 2021-12-13 09:32:05 -05:00
Mike Salvatore c497962d9e Island: Reformat network scan parameters before sending to agent 2021-12-13 09:32:01 -05:00
Mike Salvatore 56e71f3120 Agent: Remove PingScanner from fingerprinter list
The ping scanner is currently required by the monkey agent in order to
determine the OS of the victim. In the future, scanning can be reworked
to be more configurable under a variety of different scenarios. For the
moment, it's not optional.
2021-12-13 09:30:58 -05:00
Mike Salvatore 7b40996d6a Agent: Implement preliminary network scanning thread 2021-12-13 09:30:58 -05:00
Mike Salvatore 05adf6bae6 Agent: Implement a preliminary propagation thread in AutomatedMaster 2021-12-13 09:30:58 -05:00
Mike Salvatore 5724695181 Agent: Fix incorrect import in ControlChannel 2021-12-13 09:30:58 -05:00