2136 refactor scanning #3002

ilija-lazoroski · 2023-02-22T14:54:26Z

What does this PR do?

Fixes #2136.

Add any further explanations here.

PR Checklist

Have you added an explanation of what your changes do and why you'd like to include them?
Is the TravisCI build passing?
Was the CHANGELOG.md updated to reflect the changes?
Was the documentation framework updated to reflect the changes?
Have you checked that you haven't introduced any duplicate code?

Testing Checklist

Added relevant unit tests?
Have you successfully tested your changes locally? Elaborate:

Tested by {Running the Monkey locally with relevant config/running Island/...}
If applicable, add screenshots or log transcripts of the feature working

…results

…ervices in TargetHost

…etHost

…pagator.py

2136 redefine fingerprinterdata

Config schemas doesn't have `bool` type

Issue #2136 PR #2988

…or-scanning Issue #2136 PR #2996

Issue #2136 PR #2998

Issue #2136 PR #2991

…anning Issue #2136 PR #2999

codecov · 2023-02-22T15:46:55Z

Codecov Report

Base: 66.49% // Head: 66.68% // Increases project coverage by +0.19% 🎉

Coverage data is based on head (1cfcc57) compared to base (c3df850).
Patch has no changes to coverable lines.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #3002      +/-   ##
===========================================
+ Coverage    66.49%   66.68%   +0.19%     
===========================================
  Files          422      429       +7     
  Lines        12314    12362      +48     
===========================================
+ Hits          8188     8244      +56     
+ Misses        4126     4118       -8

Impacted Files	Coverage Δ
monkey/monkey/infection_monkey/network/tools.py	`23.33% <0.00%> (-2.48%)`	⬇️
...y/infection_monkey/network_scanning/tcp_scanner.py	`44.44% <0.00%> (-0.56%)`	⬇️
...onkey/monkey/infection_monkey/master/propagator.py	`94.23% <0.00%> (-0.34%)`	⬇️
.../unit_tests/infection_monkey/master/mock_puppet.py	`82.19% <0.00%> (-0.25%)`	⬇️
...y/monkey/infection_monkey/exploit/HostExploiter.py	`82.71% <0.00%> (-0.22%)`	⬇️
monkey/monkey/infection_monkey/master/exploiter.py	`95.94% <0.00%> (-0.06%)`	⬇️
monkey/monkey/common/types/networking.py	`100.00% <0.00%> (ø)`
monkey/monkey/infection_monkey/model/__init__.py	`100.00% <0.00%> (ø)`
monkey/monkey/infection_monkey/exploit/web_rce.py	`0.00% <0.00%> (ø)`
...onkey/monkey/infection_monkey/exploit/log4shell.py	`0.00% <0.00%> (ø)`
... and 25 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

mssalvatore

Approved, pending AppImage ETE tests

cakekoa and others added 30 commits February 22, 2023 09:19

Agent: Update fingerprinters to use updated fingerprintdata

dc961c4

UT: Fix MSSQLFingerprinter tests

2360c3c

Agent: Replace TargetHost.services in WebRCE

d55bbd2

UT: Fix HTTPFinger tests

0ced8bc

Agent: Replace TargetHost.services in SSHExploiter

a381eff

Agent: Update TargetHost.TargetHostPorts.tcp_ports based on TCP scan …

f7e9ff2

…results

UT: Fix SSHFingerprint tests

4926374

Agent: Replace TargetHost.services in PowerShellExploiter

e3908b3

Agent: Update TargetHost.TargetHostPorts based on fingerprinter results

04be78b

Agent: Use correct discovered service in MSSQL

054d329

UT: Update test fixtures for Powershell

7f241b7

Agent: Modify Propagator._process_fingerprinter_results() to update s…

4cbf528

…ervices in TargetHost

Agent: Define SMB_PORT as NetworkPort

6e95f03

Agent: Remove TargetHost.services in Propagator

014333e

Agent: Add TODO comments related to fingerprinting/scanning

dd536d4

Agent: Use request.structure.CaseInsensitiveDict in HTTPFinger

9a87620

Agent: Remove TargetHost.services

ca259fd

Agent: Fix variable name in master/propagator.py

7041ffc

Agent: Refactor MSSQLFinger a bit

a2a5cd5

Agent: Extract PowerShell SSL port in PowerShell auth utils

64ab5f3

Agent: Update Propagator's _process_tcp_scan_results() to update Targ…

9316f58

…etHost

Agent: Short up condition in HTTPFinger

376d6cf

Agent: Rename WebRCE's self.HTTP to self.http_ports

8f34583

Agent: Update TODO comment in master/propagator.py

284ef97

Common: Add MSSQL_BROWSER to NetworkService

b07fc8d

Agent: Move ExploiterResultData to its own file under i_puppet

bcaf704

Agent: Update some type hints in WebRCE

8139192

Agent: Modify logic in _process_fingerprinter_results() in master/pro…

d23defe

…pagator.py

Agent: Make DiscoveredService hashable

f27100e

Common: Add HTTPS and SSH in NetworkService enum

0684ee9

shreyamalviya and others added 26 commits February 22, 2023 09:19

Agent: Change DiscoveredService.services -> DiscoveredService.service

69663e0

Agent: Rename QueriedService -> DiscoveredService

60d1254

UT: Extract ports to constants in infection_monkey/exploit/conftest.py

9f7e69d

Agent: Include closed ports in TargetHost.ports_status

ac4ee0b

Hadoop: Implement try_all_discovered_http_ports option

6ec906c

UT: Change DiscoveredService.services -> DiscoveredService.service

d4869a5

UT: Add unit tests for FingerprintData and DiscoveredService

50dad18

Agent: Update type hints in SSHExploiter

d8f3947

Agent: Initialize banner when updating port data

146cadf

UT: Rename GOOD_PORT -> HTTP_PORT

5f7fcc7

Agent: Add Unknown UDP server after recieveing data in MSSQLFinger

f48b69a

Merge pull request #2987 from guardicore/2136-redefine-fingerprinterdata

9bc77b2

2136 redefine fingerprinterdata

Hadoop: Fix config schema boolean type

7769bd2

Config schemas doesn't have `bool` type

UT: Add tests for Propagator scanning/fingerprinting

0defdc3

UT: Assert only expected ports are in the exploit URLs

bf8efa9

Merge branch '2136-update-fingerprinters' into 2136-refactor-scanning

e462703

Issue #2136 PR #2988

Agent: Rename self.HTTP to self.http_ports in Log4Shell

8d5dac1

Agent: Remove extra code in master/propagator.py

dd8cb0f

Merge branch '2136-hadoop-option-try-all-http-ports' into 2136-refact…

fc936a1

…or-scanning Issue #2136 PR #2996

Agent: Fix ports to NetworkPort type and type hints in WebRCE

71aed5e

Agent: Fix type hint in master/propagator.py

d8716dd

Hadoop: Skip configured ports if they are closed

65cf84f

Issue #2136 PR #2998

Agent: Use pprint.pformat() in TargetHost's __str__()

0747e26

Merge branch '2136-modify-master-propagator' into 2136-refactor-scanning

8558e15

Issue #2136 PR #2991

Merge branch '2136-replace-targethost-services' into 2136-refactor-sc…

a6825ff

…anning Issue #2136 PR #2999

Agent: Remove PortScanData.service_deprecated

1cfcc57

mssalvatore approved these changes Feb 22, 2023

View reviewed changes

mssalvatore merged commit 6aae2b6 into develop Feb 22, 2023

mssalvatore deleted the 2136-refactor-scanning branch February 27, 2023 17:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

2136 refactor scanning #3002

2136 refactor scanning #3002

Uh oh!

ilija-lazoroski commented Feb 22, 2023 •

edited

Loading

Uh oh!

codecov bot commented Feb 22, 2023

Uh oh!

mssalvatore left a comment

Uh oh!

Uh oh!

2136 refactor scanning #3002

2136 refactor scanning #3002

Uh oh!

Conversation

ilija-lazoroski commented Feb 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

PR Checklist

Testing Checklist

Uh oh!

codecov bot commented Feb 22, 2023

Codecov Report

Uh oh!

mssalvatore left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ilija-lazoroski commented Feb 22, 2023 •

edited

Loading