Commit Graph

1754 Commits

Author SHA1 Message Date
VakarisZ ef90d8a788 Added legend and improved matrix UI 2019-04-17 13:52:04 +03:00
Shay Nehmad 6000990dbb Dont use update aws auth params at all 2019-04-16 22:11:22 +03:00
Shay Nehmad 9c38d8e72a Moved region update to beginning of auth function
So it'll work without auth params as well
2019-04-16 21:55:36 +03:00
Shay Nehmad 6216ac0e9e Trying to update the region and then to call remote run
Without auth first
2019-04-16 21:13:36 +03:00
Shay Nehmad 4741151f22 Try to remote run even if not auth
Since auth == keys, but now it works with roles as well
2019-04-16 20:57:51 +03:00
Shay Nehmad a38b5cf360 Added client error as error and formatted error message in site as alert-warning 2019-04-16 20:18:37 +03:00
Shay Nehmad e4e2948941 Loading now stops if not on AWS 2019-04-16 19:20:24 +03:00
Shay Nehmad 5018afb48b Trying to fix an edge where where the role is not set and there's and error while collecting machines. 2019-04-16 18:19:08 +03:00
Shay Nehmad f776765a27 Merge branch 'master' into hotfix/281-aws-roles-hotfix-for-amazon
Conflicts:
    monkey/monkey_island/requirements.txt - Merged by just taking a
    union of both
2019-04-16 17:03:32 +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
itaymmguardicore 3bc24288f6
Merge pull request #301 from guardicore/hotfix/deb-mongodb-req
Hotfix/deb mongodb req
2019-04-16 16:04:10 +03:00
itay 051239ee09 remove ubuntu 14.04 support on mongo script 2019-04-16 15:36:45 +03:00
Shay Nehmad a6a10d3a1a Added author to files 2019-04-16 15:26:47 +03:00
Shay Nehmad ce633af3d1 changed print to log
and added some doc about exception raised
2019-04-16 15:26:47 +03:00
Shay Nehmad 5bfff88325 CR fixes: Added botocore to requirements.txt and locked react-spinners version to the current latest. 2019-04-16 15:26:46 +03:00
Shay Nehmad 8b3bc7fc2c Fixed link and removed TODO 2019-04-16 15:26:46 +03:00
Shay Nehmad d87be71fef Added link to documentation
RTFM
2019-04-16 15:26:46 +03:00
Shay Nehmad a2e79ed127 Changed to gridloader 2019-04-16 15:26:46 +03:00
Shay Nehmad c90a391727 Centered and shrinked AWS loading component 2019-04-16 15:26:46 +03:00
Shay Nehmad 7670430665 Fixed error in JS 2019-04-16 15:26:46 +03:00
Shay Nehmad 11a8449c83 Added loading to the AWS part 2019-04-16 15:26:46 +03:00
Shay Nehmad 86707897de Refactored and tested the "get_instances" method. 2019-04-16 15:26:46 +03:00
Shay Nehmad 84960d13db Refactored and tested the "get_instances" method. 2019-04-16 15:26:46 +03:00
Shay Nehmad 66b90f6bfe Fixed usage of aws instance 2019-04-16 15:26:46 +03:00
Shay Nehmad 30972d926a Added region since amazon requires it 2019-04-16 15:26:46 +03:00
Shay Nehmad 8e6549f481 First version of new AWS code - just trying to test if it works on AWS. 2019-04-16 15:26:46 +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
itay e9d74b1fbd remove upstart scripts from prerm 2019-04-15 19:33:27 +03:00
itay 1274fe053a use mongo4 with ubuntu18 2019-04-15 19:22:31 +03:00
itay 11f0363e49 copy mongo license 2019-04-15 19:17:22 +03:00
itay e405210e46 remove upstart scripts 2019-04-15 18:53:40 +03:00
itay 8154a7583c fix start_server path 2019-04-15 17:57:26 +03:00
itay 3e0d83d2e2 fix postinst, remove unecessary control, add wheel to requirements 2019-04-15 17:24:39 +03:00
VakarisZ 2191aa2149 Merge branch 'develop' into attack_configuration 2019-04-15 16:34:44 +03:00
itay 0fd46c2828 Use mongodb version 3.6.12 2019-04-15 16:22:27 +03:00
itay 15389e34d5 Add/Modify files for optional mongodb service 2019-04-15 13:42:09 +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
itaymmguardicore 8322178711
Merge pull request #298 from guardicore/hotfix/fix-binary-download
all monkey_island references are now absolute
2019-04-14 16:28:54 +03:00
itay d4e42cbe12 all monkey_island references are now absolute 2019-04-14 14:17:18 +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