519/scoutsuite integration #848

VakarisZ · 2020-10-01T15:04:14Z

What does this PR do?

Fixes #519

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?

Testing Checklist

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

Tested by gathering SS data with CLI setup
Tested by gathering SS data with keys
? Tested by gathering SS data with temp keys?
Tested by gathering SS data on AWS instance with relevant roles

…ntegration # Conflicts: # .gitmodules # .travis.yml # monkey/common/data/system_info_collectors_names.py # monkey/monkey_island/cc/services/config_schema.py # monkey/monkey_island/cc/services/telemetry/processing/system_info_collectors/system_info_telemetry_dispatcher.py

…different dir

…lso further refactor towards ZT findings being extendable with different types of details.

…ncreases readability, because it differentiates unit test code from production code

…ntegration

…oved

…stom fields, like field of type ObjectId

…m scoutsuite report data

…ion, parsing and storing

# Conflicts: # monkey/monkey_island/cc/ui/src/styles/Main.scss

# Conflicts: # monkey/monkey_island/requirements.txt

… and other minor code improvements

monkey/monkey_island/cc/services/reporting/test_pth_report.py

monkey/monkey_island/cc/services/zero_trust/test_common/monkey_finding_data.py

monkey/monkey_island/cc/services/zero_trust/zero_trust_report/pillar_service.py

monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite_api.py

...y_island/cc/ui/src/components/report-components/zerotrust/scoutsuite/ScoutSuiteRuleButton.js

monkey/infection_monkey/telemetry/scoutsuite_telem.py

monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/scoutsuite-setup/CloudOptions.js

.../cc/services/telemetry/processing/system_info_collectors/system_info_telemetry_dispatcher.py

monkey/monkey_island/cc/services/zero_trust/monkey_findings/monkey_zt_details_service.py

monkey/monkey_island/cc/services/zero_trust/scoutsuite/data_parsing/rule_parser.py

monkey/monkey_island/cc/services/zero_trust/monkey_details_service.py

…ntegration # Conflicts: # .swm/AzD8XysWg1BBXCjCDkfq.swm # .swm/OwcKMnALpn7tuBaJY1US.swm # .swm/tbxb2cGgUiJQ8Btma0fp.swm # monkey/monkey_island/cc/services/config_schema/definitions/system_info_collector_classes.py

…en scoutsuite rules button and monkey events button

…code

…hich inherit from more abstract Finding.

… data received.

monkey/monkey_island/cc/services/zero_trust/scoutsuite/consts/scoutsuite_findings.py

monkey/monkey_island/cc/models/zero_trust/finding.py

monkey/monkey_island/cc/services/zero_trust/monkey_findings/monkey_zt_details_service.py

monkey/infection_monkey/system_info/collectors/scoutsuite_collector/scoutsuite_collector.py

monkey/infection_monkey/telemetry/scoutsuite_telem.py

monkey/monkey_island/cc/models/zero_trust/finding.py

…specific type hints

…suite code

…n between children

monkey/monkey_island/cc/models/zero_trust/finding.py

...ey/monkey_island/cc/services/zero_trust/scoutsuite/consts/rule_names/cloudformation_rules.py

...services/zero_trust/scoutsuite/data_parsing/rule_path_building/abstract_rule_path_creator.py

…te was failing due to some internal mongoengine error.

…ntegration

itaymmguardicore

Approved pending:

All checks pass
All required tests have been written or decided to be written in a different PR

…BaJY1US).

…Btma0fp).

…tSxBJ).

ShayNehmad and others added 30 commits January 26, 2020 18:47

Added collector and submodule

4c0321a

Update .gitmodules

a0db785

Excluding scoutsuite from flake8

87f90b3

Update scoutsuite_collector.py

a26b911

Added basic framework for running scoutsuite

f49089a

Update .travis.yml

b8b015e

WIP

b5f8fbe

Exported telem categories into dict, moved scoutsuite submodule to a …

a365d2e

…different dir

Added scoutsuite_api to monkey

3f725c1

Migrated more hard coded telem category values to use enum

7538f77

Small scoutsuite improvement regarding api error handling

3adafd3

Small telemetry refactoring and added ScoutSuite telem

549e621

Refactoring ZT findings

9952f69

Re-structured ZT files and separated class responsibilities better, a…

3490be1

…lso further refactor towards ZT findings being extendable with different types of details.

Renamed all zero trust tests to zero trust checks in back-end. This i…

4e1e990

…ncreases readability, because it differentiates unit test code from production code

Merge remote-tracking branch 'upstream/develop' into 519/scoutsuite-i…

4eebb1a

…ntegration

Small modifications: bug in ZT report resource and unused imports rem…

d9ba4dd

…oved

Bugfix: imports, related to "common_consts renaming" fixed.

96f3052

Changed default flask json encoder so we could encode objects with cu…

5a6a68f

…stom fields, like field of type ObjectId

Added rule path creators, which helps to extract scoutsuite rules fro…

0b9b89f

…m scoutsuite report data

Backend ScoutSuite backend code, which handles ScoutSuite data recept…

4440027

…ion, parsing and storing

Added ScoutSuite UI code

c66cb11

Fixed conflicting dependencies that require botocore >= 1.18.0

b8f7064

Merge branch 'run_page_ui_improvements' into 519/scoutsuite-integration

bd80823

# Conflicts: # monkey/monkey_island/cc/ui/src/styles/Main.scss

Merge branch 'run_page_ui_improvements' into 519/scoutsuite-integration

109b2cb

# Conflicts: # monkey/monkey_island/requirements.txt

Added ScoutSuite scan setup guide to run monkey page.

c3fde18

Minor typos and improvements on AWS scoutsutie setup run option

2c87784

Removed unsustainable python type hinting rules

f462fcc

Added a bunch of rules and rule path creators.

c792f2f

VakarisZ added 2 commits January 29, 2021 13:01

Used dpath module instead of custom code to traverse object.

c45ff1d

Removed scoutsuite telemetry processing as there's nothing to process…

284cc3a

… and other minor code improvements

itaymmguardicore suggested changes Feb 3, 2021

View reviewed changes

itaymmguardicore reviewed Feb 3, 2021

View reviewed changes

monkey/monkey_island/cc/services/zero_trust/monkey_details_service.py Outdated Show resolved Hide resolved

VakarisZ added 8 commits February 4, 2021 11:29

Extracted count badge into a separate component which is reused betwe…

bcfa8ff

…en scoutsuite rules button and monkey events button

Added comments, type hints and other minor changes in the scoutsuite …

9444067

…code

Refactored Finding DTO into ScoutSuiteFinding and MonkeyFinding DTO w…

80e7435

…hich inherit from more abstract Finding.

Added ScoutSuite rule parsing unit test and example of raw ScoutSuite…

905ffd0

… data received.

Small renamings and minor improvements

a0bb0bc

Minor refactorings of code style in zero trust code

6f16ba4

Reverted relative paths in zero trust code back to absolute

baadb24

itaymmguardicore suggested changes Feb 10, 2021

View reviewed changes

VakarisZ added 3 commits February 11, 2021 16:51

Changed rule name classes to inherit from RuleNameEnum to add a more …

3cb2a63

…specific type hints

Minor variable and method refactoring to improve readability in scout…

e96ee30

…suite code

Zero Trust finding saving method refactored to remove code duplicatio…

25704b7

…n between children

itaymmguardicore suggested changes Feb 17, 2021

View reviewed changes

VakarisZ added 4 commits February 17, 2021 16:20

Added RuleNameEnum class and a type hint related to it in abstract class

8b8c5f9

Refactored details out of abstract finding document.

01c775e

Fixed a bug in MonkeyFindingDetails, where updating events using upda…

81ea057

…te was failing due to some internal mongoengine error.

Merge remote-tracking branch 'upstream/develop' into 519/scoutsuite-i…

414dbf0

…ntegration

itaymmguardicore reviewed Feb 17, 2021

View reviewed changes

Cleaned up imports and added no inspection comments to pass flake

a977ec4

VakarisZ force-pushed the 519/scoutsuite-integration branch from f97773e to a977ec4 Compare February 18, 2021 08:55

VakarisZ added 3 commits February 18, 2021 16:45

Swimm: update unit Add a new System Info Collector (id: OwcKMnALpn7tu…

6d31afa

…BaJY1US).

Swimm: update unit Add a simple Post Breach action (id: tbxb2cGgUiJQ8…

51abb5d

…Btma0fp).

Swimm: update unit Define what your new PBA does (id: xYkxB76pK0peJj2…

522000d

…tSxBJ).

VakarisZ merged commit c698e0a into develop Feb 19, 2021

mssalvatore mentioned this pull request Feb 19, 2021

Monkey does not scan configured TCP ports #956

Closed

acepace deleted the 519/scoutsuite-integration branch February 19, 2021 15:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

519/scoutsuite integration #848

519/scoutsuite integration #848

VakarisZ commented Oct 1, 2020 •

edited

Loading

itaymmguardicore left a comment

519/scoutsuite integration #848

519/scoutsuite integration #848

Conversation

VakarisZ commented Oct 1, 2020 • edited Loading

What does this PR do?

PR Checklist

Testing Checklist

itaymmguardicore left a comment

Choose a reason for hiding this comment

VakarisZ commented Oct 1, 2020 •

edited

Loading