Commit Graph

1567 Commits

Author SHA1 Message Date
VakarisZ 7f5c07c1fd Refactored fingerprint scanners to add port on init 2019-05-06 14:57:17 +03:00
VakarisZ 44077e6bfe Merge branch 'attack_configuration' into attack_report
# Conflicts:
#	monkey/infection_monkey/monkey.py
#	monkey/monkey_island/cc/services/attack/attack_config.py
#	monkey/monkey_island/cc/services/attack/attack_telem.py
#	monkey/monkey_island/cc/ui/src/components/Main.js
2019-05-03 11:23:25 +03:00
VakarisZ c3aa316c07 Added 'should_exploit' configuration field, minor fixes 2019-05-03 10:43:46 +03:00
VakarisZ cdd3270730 Attack configuration page moved into island configuration 2019-05-02 17:11:30 +03:00
VakarisZ c055820a0d Merge branch 'attack_configuration' of https://github.com/VakarisZ/monkey into attack_configuration 2019-04-29 09:55:15 +03:00
VakarisZ 7c3ba14100 Small pr refactoring 2019-04-20 11:45:20 +03:00
itaymmguardicore d36df7a0a3
Update monkey/monkey_island/cc/services/attack/attack_config.py
dict typo

Co-Authored-By: VakarisZ <36815064+VakarisZ@users.noreply.github.com>
2019-04-19 16:52:47 +03:00
VakarisZ 5ecf626705 Another T1210 refactoring 2019-04-19 13:44:36 +03:00
VakarisZ 54c5d655dc Merge branch 'attack_configuration' into attack_report
# Conflicts:
#	monkey/monkey_island/cc/ui/src/styles/App.css
2019-04-17 14:11:33 +03:00
VakarisZ b17dbdc9de Legend style fix 2019-04-17 13:58:52 +03:00
VakarisZ ef90d8a788 Added legend and improved matrix UI 2019-04-17 13:52:04 +03:00
VakarisZ dcf6209e17 Merge branch 'develop' into attack_report 2019-04-17 13:10:53 +03:00
VakarisZ c32d07ae34 T1210 refactored. Instead of dedicated telems, relevant info is appended to 'scan' and 'exploit' telemetries 2019-04-17 11:57:33 +03:00
Shay Nehmad 576af97a82
Merge pull request #304 from guardicore/pr/278
pr/278
2019-04-16 16:58:08 +03:00
Shay Nehmad 93b0c34f07 Fixed comparison to be !== and not !=
also, fixed the same issue for machine-related issues and added documentation.
2019-04-16 16:36:43 +03:00
Shay Nehmad b714ef7a36 BACK_MERGE: Merge branch 'develop' into pr/278 2019-04-16 16:09:25 +03:00
Daniel Goldberg e62af80b20
Merge pull request #302 from VakarisZ/ssh_exploiter_smallfix
SSH exploiter handles exception better
2019-04-16 15:03:01 +03:00
VakarisZ 3c5625404c SSH exploiter handles exception better 2019-04-16 14:16:41 +03:00
VakarisZ 2191aa2149 Merge branch 'develop' into attack_configuration 2019-04-15 16:34:44 +03:00
VakarisZ 6fb06bc24d Refactored island imports according to latest changes 2019-04-15 16:17:23 +03:00
VakarisZ 2f66b77a33 small refactor in rdbgrinder 2019-04-15 16:17:23 +03:00
VakarisZ f73fb9f3a9 Refactored T1210 to have a dedicated telem. 2019-04-15 16:17:23 +03:00
VakarisZ fae8820528 Cosmetic changes 2019-04-15 16:17:23 +03:00
VakarisZ 1eac9856c4 Refactoring T1197 to display time and use tables 2019-04-15 16:17:23 +03:00
VakarisZ 8ee7a06769 Attack report bugfixes 2019-04-15 16:17:23 +03:00
VakarisZ 993736a973 T1210 implemented, T1197 started 2019-04-15 16:17:23 +03:00
VakarisZ c3d717a6bf Report generation algorithm 2019-04-15 16:17:23 +03:00
VakarisZ 5ff7eba12f ATT&CK report page UI implemented 2019-04-15 16:17:22 +03:00
VakarisZ 4d6f403710 UI improved, collapse component almost added 2019-04-15 16:17:22 +03:00
VakarisZ bc09d59eb4 Report file structure created 2019-04-15 16:17:22 +03:00
VakarisZ 6da9b46167 UI file structure added 2019-04-15 16:16:45 +03:00
VakarisZ ce78ebab91 Refactored imports according to latest changes 2019-04-15 13:25:02 +03:00
VakarisZ af3e1713b2 Merge branch 'develop' into attack_configuration
# Conflicts:
#	monkey/monkey_island/cc/app.py
#	monkey/monkey_island/cc/resources/root.py
#	monkey/monkey_island/requirements.txt
2019-04-15 13:02:01 +03:00
Daniel Goldberg 1a36e5e29b
Merge pull request #300 from VakarisZ/file_rename
attack_status_enum renamed to attack_utils
2019-04-15 10:52:29 +03:00
VakarisZ b65af0d1bc attack_status_enum renamed to attack_utils 2019-04-15 08:23:37 +03:00
itaymmguardicore f9823a0608
Merge pull request #299 from guardicore/feature/merge-master-to-develop
Merge branch 'master' into develop
2019-04-14 18:22:44 +03:00
itay 03b7b9f2f3 Merge branch 'master' into develop
# Conflicts:
#	monkey/monkey_island/cc/app.py
#	monkey/monkey_island/cc/resources/root.py
#	monkey/monkey_island/requirements.txt
2019-04-14 16:39:15 +03:00
Daniel Goldberg 4cc19bb42b
Merge pull request #297 from VakarisZ/get_interface_to_target_fix
Refactored get_interface_to_target fix
2019-04-14 13:17:10 +03:00
VakarisZ f09be8ac96
Merge pull request #295 from guardicore/291-update-requirements-file
Updated requirements file
2019-04-12 16:35:06 +03:00
VakarisZ 6ff0952d75 Refactored get_interface_to_target(dst) to get IP by trying to connect instead of IP comparison by string. 2019-04-12 16:15:03 +03:00
Shay Nehmad 22320c9536 Updated requirements file
Fixed https://github.com/guardicore/monkey/issues/291
2019-04-11 18:47:08 +03:00
VakarisZ ae63e19c81
Merge pull request #293 from VakarisZ/small_pba_ui_fix
Minor ui fix
2019-04-11 15:46:55 +03:00
VakarisZ 2fbf3634e2 Minor ui fix 2019-04-11 15:10:47 +03:00
VakarisZ 2106d6dd0b Minor PR comments addressed 2019-04-11 14:48:40 +03:00
Daniel Goldberg 1f28023c45
Add permissions 2019-04-11 14:00:15 +03:00
Daniel Goldberg 2886a33006
Merge pull request #235 from VakarisZ/MonkeyZoo
MonkeyZoo
2019-04-11 13:59:19 +03:00
Daniel Goldberg 313b1532b1
Merge branch 'develop' into MonkeyZoo 2019-04-11 13:59:05 +03:00
VakarisZ 92206c8c84 Added topography image, improved docs and readme 2019-04-11 10:26:46 +03:00
Daniel Goldberg 6b9f3c18bc
Merge pull request #289 from VakarisZ/elastic_small_fix
Added request timeout to elastic exploiter
2019-04-10 10:30:19 +03:00
VakarisZ 1eb2ea12ec Added request timeout 2019-04-09 11:29:34 +03:00