Commit Graph

270 Commits

Author SHA1 Message Date
Daniel Goldberg b910baf1d0 Stupid, stupid casting bug. 2017-10-01 11:35:17 +03:00
Itay Mizeretz 9af6590e75 Fix CR 2017-09-28 19:03:31 +03:00
Itay Mizeretz 2d83657bd9 Fix missing WindowsError on linux 2017-09-28 17:56:34 +03:00
Itay Mizeretz 6233fec0f7 If exception thrown from exploit, we now send telemetry about trying 2017-09-28 16:14:30 +03:00
Itay Mizeretz 7365f7d6a7 Fix in sambacry
Sambacry tries to exploit when can't recognize version
2017-09-28 16:13:47 +03:00
Itay Mizeretz 3c345679b3 Change skip exploit if monkey exist to false 2017-09-28 14:44:18 +03:00
Itay Mizeretz 174c74cbcb Temporarily disable shellshock reporting its vulnerable pages 2017-09-28 14:43:08 +03:00
Daniel Goldberg 5586619f19 PEP8 fun 2017-09-28 14:22:35 +03:00
Daniel Goldberg a27c802b11 If already touching this file, modify it for PEP8 + better exception syntax. 2017-09-28 14:17:41 +03:00
Itay Mizeretz 48ce135194 Merge remote-tracking branch 'origin/develop' into feature/pass-the-hash
# Conflicts:
#	monkey_island/cc/services/config.py
2017-09-27 18:42:25 +03:00
Itay Mizeretz d628a27595 Add pass-the-hash for wmi 2017-09-27 18:30:44 +03:00
Itay Mizeretz 7e3f420fe0 Add pass-the-hash for sambacry 2017-09-27 17:23:23 +03:00
itaymmguardicore 9242fe3232 Merge pull request #51 from guardicore/feature/elasticgroovy
Feature/elasticgroovy
2017-09-27 15:41:40 +03:00
Daniel Goldberg 6b7f67933d Finish fixing CR notes. 2017-09-27 14:38:44 +03:00
Itay Mizeretz fe77fc833c fix ntlm_hash telem 2017-09-27 14:28:53 +03:00
Daniel Goldberg 142401e706 change the user/password combo to existing function in another place. 2017-09-27 13:40:50 +03:00
Itay Mizeretz 22ce3d9387 Expand config env variables on demand 2017-09-27 11:24:42 +03:00
Daniel Goldberg 5e8288e211 Fixed CR notes in
https://github.com/guardicore/monkey/pull/51#pullrequestreview-65212211
2017-09-26 18:16:20 +03:00
Itay Mizeretz 89b442be58 Implement pass the hash for SMB 2017-09-26 18:11:13 +03:00
Daniel Goldberg 6708e623fc Added Elastic attack 2017-09-26 15:43:46 +03:00
Itay Mizeretz 9b087628be Merge branch 'develop' into hotfix/various-fixes 2017-09-26 11:59:20 +03:00
Itay Mizeretz 243a255833 Merge remote-tracking branch 'origin/develop' into feature/refactor-monkey-island 2017-09-26 11:22:28 +03:00
Daniel Goldberg 01af61aa04 Merge from develop 2017-09-25 18:23:31 +03:00
itaymmguardicore 192c24f6d4 Update elasticfinger.py 2017-09-25 18:17:51 +03:00
itaymmguardicore bd279446fe Update elasticfinger.py 2017-09-25 18:15:14 +03:00
Daniel Goldberg 8bace9794a Update config.py 2017-09-25 18:07:26 +03:00
Daniel Goldberg f3a172fc4a Fixed CR notes
https://github.com/guardicore/monkey/pull/48#pullrequestreview-64914540
2017-09-25 18:02:21 +03:00
Daniel Goldberg 79e6a44008 Fix CR comments, see
https://github.com/guardicore/monkey/pull/47#pullrequestreview-64871377
2017-09-25 17:34:19 +03:00
Daniel Goldberg d5f6812a08 Fix permission bug to work in non admin contexts. 2017-09-25 15:32:13 +03:00
Daniel Goldberg 5ed6e37959 Bug fix 2017-09-25 15:32:01 +03:00
Daniel Goldberg 86d6cdfba3 Add elasticsearch fingerprinting. 2017-09-25 15:13:36 +03:00
Daniel Goldberg 10c9648854 Add mysql fingerprinting and improve struct parsing 2017-09-25 12:01:48 +03:00
Itay Mizeretz 11fa27a2f7 Merge remote-tracking branch 'origin/develop' into feature/refactor-monkey-island 2017-09-24 18:03:17 +03:00
Daniel Goldberg cb7bb56588 Merge branch 'develop' of https://github.com/guardicore/monkey into develop 2017-09-18 11:07:53 +03:00
Daniel Goldberg 7f7b164561 Compile 32/64 monkey_runner at the same time + strip symbols for size. 2017-09-18 11:07:11 +03:00
Itay Mizeretz 77f7e4c5a8 Change tunnel telemetry format to fit expected structure 2017-09-13 16:25:29 +03:00
Daniel Goldberg a85d4e8775 Documentation 2017-09-11 19:24:18 +03:00
Daniel Goldberg 1bd633a0b1 get subnets is now cross OS since it's identical + remove broadcast key since we don't have anything to do with it. 2017-09-11 16:57:37 +03:00
Daniel Goldberg 7b4fb5d4f0 Don't return local IPs.
Return computer fqdn for further information
2017-09-11 16:56:23 +03:00
Daniel Goldberg bdc9b2fcb9 Return network information. 2017-09-10 21:53:21 +03:00
Daniel Goldberg 53a20308de Rewrite get_host_subnets, drastically simplify Linux implementation.
Cleanup code in get_ips_from_interfaces

Modern python

bug fix
2017-09-10 18:47:33 +03:00
Daniel Goldberg 3889aec975 Add shebang 2017-09-05 18:07:05 +03:00
Daniel Goldberg e2f9d19022 Fixed invalid JSON 2017-09-05 17:51:26 +03:00
Itay Mizeretz b420f74a55 Fix dropper bug on wmiexec and win_ms08_067 2017-09-04 16:51:22 +03:00
Itay Mizeretz 40b03793c9 Fix user_password_pairs indentation bug in 2017-09-04 16:44:40 +03:00
Itay Mizeretz 024ebfcbe6 minor fix 2017-09-04 16:36:15 +03:00
Itay Mizeretz 3014763e99 minor fixes 2017-09-04 15:41:36 +03:00
Itay Mizeretz cc889f9124 Fix CR 2017-09-04 14:52:24 +03:00
Itay Mizeretz c8d7a2c4d3 SambaCry now works for both 32,64bit 2017-09-03 11:50:01 +03:00
Itay Mizeretz c612ea0361 Documented sambacry, moved everything to configuration, minor fixes 2017-08-31 20:03:32 +03:00
Itay Mizeretz 5de433eae0 sambacry works
default monkey binary in linux is now 64bit
2017-08-31 18:40:42 +03:00
Itay Mizeretz bb4a168f41 fix linux paths on spec 2017-08-31 17:56:35 +03:00
Itay Mizeretz 194ed624c2 sambacry almost working e2e 2017-08-31 17:50:55 +03:00
Itay Mizeretz 4ce1653c8f sambacry: Add support for using both architectures 2017-08-30 10:16:54 +03:00
Itay Mizeretz 75e1877ea7 Moved monkey_runner 2017-08-29 15:32:14 +03:00
Itay Mizeretz 7d72150e4e Add working POC of sambacry. still needs some modifications to fir monkey, and minor functionality 2017-08-28 19:20:44 +03:00
Itay Mizeretz 919e462a48 remove grequests from monkey-linux spec 2017-08-28 18:32:38 +03:00
Itay Mizeretz c254412c9f Add monkey_runner.so sourcecode 2017-08-28 16:37:33 +03:00
Itay Mizeretz 57e69fafee minor fix in dropper
Rename constants
2017-08-28 10:41:11 +03:00
Itay Mizeretz 9f93fb8310 minor fix in dropper 2017-08-28 09:46:29 +03:00
Itay Mizeretz 332a11b272 minor fix in dropper 2017-08-28 09:41:27 +03:00
Itay Mizeretz 6f74a5e6cc Add arg parsing to dropper 2017-08-27 19:18:11 +03:00
Itay Mizeretz 97205e6427 Fix config property bug 2017-08-21 11:51:47 +03:00
Itay Mizeretz 26df64fb87 Fixed CR 2017-08-20 19:32:18 +03:00
Itay Mizeretz 1a55c8362f Add C&C ability to share credentials found from monkeys 2017-08-17 18:04:36 +03:00
Itay Mizeretz 1e876eb597 Update example.conf 2017-08-16 19:07:50 +03:00
Itay Mizeretz 875eba393c Fix config erasing of creds 2017-08-16 16:36:51 +03:00
Itay Mizeretz f1b7fb6706 Fix unicode problem 2017-08-16 16:13:31 +03:00
Itay Mizeretz 60d64c4e6b Fix minor bug 2017-08-16 15:40:23 +03:00
Itay Mizeretz a671b55df3 Add mimikatz collector
Combine all users and passwords in config
2017-08-16 15:14:26 +03:00
Evstifeev Roman f1dca7fa86 Don't crash when receiving unknown configuration variables
Instead of crashing if the monkey deserializes an unknown configuration
variable, send an error message to the current monkey server and keep on
working.

Add utnittests.

fixes #26
2016-09-27 23:56:26 +03:00
Daniel Goldberg aced96819b Reverted again the dup requests library 2016-09-21 15:42:26 +03:00
daniel goldberg ab7f731ed5 Removed reliance on grequests. Complicates other code and no real performance improvement in a LAN enviornment. 2016-09-21 14:55:13 +03:00
daniel goldberg 9ab5b178df Merge remote-tracking branch 'origin/master' 2016-09-21 12:32:12 +03:00
daniel goldberg 3549bb351e Issue #35 - Added option for blocked IPs. 2016-09-21 11:35:41 +03:00
Evstifeev Roman 2066c19190 requirements.txt - remove duplicate (requests) 2016-09-20 19:35:23 +04:00
itsikkes 155a03efad Small hack to support fast-user switching when RDPing to already loggen-in host
Although it doesn't always happen, because there is no easy wasy to know
- trying  to press YES on the dialog box (if any) can help the login
process
2016-09-19 22:27:17 +03:00
daniel goldberg 084cee78fd Merge remote-tracking branch 'origin/master' 2016-09-14 14:19:13 +03:00
Daniel Goldberg d1f218daad Don't dup pip list 2016-09-13 14:07:48 +03:00
itsikkes b3322b2541 improved local interface selection when exploiting 2016-09-08 12:30:40 +03:00
daniel goldberg 6fcf8b2f15 Merge remote-tracking branch 'origin/master' 2016-09-08 10:21:47 +03:00
daniel goldberg 24792aec61 Remove commented build step. 2016-09-08 08:56:11 +03:00
danielguardicore d2203b2220 Removed legacy ChaosMonkey from SMB execution. 2016-09-07 19:10:30 +03:00
danielguardicore 9f27825789 Changed tcp scanning to be a bit more random. Might confuse really basic defenses. 2016-09-07 19:01:19 +03:00
danielguardicore ce3eaa9b2e Fixed grequsts/gevents monkey patching of socket code, which lead to paramiko being unable to function after a shellshock scan. 2016-09-07 10:16:17 +03:00
itsikkes 39eaca300f RDP: change VBS object to reduce requirements + process is more verbose 2016-09-06 11:05:15 +03:00
daniel goldberg 6e76162b8f Added str representation of hosts. 2016-09-05 21:10:17 +03:00
daniel goldberg 397c4f82ca Merge remote-tracking branch 'origin/master' 2016-09-05 18:49:10 +03:00
daniel goldberg 32c326bd7b PEP8 in diff files
Add concept of non default timeout for copying SMB files. This is by default 5 minutes.
Changed behavior of SMB exploiter if file already exists, we don't assume exploitation is useless and try again. Worse case is we run the monkey after it finished running.
Changed behavior if managed to connect to machine to IPC$ over some dialect. If Success, we don't try again.
2016-09-05 17:45:27 +03:00
Daniel Goldberg 78cafb8d58 Set minimum Python version for Windows version.
This should fix #34
2016-09-05 16:13:55 +03:00
daniel goldberg 5ae67840a6 No manifest files, everything compiled in onefile 2016-09-04 14:33:02 +03:00
daniel goldberg 442cc827c0 Merge remote-tracking branch 'origin/master' 2016-09-04 14:30:56 +03:00
daniel goldberg fc19da7427 Added grequests to hidden imports.
Fixed dict lookup in monkeyfs
2016-09-04 13:45:49 +03:00
Daniel Goldberg ffb0baaa31 Typo 2016-09-01 13:58:44 +03:00
daniel goldberg 12ff0c5677 Reverted bug in config, added 'user' to default bruteforce. 2016-08-30 11:04:44 +03:00
daniel goldberg 6a51e926f8 Fixed random IP 2016-08-29 19:14:37 +03:00
daniel goldberg bbc5cfb24c Add log 2016-08-29 18:58:16 +03:00
daniel goldberg 1a4a08e3bd Add HTTPFinger to conf file and PEP8 fix 2016-08-29 18:58:16 +03:00
daniel goldberg 91427eb346 Tiny PEP8 change and changed reporting of vulnerable URLs in shellshock 2016-08-29 18:58:16 +03:00
daniel goldberg 30cb88f01d Update conf to use shellshock as well 2016-08-29 18:58:16 +03:00