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

1154 Commits

Author SHA1 Message Date
maor.rayzin 25ab7f6ffe back-merge with develop 2018-10-18 18:26:09 +03:00
maor.rayzin c208d0ebe8 re-arranged the code and cleaned up a bit 2018-10-18 17:10:14 +03:00
maor.rayzin b443652b0e Cleaned up the code and removed not needed files 2018-10-16 18:53:56 +03:00
maor.rayzin 4ce30de302 Changed the way the username is displayed in the shared admin bulletin 2018-10-16 13:59:32 +03:00
maor.rayzin ab8ee08b47 Added strong users table in the report and removed old files 2018-10-16 12:05:09 +03:00
maor.rayzin c8e547ee8a cleaned up imports 2018-10-14 17:58:51 +03:00
maor.rayzin 822e54f373 This commit isn't final. I want to reorganise the code structure a bit, 
to make it prettier and readable, also to add docs.

Still need to update the report's text.
 2018-10-14 17:57:15 +03:00
Daniel Goldberg f39ee62668 Fix base path for monkey download after refactor 2018-10-14 16:35:42 +03:00
Daniel Goldberg 10d21a4fd4
Merge pull request #196 from guardicore/feature_update_new_log_path 
Fixed logger configuration file path
 2018-10-11 06:53:52 -07:00
maor.rayzin 9f70a7491c Fixed logger configuration file path 2018-10-11 16:26:57 +03:00
maor.rayzin 9a05d0e87d WIP pth feature 2018-10-11 16:20:12 +03:00
Daniel Goldberg 93da8609ae
Merge pull request #194 from VakarisZ/web_rce_config_fix 
Web rce config quickfix
 2018-10-10 11:10:47 -07:00
VakarisZ ca7abbf3cd WebRCE _config bugfix 2018-10-10 20:50:28 +03:00
VakarisZ 3341060102 Revert "WebRCE config bug quickfix" 
This reverts commit 1830a4a709.
 2018-10-10 20:48:03 +03:00
VakarisZ 1830a4a709 WebRCE config bug quickfix 2018-10-10 20:46:03 +03:00
itaymmguardicore d84950baef
Merge pull request #193 from guardicore/hotfix/increase-ui-intervals 
Increased all intervals in UI code to 5 seconds
 2018-10-10 20:21:38 +03:00
Itay Mizeretz 7614170f8d Increased all intervals in UI code to 5 seconds 2018-10-10 20:19:46 +03:00
VakarisZ 9b8c125b91 no message 2018-10-10 17:21:37 +03:00
VakarisZ 5240b4c0f0 Merge branch 'develop' of https://github.com/guardicore/monkey into develop 2018-10-10 17:19:24 +03:00
itaymmguardicore 2311498ef4
Merge pull request #190 from guardicore/feature/implement_traceroute 
Implement traceroute for Linux and Windows over existing tools.
 2018-10-07 11:17:23 +03:00
Daniel Goldberg cf674c8b26
Merge pull request #184 from cclauss/patch-1 
Travis CI: Add Python 3.7 to the testing
 2018-10-07 01:07:54 -07:00
VakarisZ 1f65799828 Merge branch 'develop' of https://github.com/guardicore/monkey into develop 2018-10-01 09:03:02 +03:00
Daniel Goldberg 70f5496475 Implement traceroute for Linux and Windows over existing tools. 2018-09-20 18:00:59 +03:00
Daniel Goldberg fb4381d412
Merge pull request #187 from guardicore/bugfix/tcp_timeout 
Fix typo in tcp_scan_ports
 2018-09-18 16:52:02 +03:00
Daniel Goldberg df6dd194ca
Merge pull request #186 from guardicore/bugfix/consistent_flask_secret_key 
Make flask session key consistent between sessions
 2018-09-18 15:19:24 +03:00
maor.rayzin 81694862b6 Merge branch 'develop' into nadler/pth 2018-09-16 14:21:28 +03:00
Daniel Goldberg aaba30b6b7 Fix typo 2018-09-16 13:46:06 +03:00
maor.rayzin 1a4855d766 * Nothing big, mostly WIP 2018-09-16 13:09:53 +03:00
VakarisZ 1df40008d8 Merge branch 'develop' of https://github.com/guardicore/monkey into develop 2018-09-13 18:39:19 +03:00
Daniel Goldberg 6eb48c4445 See 
https://stackoverflow.com/questions/27287391/why-not-generate-the-secret-key-every-time-flask-starts
 2018-09-13 16:05:30 +03:00
itaymmguardicore 0518899475
Merge pull request #145 from guardicore/feature/support-common-folder 
Feature/support common folder
 2018-09-13 14:56:24 +03:00
VakarisZ 33c4a93ad7 Merge branch 'develop' of https://github.com/guardicore/monkey into develop 
# Conflicts:
#	infection_monkey/model/__init__.py
#	monkey_island/cc/ui/package-lock.json
 2018-09-13 12:50:09 +03:00
VakarisZ 7b9ad6e311 Local rep 2018-09-13 12:48:00 +03:00
Itay Mizeretz 080e3ab23d Merge remote-tracking branch 'origin/develop' into feature/support-common-folder 
# Conflicts:
#	infection_monkey/transport/__init__.py
#	monkey/infection_monkey/config.py
#	monkey/infection_monkey/exploit/__init__.py
#	monkey/infection_monkey/exploit/elasticgroovy.py
#	monkey/infection_monkey/exploit/sambacry.py
#	monkey/infection_monkey/exploit/struts2.py
#	monkey/infection_monkey/exploit/tools.py
#	monkey/infection_monkey/network/tcp_scanner.py
#	monkey/infection_monkey/system_info/mimikatz_collector.py
#	monkey/monkey_island/cc/ui/cfg/base.js
#	monkey/monkey_island/cc/ui/cfg/defaults.js
#	monkey/monkey_island/cc/ui/cfg/dev.js
#	monkey/monkey_island/cc/ui/cfg/dist.js
#	monkey/monkey_island/cc/ui/cfg/test.js
 2018-09-09 14:43:03 +03:00
cclauss cba599257e
Travis CI: Add Python 3.7 to the testing 
travis-ci/travis-ci#9069
 2018-09-08 15:42:10 +02:00
maor.rayzin bc73396db4 Merge branch 'develop' into nadler/pth 
# Conflicts:
#	infection_monkey/system_info/windows_info_collector.py
#	monkey_island/cc/services/report.py
#	monkey_island/cc/ui/src/components/map/preview-pane/PreviewPane.js
#	monkey_island/cc/ui/src/components/pages/ReportPage.js
 2018-09-05 18:18:39 +03:00
itaymmguardicore 95ee92ff08
Merge pull request #183 from VakarisZ/web_rce_bugfix 
Improved error handling if firewall does not allow to open http server
 2018-09-05 17:55:41 +03:00
maor.rayzin 9eb2895c49 * CR comments fixed 2018-09-04 17:18:01 +03:00
itaymmguardicore 5ce902fecd
Merge pull request #120 from guardicore/feature/detect-cross-segment-traffic 
Feature/detect cross segment traffic
 2018-09-03 15:23:21 +03:00
Vakaris f27f5cd919 Improved error handling if firewall does not allow to open http server 2018-08-30 15:42:07 +03:00
itaymmguardicore 66876fb970
Merge pull request #177 from acepace/feature/common-folder-import-rewrite 
Rewrote config parsing
 2018-08-30 15:00:55 +03:00
itaymmguardicore 686cca1723
Merge pull request #153 from guardicore/feature/async_scan 
Opportunistic waiting, make get_tcp_ports O(timeout)
 2018-08-30 15:00:33 +03:00
itaymmguardicore 62f6d7748b
Merge pull request #182 from VakarisZ/hadoop_rce 
Hadoop with web_rce framework
 2018-08-30 14:55:48 +03:00
Vakaris c8e131d913 Added a space before bracket in report 2018-08-30 14:20:52 +03:00
Vakaris 49904d0cb0 Undone server's closing timeout, even though I think 60 is too much 2018-08-29 22:57:52 +03:00
Vakaris 818aae3a2c Hadoop exploitation tested on windows and linux 2018-08-29 22:57:52 +03:00
Vakaris 568320c298 Refactored, notes fixed but file server still timeouts 2018-08-29 22:57:52 +03:00
Vakaris 02c27584da Refactored according to latest web_rce framework changes 2018-08-29 22:57:30 +03:00
Vakaris 504281dbcb quick-fix 2018-08-29 22:57:30 +03:00
Vakaris 390d94a8c3 Final tests, windows command changed 2018-08-29 22:57:30 +03:00