Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

519/scoutsuite integration #848

Merged
merged 161 commits into from
Feb 19, 2021
Merged

519/scoutsuite integration #848

Changes from 1 commit
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
4c0321a
Added collector and submodule
ShayNehmad Jan 26, 2020
a0db785
Update .gitmodules
ShayNehmad Jan 27, 2020
87f90b3
Excluding scoutsuite from flake8
ShayNehmad Jan 27, 2020
a26b911
Update scoutsuite_collector.py
ShayNehmad Jan 27, 2020
f49089a
Added basic framework for running scoutsuite
ShayNehmad Jan 27, 2020
b8b015e
Update .travis.yml
ShayNehmad Jan 27, 2020
b5f8fbe
WIP
ShayNehmad Feb 4, 2020
b14193f
Merge remote-tracking branch 'upstream/develop' into 519/scoutsuite-i…
VakarisZ Aug 31, 2020
a365d2e
Exported telem categories into dict, moved scoutsuite submodule to a …
VakarisZ Sep 3, 2020
3f725c1
Added scoutsuite_api to monkey
VakarisZ Sep 3, 2020
7538f77
Migrated more hard coded telem category values to use enum
VakarisZ Sep 3, 2020
3adafd3
Small scoutsuite improvement regarding api error handling
VakarisZ Sep 4, 2020
549e621
Small telemetry refactoring and added ScoutSuite telem
VakarisZ Sep 4, 2020
9952f69
Refactoring ZT findings
VakarisZ Sep 7, 2020
3490be1
Re-structured ZT files and separated class responsibilities better, a…
VakarisZ Sep 8, 2020
4e1e990
Renamed all zero trust tests to zero trust checks in back-end. This i…
VakarisZ Sep 8, 2020
4eebb1a
Merge remote-tracking branch 'upstream/develop' into 519/scoutsuite-i…
VakarisZ Sep 8, 2020
d9ba4dd
Small modifications: bug in ZT report resource and unused imports rem…
VakarisZ Sep 8, 2020
96f3052
Bugfix: imports, related to "common_consts renaming" fixed.
VakarisZ Sep 11, 2020
5a6a68f
Changed default flask json encoder so we could encode objects with cu…
VakarisZ Sep 18, 2020
0b9b89f
Added rule path creators, which helps to extract scoutsuite rules fro…
VakarisZ Sep 18, 2020
4440027
Backend ScoutSuite backend code, which handles ScoutSuite data recept…
VakarisZ Sep 18, 2020
c66cb11
Added ScoutSuite UI code
VakarisZ Sep 18, 2020
b8f7064
Fixed conflicting dependencies that require botocore >= 1.18.0
VakarisZ Sep 18, 2020
bd80823
Merge branch 'run_page_ui_improvements' into 519/scoutsuite-integration
VakarisZ Sep 18, 2020
109b2cb
Merge branch 'run_page_ui_improvements' into 519/scoutsuite-integration
VakarisZ Sep 18, 2020
c3fde18
Added ScoutSuite scan setup guide to run monkey page.
VakarisZ Sep 21, 2020
2c87784
Minor typos and improvements on AWS scoutsutie setup run option
VakarisZ Sep 21, 2020
f462fcc
Removed unsustainable python type hinting rules
VakarisZ Sep 23, 2020
c792f2f
Added a bunch of rules and rule path creators.
VakarisZ Sep 23, 2020
49e13a6
Created new scoutsuite findings, added relevant infrastructure to zer…
VakarisZ Sep 23, 2020
dc295d4
Improved and fixed bugs related to ScoutSuite UI components
VakarisZ Sep 23, 2020
3b0a8e8
Fixed scoutsuite backend bugs
VakarisZ Sep 23, 2020
a7fc5d1
Merge branch 'run_page_ui_improvements' into 519/scoutsuite-integration
VakarisZ Sep 23, 2020
5bc47b9
Added almost all scoutsuite rules
VakarisZ Sep 24, 2020
9f74d9a
Improved rule display: merged warnings and dangers are displayed the …
VakarisZ Sep 24, 2020
5fefe65
Added "is monkey already running" check for linux machine.
VakarisZ Sep 24, 2020
059d86b
Added the rest of rules to Service Security finding
VakarisZ Sep 25, 2020
04b00fe
Fixed a bug, where no Unexecuted rules appeared
VakarisZ Sep 25, 2020
9dc0211
Moved scoutsuit submodule directory, because island might want to cal…
VakarisZ Oct 1, 2020
708d1a6
Improved configuration by removing unused method and separating confi…
VakarisZ Oct 1, 2020
dd3d5d3
Added interactive AWS key setup/scoutsuite configuration
VakarisZ Oct 1, 2020
17d9176
Added AWS keys to config
VakarisZ Oct 1, 2020
841f542
Refactored few more files to use config value path array, rather than…
VakarisZ Oct 1, 2020
d3f0dc2
Improved back button
VakarisZ Oct 1, 2020
b1a5691
Added stylesheet for custom monkey buttons
VakarisZ Oct 1, 2020
d618428
Improved AWS collector to only run SS on island
VakarisZ Oct 1, 2020
2356ea5
Fixed a bug, where monkey config did not get set to "on_island" immed…
VakarisZ Oct 1, 2020
cf98062
Fixed a bug in monkey finding, where events did not get saved
VakarisZ Oct 1, 2020
2e0d06b
Added ProvidersEnum.js for front end
VakarisZ Oct 1, 2020
5f28808
Improved style and text of SS setup tutorials
VakarisZ Oct 1, 2020
d2a8597
Fixed error caused by mixing up the value of "started_on_island" with…
VakarisZ Oct 1, 2020
672c19e
Fixed scoutsuite bug that caused bad exception handling
VakarisZ Oct 2, 2020
22a9709
Altered SS rule dropdowns to display resource name whenever possible,…
VakarisZ Oct 2, 2020
34460b6
Fixed a bug where html tags were being displayed in description of a …
VakarisZ Oct 2, 2020
0dfecd1
Increased the "Pillars" column width, so "automation and orchestratio…
VakarisZ Oct 2, 2020
6a21a3a
Small syntax fixes in ResourceDropdown.js
VakarisZ Oct 2, 2020
89f1853
Changed deployment scripts to also install scoutsuite requirements
VakarisZ Oct 2, 2020
5678a50
Scoutsuite update
VakarisZ Oct 2, 2020
6b299c5
Scoutsuite module repo retargeted to our repo
VakarisZ Oct 2, 2020
56e573a
Fixed linux deployment script config to point to proper repository
VakarisZ Oct 5, 2020
5e6701d
Fixed linux deployment script config syntax
VakarisZ Oct 5, 2020
1719df0
Updated deployment scripts by adding mongo download for ubuntu 20
VakarisZ Oct 5, 2020
b0d4857
Fixed deployment script config to download TRACEROUTE and SAMBACRY fr…
VakarisZ Oct 5, 2020
d5f224f
Updated travis.yml according to scoutsuite changes
VakarisZ Oct 5, 2020
b88cb8b
Fixed python linting warnings
VakarisZ Oct 5, 2020
179823c
Updated travis.yml to skip import check on ScoutSuite submodule
VakarisZ Oct 6, 2020
3952350
Fixed import statements and their ordering
VakarisZ Oct 6, 2020
930642d
Fixed non-wrapped imports in rule_path_creators_list.py
VakarisZ Oct 6, 2020
8210240
Specified line-wrap option to isort and skipped a file that's not cor…
VakarisZ Oct 6, 2020
b62829f
Fixed isort not to check scoutsuite submodule
VakarisZ Oct 6, 2020
4a44a38
Changed travis to skip running scoutsuite tests. Altered zero trust t…
VakarisZ Oct 6, 2020
18aa5fe
Fixed js warnings
VakarisZ Oct 6, 2020
abe20c6
Once again fixed isort bug in travis and fixed some imports
VakarisZ Oct 7, 2020
1af19dc
Fixed more bugs in travis, related to pytest and coverage
VakarisZ Oct 7, 2020
94b960f
Last travis bugfix regarding isort
VakarisZ Oct 7, 2020
01ee60b
Fixed broken swimm units
VakarisZ Oct 7, 2020
adb617d
Swimm: updated unit (OwcKMnALpn7tuBaJY1US) - fixing and upgrading to …
Oct 7, 2020
c697f89
Swimm: updated unit (tbxb2cGgUiJQ8Btma0fp) - fixing and upgrading to …
Oct 7, 2020
3dc7208
Swimm: updated unit (AzD8XysWg1BBXCjCDkfq) - upgrading to scheme 1.0.3
Omerr Oct 7, 2020
f04491f
Merge pull request #856 from OmerRosenbaum/upgrading-swimm-units
VakarisZ Oct 8, 2020
22f77d4
Updated swimm version for travis
VakarisZ Oct 8, 2020
7478eab
Updated swimm version for travis
VakarisZ Oct 8, 2020
eac960c
Fixed version update bug that happens on systems with no internet con…
VakarisZ Oct 9, 2020
eb5648d
Fixed segmentation findings to use the same infrastructure as other f…
VakarisZ Oct 13, 2020
24ac497
Minor style refactoring
VakarisZ Oct 13, 2020
89bdbf9
Minor exception handling improvement
VakarisZ Oct 13, 2020
eb5f809
Removed the storage of subnets that violate segmentation, because thi…
VakarisZ Oct 14, 2020
f894256
Minor phrasing improvements in scoutsuite setup tutorials
VakarisZ Oct 14, 2020
3d83f34
Minor change: improved AWS collector description to note that AWS col…
VakarisZ Oct 14, 2020
9540c93
Fixed swimm validation in travis
VakarisZ Oct 16, 2020
35b8efb
Fixed travis bugs caused by disabled ZT tests
VakarisZ Oct 16, 2020
9da74e3
Fixed travis crashes on isort because of line endings.
VakarisZ Oct 16, 2020
8cd3834
Fixed wrong argument in scoutsuite_collector.py
VakarisZ Jan 4, 2021
eaf9b6a
Renamed cloud providers enum to camel case
VakarisZ Jan 4, 2021
28601d9
Refactored utility method and added unit test
VakarisZ Jan 4, 2021
46abff4
Grouped files used for serving flask into a "server_utils" package
VakarisZ Jan 8, 2021
ba947a6
"type" param renamed to "finding_type" in finding DAO
VakarisZ Jan 11, 2021
d1d5c45
Added scoutsuite package requirements to agent requirements.txt
VakarisZ Jan 11, 2021
737e6bc
Renamed rule_parsing.py to rule_parser.py, to match the classname
VakarisZ Jan 11, 2021
789c58f
Refactored ScoutSuite finding classes to have ABC
VakarisZ Jan 11, 2021
d9a5289
Minor FindingsTable.js readability refactoring
VakarisZ Jan 12, 2021
1472382
Fixed react warnings related to keys and <div/> in <p/>
VakarisZ Jan 12, 2021
5027dd4
Improved unsecure resource display: removed a separate line for unsec…
VakarisZ Jan 12, 2021
7e07489
Moved rule parsing methods into a separate component, added more deta…
VakarisZ Jan 12, 2021
7b60d4d
Refactored ScoutSuiteDataParser.js to improve the readability of scou…
VakarisZ Jan 13, 2021
b90f658
Reverted resource value display to show "False", because for IAM rule…
VakarisZ Jan 13, 2021
87dafeb
Refactored scoutsuite rule count badge readability.
VakarisZ Jan 13, 2021
2dfcbb4
Minor refactoring and typo fix
VakarisZ Jan 14, 2021
cd9d290
Added comment explaining why finding details are in a separate docume…
VakarisZ Jan 14, 2021
a818025
Typo fix in service_consts.py
VakarisZ Jan 14, 2021
761ed2e
Refactored code of rule ordering
VakarisZ Jan 14, 2021
22194c5
Refactored aws access keys in config, added them to encrypted paramet…
VakarisZ Jan 14, 2021
de69d16
Minor scoutsuite code refactorings
VakarisZ Jan 14, 2021
e79290e
Refactored scoutsuite rule button from "ScoutSuite rules" to just "Ru…
VakarisZ Jan 15, 2021
85f4c4f
Small ScoutSuite feature code style refactorings
VakarisZ Jan 15, 2021
02a45c7
Moved and renamed some services to improve directory structure of zer…
VakarisZ Jan 15, 2021
3a9aa31
Separated zero trust and security report resources
VakarisZ Jan 15, 2021
01feea9
Refactored "scoutsuite_findings" directory back to "scoutsuite" direc…
VakarisZ Jan 15, 2021
e69c94a
Split and moved zero trust service into pillar_service.py and princip…
VakarisZ Jan 18, 2021
d4dc42a
Removed the need to change server_config.json just to run tests.
VakarisZ Jan 19, 2021
1b35b8f
Improved finding_service.py by specifying datatype it returns
VakarisZ Jan 20, 2021
d31e906
Added UT's to monkey_zt_finding_service.py and scoutsuite_zt_finding_…
VakarisZ Jan 20, 2021
2df889e
Refactored unittests to pytest on island code. Cleaned up test infras…
VakarisZ Jan 20, 2021
06d3c70
PTH map got removed because it wasn't working. No point in testing co…
VakarisZ Jan 22, 2021
20cc720
Configured fixtures to be picked up by any test in island
VakarisZ Jan 27, 2021
7f690bb
Refactored the use of fixtures and fixed up various tests accordingly
VakarisZ Jan 27, 2021
393eed4
Added zero trust report backend tests and common test data used in th…
VakarisZ Jan 27, 2021
6fac75e
Implemented more unit tests for scoutsuite
VakarisZ Jan 27, 2021
d0404cb
Removed scoutsuite from requirements, because it's imported as a subp…
VakarisZ Jan 27, 2021
7aef867
Improved readability of zero trust report resource by creating separa…
VakarisZ Jan 28, 2021
255bfe9
Minor readability improvements: typehints and comments where needed
VakarisZ Jan 28, 2021
7761d16
Bolded the fact that user has to run monkey from Island to start Scou…
VakarisZ Jan 28, 2021
059494f
Renamed file to match class
VakarisZ Jan 28, 2021
ad0b428
Refactored long imports to relative imports
VakarisZ Jan 28, 2021
d333e8c
Refactored fetch_details_for_display to return empty dict instead of …
VakarisZ Jan 28, 2021
ade2917
Merge remote-tracking branch 'upstream/develop' into 519/scoutsuite-i…
VakarisZ Jan 28, 2021
2549e1f
Deleted custom travis flags that remove scoutsuite code checking, bec…
VakarisZ Jan 28, 2021
a836ab7
Renamed some files and other minor improvements
VakarisZ Jan 29, 2021
ba9e8c2
Improved mokey event fetching and added unit tests
VakarisZ Jan 29, 2021
c45ff1d
Used dpath module instead of custom code to traverse object.
VakarisZ Jan 29, 2021
284cc3a
Removed scoutsuite telemetry processing as there's nothing to process…
VakarisZ Jan 29, 2021
6cb4280
Merge remote-tracking branch 'upstream/develop' into 519/scoutsuite-i…
VakarisZ Feb 4, 2021
bcfa8ff
Extracted count badge into a separate component which is reused betwe…
VakarisZ Feb 5, 2021
9444067
Added comments, type hints and other minor changes in the scoutsuite …
VakarisZ Feb 5, 2021
80e7435
Refactored Finding DTO into ScoutSuiteFinding and MonkeyFinding DTO w…
VakarisZ Feb 8, 2021
905ffd0
Added ScoutSuite rule parsing unit test and example of raw ScoutSuite…
VakarisZ Feb 8, 2021
a0bb0bc
Small renamings and minor improvements
VakarisZ Feb 8, 2021
6f16ba4
Minor refactorings of code style in zero trust code
VakarisZ Feb 9, 2021
baadb24
Reverted relative paths in zero trust code back to absolute
VakarisZ Feb 9, 2021
3cb2a63
Changed rule name classes to inherit from RuleNameEnum to add a more …
VakarisZ Feb 11, 2021
e96ee30
Minor variable and method refactoring to improve readability in scout…
VakarisZ Feb 11, 2021
25704b7
Zero Trust finding saving method refactored to remove code duplicatio…
VakarisZ Feb 11, 2021
8b8c5f9
Added RuleNameEnum class and a type hint related to it in abstract class
VakarisZ Feb 17, 2021
01c775e
Refactored details out of abstract finding document.
VakarisZ Feb 17, 2021
81ea057
Fixed a bug in MonkeyFindingDetails, where updating events using upda…
VakarisZ Feb 17, 2021
414dbf0
Merge remote-tracking branch 'upstream/develop' into 519/scoutsuite-i…
VakarisZ Feb 17, 2021
a977ec4
Cleaned up imports and added no inspection comments to pass flake
VakarisZ Feb 18, 2021
6d31afa
Swimm: update unit Add a new System Info Collector (id: OwcKMnALpn7tu…
VakarisZ Feb 18, 2021
51abb5d
Swimm: update unit Add a simple Post Breach action (id: tbxb2cGgUiJQ8…
VakarisZ Feb 18, 2021
522000d
Swimm: update unit Define what your new PBA does (id: xYkxB76pK0peJj2…
VakarisZ Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .../services/telemetry/processing/system_info_collectors/system_info_telemetry_dispatcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@

from common.common_consts.system_info_collectors_names import (AWS_COLLECTOR, ENVIRONMENT_COLLECTOR, HOSTNAME_COLLECTOR,
PROCESS_LIST_COLLECTOR, SCOUTSUITE_COLLECTOR)
from monkey_island.cc.services.telemetry.processing.system_info_collectors.aws import process_aws_telemetry
from monkey_island.cc.services.telemetry.processing.system_info_collectors.environment import \
process_environment_telemetry
from monkey_island.cc.services.telemetry.processing.system_info_collectors.hostname import process_hostname_telemetry
from monkey_island.cc.services.telemetry.processing.system_info_collectors.scoutsuite import \
process_scout_suite_telemetry
from .aws import process_aws_telemetry
from .environment import process_environment_telemetry
from .hostname import process_hostname_telemetry
from .scoutsuite import process_scout_suite_telemetry
from monkey_island.cc.services.telemetry.zero_trust_checks.antivirus_existence import check_antivirus_existence

logger = logging.getLogger(__name__)
Expand Down