p34709852
/
monkey
forked from p15670423/monkey
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
1,562 Commits 30 Branches 0 Tags 47 MiB
Commit Graph

1562 Commits

Author SHA1 Message Date
itay b560f4c58f move bson to beginning of requirements 
add requests to requirements
 2019-04-30 15:22:30 +03:00
itay a52ce6640e Merge branch 'develop' into feature/check-for-updates 2019-04-23 18:45:22 +03:00
itay db4d5c79bc 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-23 18:44:48 +03:00
itay 49d55a4b8e remove monkey version from server_config.json 2019-04-23 14:45:30 +03:00
itay 362b87f72a Use hardcoded version 2019-04-23 14:44:09 +03:00
itay 06f9153976 fix fetch call 2019-04-23 12:28:38 +03:00
itay 8523075494 Remove authentication from version info resource 
Add new line at end of server_config.json
 2019-04-23 11:54:51 +03:00
itaymmguardicore 3e7a979f96
Merge pull request #311 from guardicore/bugfix/update-bootstrap 
update bootstrap to 3.4.1
 2019-04-22 19:05:18 +03:00
itay 1d9518d18c update bootstrap to 3.4.1 2019-04-22 19:03:09 +03:00
itay d486471fb2 Add version component to UI 2019-04-22 18:09:21 +03:00
itay fe1d9b8f72 Add version update service+resource 
Add routing to update resource
Split app initializing to functions
 2019-04-22 18:08:58 +03:00
itay 614f464f24 Add deployment and version for environment 2019-04-22 18:07:20 +03:00
Daniel Goldberg e256ad3ee5
Merge pull request #307 from VakarisZ/mssql_docs 
MonkeyZoo: MsSQL docs improved
 2019-04-21 10:15:20 +03:00
VakarisZ 6d99a892d6
Merge pull request #308 from VakarisZ/ssh_exception_revert 
Reverted ssh exception handling changes.
 2019-04-18 09:04:36 +03:00
VakarisZ ae1ccfaf9a Reverted ssh exception handling. 2019-04-18 09:01:27 +03:00
VakarisZ ef3caa866d MsSQL docs improved 2019-04-17 16:14:05 +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
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
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
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
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
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
VakarisZ 88b114d810
Fixed typo's in monkey's readme.txt 2019-04-09 10:47:48 +03:00