Commit Graph

3639 Commits

Author SHA1 Message Date
VakarisZ 67b7d0b769 Improved telemetry fabrication logging and failing if telemetry folders don't exist 2020-05-11 16:56:05 +03:00
Shay Nehmad e73c1d0612
Merge pull request #643 from guardicore/hotfix/fix-ui-build-problems
Hotfix/fix ui build problems
2020-05-11 16:44:32 +03:00
Shay Nehmad 6cf81304f8 Load NVM after installing in TravisCI script 2020-05-11 16:44:13 +03:00
VakarisZ 08f46a8ac9 Merge branch 'monkey_telemetry_fabrication' into zt_performance_fixes
# Conflicts:
#	envs/monkey_zoo/blackbox/test_blackbox.py
#	monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
2020-05-11 16:42:53 +03:00
Shay Nehmad 3f83176f84 Fix syntax (and add comment for future travelers) 2020-05-11 16:39:28 +03:00
Shay Nehmad c1de9516a0 Update NPM dependency to latest 2020-05-11 16:34:57 +03:00
VakarisZ e189e96259 Improved the dir structure of telem parsing, other minor CR comments fixed 2020-05-11 16:32:18 +03:00
Shay Nehmad 23d7ef4d97 Update travis script to use npm ci as well 2020-05-11 16:16:58 +03:00
Ace Pace 1f11173545 Remove reg_utils, unused file.
Moved WMI imports to be gated behind win32 check.
Set wmi package to be installed only on win32 platform.

The mongo_utils and wmi_utils modules are only imported by the windows_info_collector which is only imported if we're on windows.
2020-05-11 14:35:24 +03:00
Ace Pace 735aac9c0d Remove pywin32 requirement, it's a subset requirement of wmi. 2020-05-11 14:35:19 +03:00
Shay Nehmad 69f978098c Trying to fight with NPM
And losing
2020-05-11 12:32:23 +03:00
VakarisZ f94098aca6 Merge remote-tracking branch 'upstream/develop' into security_performance_fixes
# Conflicts:
#	envs/monkey_zoo/blackbox/island_client/monkey_island_client.py
#	envs/monkey_zoo/blackbox/test_blackbox.py
#	monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
2020-05-11 10:10:27 +03:00
Shay Nehmad ca49eb72b3 Update node sass version 2020-05-11 08:57:58 +03:00
Shay Nehmad bb54d4f4b3 Merge branch 'develop' into hotfix/fix-ui-build-problems 2020-05-11 08:57:22 +03:00
Shay Nehmad fdfa57edae Fix import typo 2020-05-10 19:38:29 +03:00
Shay Nehmad f070517137
Merge pull request #642 from guardicore/bugfix/monkey_depth_fix
Fixed monkey ignoring depth restrictions
2020-05-10 15:53:40 +03:00
Shay Nehmad 07330ff2f5 Fix build problem
eslint and node incompatebility
2020-05-10 15:42:42 +03:00
Shay Nehmad bd18893089 Added depth logging for easier debugging down the line 2020-05-10 15:09:43 +03:00
VakarisZ 10d1e7dc0b Fixed monkey ignoring depth restrictions 2020-05-08 17:15:59 +03:00
VakarisZ 73832bd0cb Updated PERFORMANCE.conf to include all machines and a lot of segmentation tests 2020-05-07 17:12:48 +03:00
VakarisZ a98b348d24 Merge remote-tracking branch 'upstream/develop' into monkey_telemetry_fabrication
# Conflicts:
#	envs/monkey_zoo/blackbox/island_client/monkey_island_client.py
#	envs/monkey_zoo/blackbox/test_blackbox.py
2020-05-07 12:15:43 +03:00
VakarisZ 9aff40d974 Fake IP's don't get out of range, fixed typo in requirements and added logging to telem parsing 2020-05-07 11:20:08 +03:00
VakarisZ 571682fff9 Refactored ZT events sending and display on report to improve performance and UX 2020-05-06 16:52:50 +03:00
VakarisZ 4073e2f41f Fixed zero trust bug where all events had the same timestamp 2020-05-06 16:50:17 +03:00
Shay Nehmad d5021540ca
Merge pull request #636 from acepace/bugfix/random_pep
Bugfix/random pep
Thanks to @acepace
2020-05-06 12:38:09 +03:00
Ace Pace 115cb05031 Remove flake8 warnings on import not in start of module. Possible alternative is using __all__ but that may come with change in functionality. 2020-05-06 00:04:54 +03:00
Ace Pace 1de511b1ed Remove some more PEP8 2020-05-06 00:01:50 +03:00
Ace Pace 2f4904d3a3 Merge branch 'develop' into bugfix/random_pep 2020-05-05 23:57:34 +03:00
Ace Pace 4c27ea4f7b Fix a few more. Re set the number of flake warnings to be higher :( 2020-05-05 23:47:41 +03:00
VakarisZ 8a385eca93 Style fix for modal window and report tabs 2020-05-04 16:47:17 +03:00
VakarisZ f3ec436f78
Merge pull request #582 from shreyamalviya/map-create-user-pba-to-matrix
Map create user PBA to ATT&CK matrix
2020-05-04 12:10:44 +03:00
VakarisZ 9470ba9729
Merge pull request #634 from acepace/feature/UI_games
Feature/ui size improvements
2020-05-04 12:04:08 +03:00
Shreya 3bfdcb9e9a Undo line deletion
Forgot to add it back on undoing previous changes
2020-05-04 14:26:20 +05:30
Shreya 319c1c27bb Remove redundant code (which was mapping matrix to PBA config) 2020-05-02 00:35:20 +05:30
VakarisZ cdf65ae097 Post breach typo in configuration_schema fix 2020-05-02 00:35:20 +05:30
Shreya 749c37f647 Add check for "Communicate as new user" PBA in T1136 2020-05-02 00:35:20 +05:30
Shreya e164f53ed4 Remove unwanted code (for mapping config to matrix [T1136]) 2020-05-02 00:35:20 +05:30
Shreya 0394b8404a Tiny changes according to review 2020-05-02 00:35:20 +05:30
Shreya 7a3f747a10 Map "Back door user" PBA with "Create account" attack technique
"Create Account" turned off in the ATT&CK matrix config ->
"Back door user" turns off in the PBA config section
... and vice-versa
2020-05-02 00:35:20 +05:30
Shreya 141abfe708 Add report UI
T1136: Create account
2020-05-02 00:35:20 +05:30
Shreya 943541a748 Link attack report to send to client
T1136: Create account
2020-05-02 00:35:19 +05:30
Shreya 41754cb122 Add technique report
T1136: Create account
2020-05-02 00:35:19 +05:30
Shreya a31fffa348 Add attack technique description
T1136: Create account
2020-05-02 00:35:19 +05:30
Ace Pace fc46eecb2d Turn errors into warnings. 2020-05-01 15:32:01 +03:00
Ace Pace 24dc84ced2 Bring back eslint errors, raise travisCI threshold :( 2020-05-01 15:06:49 +03:00
Ace Pace d7c0b7da90 Revert hiding error and just display it instead 2020-05-01 15:05:17 +03:00
Ace Pace 431daa1f8e Reduce number of flake8 warnings to 100. 2020-05-01 13:02:41 +03:00
Ace Pace e508540ace Fix really random linting errors from flake8 2020-05-01 13:00:54 +03:00
Ace Pace d403ea9ed2 Hide more errors :( 2020-05-01 12:19:18 +03:00
Ace Pace 95303309e5 Balance by fixing a bunch of small eslint and general code hint warnings 2020-05-01 11:55:25 +03:00