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

2718 Commits

Author SHA1 Message Date
maor.rayzin dd5bbdec35 * encrypted config 2018-11-27 14:14:41 +02:00
maor.rayzin 148ee3f0f0 * Added env' config 
* Added exporters and aws exporter
* changed report generation to be automatic on monkey death with support of on-demand report generation and mongo storage
 2018-11-27 14:14:41 +02:00
maor.rayzin c888ab7bc9 adding the exporter father class and aws implement 2018-11-27 14:14:41 +02:00
maor.rayzin 673605b721 * Added aws region getter 
* Moved productARN to server_config.json file
 2018-11-27 14:13:50 +02:00
Daniel Goldberg fdeeed40f4
Merge pull request #214 from guardicore/feature/collect-aws-instanceid 
Add AWS instance id collector
 2018-11-27 04:12:45 -08:00
Daniel Goldberg 1c75fbecf0 Modern classes and not old school classes 2018-11-27 14:12:23 +02:00
Daniel Goldberg b3afeee3c0 Rename Aws to proper AWS 2018-11-27 14:10:46 +02:00
Daniel Goldberg b7bfdd7afd Quick move from unicode to text_type 2018-11-27 11:26:09 +02:00
Daniel Goldberg f82069e9bf
Merge pull request #215 from guardicore/feature/add-support-encrypted-values 
Add support for strings to be encrypted
 2018-11-27 01:20:12 -08:00
maor.rayzin c47572cd53 * Added another configuration endpoint for the island specific fields 2018-11-27 11:08:43 +02:00
maor.rayzin 4365ed2a14 Merge branch 'feature/add-support-encrypted-values' into feature/report_exporters 2018-11-27 10:30:00 +02:00
maor.rayzin 8eca2ca1e9 * Exceptions handling for sending findings 2018-11-27 10:28:41 +02:00
maor.rayzin 984a64561e * a small fixup 2018-11-26 15:04:25 +02:00
maor.rayzin 4cc85448d7 * add instance id to domain issues too 2018-11-26 14:01:46 +02:00
VakarisZ 85d832938d Small bugfix in web_rce get_open_service_ports 2018-11-26 13:43:15 +02:00
maor.rayzin a79c60e9bc * added instance ID to each issue in an aws machine 
* changed findings resource to ec2 instance id instead of IP
 2018-11-26 12:59:06 +02:00
maor.rayzin 30a6d7542f * deleted a line 2018-11-26 12:12:24 +02:00
maor.rayzin 2dfbc16450 * Added aws creds keys to configuration 
* Added boto session creation using credentials
* Added a flag in the get_config function to separate island configuration values from monkey ones.
*
 2018-11-26 11:48:43 +02:00
Itay Mizeretz f6a0937b22 rename var + comment 2018-11-25 18:45:55 +02:00
Itay Mizeretz fac6f970bb Add support for strings to be encrypted 2018-11-25 18:38:44 +02:00
Itay Mizeretz eddc4ca36a Add AWS instance id collector 2018-11-25 16:29:44 +02:00
maor.rayzin d21558e81a * encrypted config 2018-11-25 14:17:20 +02:00
maor.rayzin 271c024574 * Added env' config 
* Added exporters and aws exporter
* changed report generation to be automatic on monkey death with support of on-demand report generation and mongo storage
 2018-11-25 12:39:47 +02:00
VakarisZ b48cb16088 Comment changed 2018-11-22 19:45:13 +02:00
Daniel Goldberg 3124f1eb5e
Merge pull request #211 from VakarisZ/island_config_navigation_ui_fix 
Makes all tabs of equal height
 2018-11-21 06:29:56 -08:00
VakarisZ 5ffd22433a Hadoop windows fixed to be more reliable 2018-11-21 13:32:45 +02:00
Daniel Goldberg 8496944409 Fix typo where Oracle WebLogic showed up 2018-11-20 17:46:35 +02:00
Daniel Goldberg 22a7a5401c Hotfix english phrasing in WebLogic recommendation 2018-11-19 19:15:02 +02:00
VakarisZ 3503bf9ccb Makes all tabs of equal height 2018-11-19 15:55:18 +02:00
maor.rayzin 7179d840a7 adding the exporter father class and aws implement 2018-11-19 15:40:16 +02:00
Daniel Goldberg 472518bacf
Merge pull request #207 from VakarisZ/RDP_grinder_utf_fix 
Fixes the problem of rdp grinder not being able to handle utf encoded credentials.
 2018-11-19 01:36:27 -08:00
Daniel Goldberg 05103c21a2
Merge pull request #198 from guardicore/bugfix/uuid_to_string 
Bugfix JWT expects input of string
 2018-11-18 08:49:04 -08:00
Daniel Goldberg 8b81d32bab Hotfix of issues enum 2018-11-18 15:20:01 +02:00
Patrick Neise 83da1cc23e updated readme.txt and _MONGO_UURL to support connecting to external MongoDB instance by setting MONKEY_MONGO_URL env variable 2018-11-12 10:18:43 -08:00
VakarisZ fa8975706e Cosmetic changes 2018-11-12 16:23:01 +02:00
VakarisZ b42ff98f9f Converts utf to ascii and fixes the problem of rdp grinder not being able to handle utf encoded credentials 2018-11-12 16:17:12 +02:00
Itay Mizeretz 8994b0671f fixed CR 2018-11-11 20:03:17 +02:00
Itay Mizeretz f79629819e Fix traceroute 2018-11-11 17:13:30 +02:00
maor.rayzin 9812dcd77d A typo in the report page 2018-11-11 15:18:52 +02:00
maor.rayzin 3bb8531b4d HOTFIX: Better label constructing for dup passwords issue 2018-11-11 14:01:03 +02:00
maor.rayzin b14384fcb5 HOTFIX: Ignored cases where a user doesn't have hostname in shared_passwords issue 2018-11-11 12:16:54 +02:00
maor.rayzin 0361219488 HOTFIX: missing pckg in requirements.txt -fixed 2018-11-07 16:05:36 +02:00
Daniel Goldberg b616e27cf8
Merge pull request #203 from VakarisZ/development_fixes 
Added a few missing steps to monkey_island setup instructions
 2018-11-07 01:31:12 -08:00
VakarisZ 527c06b35c Changed rule no. 0. to be more general and without typos. 2018-11-06 18:34:36 +02:00
maor.rayzin ac3955e32e Merge remote-tracking branch 'origin/develop' into develop 2018-11-06 18:20:11 +02:00
maor.rayzin 73856a8be9 HOTFIX: fixing location to be str and not unicode, BytesIO cant work with unicode. 2018-11-06 18:19:52 +02:00
MaorCore 8ca74f7d09
Merge pull request #202 from guardicore/bugfix/find_server_timeout 
Bugfix/fix server timeout
 2018-11-06 16:00:11 +02:00
VakarisZ 9e68bf0bed Added a few missing steps to monkey_island setup instructions (readme.txt in monkey_island) 2018-11-06 13:41:43 +02:00
MaorCore fa1e1ce33c
Merge pull request #170 from guardicore/nadler/pth 
Nadler/pth
 2018-11-06 12:16:18 +02:00
itaymmguardicore cf9656068b
Update monkey/monkey_island/cc/services/pth_report.py 
Co-Authored-By: MaorCore <39161867+MaorCore@users.noreply.github.com>
 2018-11-05 16:48:32 +02:00
itaymmguardicore 5b8b0258c0
Update monkey/monkey_island/cc/services/pth_report.py 
Co-Authored-By: MaorCore <39161867+MaorCore@users.noreply.github.com>
 2018-11-05 16:48:28 +02:00
itaymmguardicore c28f2d6c63
Update monkey/monkey_island/cc/services/pth_report.py 
Co-Authored-By: MaorCore <39161867+MaorCore@users.noreply.github.com>
 2018-11-05 16:48:23 +02:00
itaymmguardicore f12ee32e21
Update monkey/monkey_island/cc/services/pth_report.py 
Co-Authored-By: MaorCore <39161867+MaorCore@users.noreply.github.com>
 2018-11-05 16:48:18 +02:00
maor.rayzin 53ed6004b5 Second Fix: info log wasn't being created on some envs 
Changed the path to the json config file to be a relative generic path
 2018-11-05 16:10:27 +02:00
maor.rayzin bdda578920 First fix: No indication for bad configuration file loaded via the "Import" button in configuration page. 
Added specific error handling for that part.
 2018-11-05 15:15:02 +02:00
maor.rayzin 0bd252d832 RE-CR: more docs 2018-10-31 14:51:23 +02:00
maor.rayzin 3bf917af80 RE-CR: tiny corrections 2018-10-31 14:28:52 +02:00
maor.rayzin 707c88434c RE-CR: changed names, added doc, created consts. 2018-10-31 14:20:56 +02:00
maor.rayzin 3a2d9a9cc2 Excluded the name Administrator from the shared admin issue, it spams 
the report
 2018-10-29 15:25:30 +02:00
maor.rayzin f60c12b391 Added hostname to all issues generated 2018-10-29 15:01:23 +02:00
maor.rayzin 242c2c8700 Added hostname to shared creds users 2018-10-29 14:24:52 +02:00
maor.rayzin b85fb8c94a Some bug fixes and CR after shocks 2018-10-29 13:06:09 +02:00
maor.rayzin 17b344f62f 99% done with RCR, not yet been tested. 2018-10-25 14:17:31 +03:00
maor.rayzin f547b23ef8 imports fix 2018-10-23 11:50:24 +03:00
maor.rayzin d02b9c2538 small bug fix 2018-10-22 17:16:58 +03:00
maor.rayzin 3e90b6d495 fixed imports 2018-10-22 17:09:57 +03:00
maor.rayzin 5c9e8dc6d0 cleared old files 2018-10-22 16:34:23 +03:00
maor.rayzin bacaf97b77 Merge branch 'develop' into feature/mssql_exploiter 
# Conflicts:
#	monkey/infection_monkey/config.py
#	monkey/infection_monkey/example.conf
#	monkey/infection_monkey/exploit/__init__.py
#	monkey/monkey_island/cc/services/report.py
#	monkey/monkey_island/cc/ui/src/components/pages/ReportPage.js
 2018-10-22 12:08:16 +03:00
maor.rayzin 029c278a82 added png assets for the report 2018-10-18 18:34:34 +03:00
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
Daniel Goldberg 372a08791d Change timeout 2018-10-18 15:47:12 +03:00
Daniel Goldberg a44e9a901f Limit monkey lookup in find_server. 
Prevents a situation where the Monkey attempts to connect to a server,
but it's not accessible over the regular port but requires a tunnel.
However the Monkey on the other side will quit before getting the tunnel
request because the isolated monkey is waiting forever
 2018-10-17 16:45:48 +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
Daniel Goldberg 64c072950c Dropper expects to know where is it going to 2018-10-14 20:05:49 +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 010183811c Bugfix JWT expects input of string 2018-10-11 17:48:29 +03: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
Itay Mizeretz 7614170f8d Increased all intervals in UI code to 5 seconds 2018-10-10 20:19:46 +03:00
VakarisZ 5240b4c0f0 Merge branch 'develop' of https://github.com/guardicore/monkey into develop 2018-10-10 17:19:24 +03: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
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
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
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
itaymmguardicore 66876fb970
Merge pull request #177 from acepace/feature/common-folder-import-rewrite 
Rewrote config parsing
 2018-08-30 15:00:55 +03:00
Daniel Goldberg f6cb7ab655 Fix possible empty initialization of scanner class. 
Scanner now defaults to none, and we need to handle that case in the scanner.
 2018-08-29 11:37:00 -04:00
Daniel Goldberg 83b1933296 Remove subcasing for classes 2018-08-29 10:20:30 -04:00
Daniel Goldberg 3ce81ee78a Rewrote config parsing. Avoid the horrible cast by example function and avoid possible circular import issues. 2018-08-27 11:16:40 -04:00
Daniel Goldberg cad9aca5dd Fix one more old style import 2018-08-27 11:06:58 -04:00
Daniel Goldberg b23418782c Move configuration to be a exploit object field rather than every exploit importing it. 2018-08-27 11:04:09 -04:00
Daniel Goldberg be08027221 Fix relative imports 2018-08-27 10:58:43 -04:00
Itay Mizeretz 83d41df875 Fix another merge fail 2018-08-06 14:30:38 +03:00
Itay Mizeretz 063ecd9313 Add files dropped in merge 2018-08-06 14:18:03 +03:00
Itay Mizeretz 26337e3a7a Merge remote-tracking branch 'origin/develop' into feature/support-common-folder 
# Conflicts:
#	infection_monkey/network/__init__.py
#	infection_monkey/transport/__init__.py
#	monkey/infection_monkey/config.py
#	monkey/infection_monkey/dropper.py
#	monkey/infection_monkey/exploit/__init__.py
#	monkey/infection_monkey/transport/ftp.py
 2018-08-06 12:17:25 +03:00
Itay Mizeretz 25f0c08528 Fix python dep installation issues 2018-08-05 14:58:19 +03:00
Itay Mizeretz 4017e189ab Another stupid path fix 2018-08-05 14:21:37 +03:00
Itay Mizeretz 4e84c87050 Add missing files 2018-08-05 13:35:48 +03:00
Itay Mizeretz ddaeb7dbf8 more fixes to deb 2018-06-13 20:48:04 +03:00
Itay Mizeretz 79d8012bb2 Merge branch 'develop' into feature/support-common-folder 
# Conflicts:
#	monkey/infection_monkey/exploit/shellshock.py
#	monkey/infection_monkey/test/config__test.py
 2018-06-13 18:03:43 +03:00
Itay Mizeretz 36230fa25c monkey island can now be run from both monkey_island.py and run_cc.bat 2018-06-13 15:40:13 +03:00
Itay Mizeretz 4e207256dd infection monkey works via infection_monkey.py or monkey.exe 2018-06-13 14:38:58 +03:00
Itay Mizeretz 8a56144a09 Various required fixes 2018-05-23 20:29:32 +03:00
Itay Mizeretz d30f2cf8dc Update scripts 2018-05-23 20:26:33 +03:00
Itay Mizeretz a594bd11c2 Update gitignore, another relative file fix 2018-05-23 16:09:35 +03:00
Itay Mizeretz 0c6f9cb7c2 Move everything under monkey 2018-05-23 16:05:41 +03:00