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

1801 Commits

Author SHA1 Message Date
Shay Nehmad c320111499
Merge pull request #326 from guardicore/feature/325-notification-when-done 
[CR] Added a notification when infection is done
 2019-06-12 19:32:54 +03:00
Shay Nehmad 6480cfe232 Merge branch 'develop' into feature/325-notification-when-done 2019-06-12 19:32:29 +03:00
Daniel Goldberg 015081f9d8
Merge pull request #338 from guardicore/improvement/232-dont-show-linux-in-cred-map 
[CR] Improvement/232 dont show linux in cred map
 2019-06-12 19:26:15 +03:00
Daniel Goldberg 302d4af5ed
Merge pull request #349 from guardicore/bugfix/348-monkey-dir 
[CR] Use tempfile to create monkey directory
 2019-06-12 19:24:22 +03:00
Shay Nehmad 4d184d5723
Merge pull request #339 from guardicore/feature/337-check-mongo-version 
[DONE] Added assertion of mongo db version.
 2019-06-12 18:29:25 +03:00
Shay Nehmad 65ca86f6c0 Changed minimum mongo version to 3.6 
Because Ubuntu 18.04 still provides only 3.6 and people may install that way.
https://launchpad.net/ubuntu/bionic/+source/mongodb
 2019-06-12 18:28:25 +03:00
Shay Nehmad 922a129f2f Now using tempfile to create monkey directory 
Instead of predetermined tmp paths.
 2019-06-12 17:08:33 +03:00
itay 16306f86bb fix imports 2019-06-11 19:45:03 +03:00
VakarisZ 7068a77a61
Merge pull request #343 from VakarisZ/web_rce_bugfix 
bug in web_rce fixed
 2019-06-11 14:56:39 +03:00
VakarisZ 85ff5bd4ec bug in web_rce fixed 2019-06-11 14:49:18 +03:00
Itay Mizeretz 2738cc61e8
Merge pull request #305 from VakarisZ/attack_report_2 
Attack report 2
 2019-06-11 11:20:56 +03:00
Shay Nehmad 28f2d32579 Added assertion of mongo db version. 
Also refactoed a bit to make the main shorter.
 2019-06-05 19:25:09 +03:00
Shay Nehmad cbcc640ace Icon works in the notification 2019-06-05 19:07:42 +03:00
Shay Nehmad 712ce4622d Refactored the GenerateMapNodes function to use the DAL and now it filters windows nodes 2019-06-05 18:28:54 +03:00
Shay Nehmad 833af00421 Added the IslandTestCase class for better testing + moved get_os to the monkey model 2019-06-05 18:28:00 +03:00
Shay Nehmad bf0b812f73 Revert "WIP - initial code, just trying to make a POST request work" 
This reverts commit 026cb41064.
 2019-06-05 17:18:52 +03:00
Shay Nehmad e142ca7c44 Merge branch 'develop' into improvement/232-dont-show-linux-in-cred-map 2019-06-05 16:43:04 +03:00
Shay Nehmad 64fcf4425b Fixed URL and added ICON 
icon doesn't work yet - not passing a URL to the react notification package
 2019-06-05 16:20:04 +03:00
Shay Nehmad 6f814c59a7 Merge branch 'develop' into feature/325-notification-when-done 2019-06-05 13:58:39 +03:00
VakarisZ 22ee27d519 @staticmethod annotation to abstract method added 2019-06-05 10:38:14 +03:00
VakarisZ c77d796798 PR comments fixed 2019-06-03 09:41:05 +03:00
Itay Mizeretz 9021463cd2
Merge pull request #334 from VakarisZ/import_bugfix 
Import made compatible with attack config
 2019-06-02 12:54:56 +03:00
VakarisZ 20e38291e3 Merge remote-tracking branch 'upstream/develop' into attack_report 2019-05-30 21:08:43 +03:00
VakarisZ 016b73c982
Merge pull request #335 from VakarisZ/post_breach_hotfix 
Hotfixed telemetry feed for post breach actions
 2019-05-30 21:08:03 +03:00
VakarisZ 053f9686c6 Hotfixed telemetry feed for post breach actions 2019-05-30 21:04:30 +03:00
VakarisZ 0284eeebe8 Import made compatible with attack config 2019-05-30 17:02:30 +03:00
VakarisZ c731cea853 Merge remote-tracking branch 'upstream/develop' into attack_report 2019-05-30 16:32:08 +03:00
Daniel Goldberg 9f0e3c8513
Merge pull request #316 from VakarisZ/post_breach_refactor 
Post breach refactored to support PBA's from list
 2019-05-30 10:07:06 +03:00
Shay Nehmad 026cb41064 WIP - initial code, just trying to make a POST request work 2019-05-30 09:17:24 +03:00
VakarisZ b5b2fd7c0e PBA created after we check if it's going to run 2019-05-30 09:03:23 +03:00
VakarisZ c9a313b90f UI fix 2019-05-29 10:59:02 +03:00
VakarisZ b465c27e20 Post merge fixes 2019-05-29 09:56:57 +03:00
VakarisZ 61e04c796d Merge remote-tracking branch 'upstream/develop' into attack_report 2019-05-28 17:51:53 +03:00
VakarisZ f52127565d Merge remote-tracking branch 'upstream/develop' into post_breach_fix 
# Conflicts:
#	monkey/infection_monkey/control.py
 2019-05-28 17:42:28 +03:00
VakarisZ b6523b1d45 Refactored to automatically check if post breach should run or not 2019-05-28 17:37:26 +03:00
VakarisZ c783b82aac Merge remote-tracking branch 'upstream/develop' into post_breach_fix 2019-05-28 17:35:04 +03:00
Shay Nehmad 2ea375a7de
Merge pull request #331 from guardicore/hotfix/increase-monkey-timeout 
Increased TTL to 5 minutes
 2019-05-28 16:45:21 +03:00
Shay Nehmad 212ed68dc2 Increased TTL to 5 minutes 2019-05-28 16:44:49 +03:00
Shay Nehmad fd36118c0e Merge branch 'develop' into improvement/232-dont-show-linux-in-cred-map 2019-05-28 15:09:00 +03:00
VakarisZ 54904415bd Merge branch 'attack_configuration' into attack_report 
# Conflicts:
#	monkey/monkey_island/cc/app.py
#	monkey/monkey_island/cc/ui/package-lock.json
#	monkey/monkey_island/cc/ui/package.json
#	monkey/monkey_island/cc/ui/src/styles/App.css
 2019-05-28 14:35:09 +03:00
VakarisZ c4e384205c PR fixes 2019-05-28 14:15:53 +03:00
Shay Nehmad 1073eb7b53
Merge pull request #313 from guardicore/feature/210-monkey-mia-timeout 
[DONE] Feature/210 monkey mia timeout
 2019-05-28 12:26:24 +03:00
VakarisZ 8d9432e817
Merge pull request #285 from VakarisZ/attack_configuration 
Attack configuration
 2019-05-28 09:09:27 +03:00
VakarisZ 691647708f Merge remote-tracking branch 'upstream/develop' into attack_configuration 
# Conflicts:
#	monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
 2019-05-28 08:36:48 +03:00
VakarisZ f4288f110c Race condition bugfix 2019-05-27 17:31:10 +03:00
Shay Nehmad 729c0c50b9 Deleted mongomock - not required. 2019-05-27 17:25:09 +03:00
Shay Nehmad 591b75c555 Can't override init of Documents. Created factory function instead. 2019-05-27 17:20:11 +03:00
Shay Nehmad 2e5864067b Created helper constructor for MonkeyTTL to make it more friendly to use 
CR comment
 2019-05-27 17:01:43 +03:00
VakarisZ 8ecfb5d777 Minor bugfixes 2019-05-27 16:52:33 +03:00
Shay Nehmad 2ecc683216 Moved monketnotfound to monkey.py 
CR comment
 2019-05-27 16:47:30 +03:00