Commit Graph

2508 Commits

Author SHA1 Message Date
Daniel Goldberg ccc6c50a7f Remove unused constant 2019-09-22 16:46:55 +03:00
Daniel Goldberg c4ec6683a1 Silly bugfix in scanning 2019-09-22 16:44:20 +03:00
Daniel Goldberg a32a783257 Factor out generating VictimHosts from NetworkRange object 2019-09-22 15:59:15 +03:00
Daniel Goldberg 4dcc919b49 Remove unused import, remove author 2019-09-22 15:59:14 +03:00
Daniel Goldberg 032ee2ee0e Bugfix in generator 2019-09-22 15:59:14 +03:00
Daniel Goldberg d8d55cb546 PEP8 changes
Documentation improvements
2019-09-22 15:59:11 +03:00
Shay Nehmad f175c93f5a Now hashes are hashed as well 2019-09-22 13:00:33 +03:00
VakarisZ ea40620373 String vs byte stream mixup bugs fixed 2019-09-20 18:07:17 +03:00
Daniel Goldberg 8c69cc0af9
Merge pull request #438 from guardicore/434/bugfix/plaintext-passwords-logged
Hashing passwords to make sure we don't log passwords plaintext
2019-09-19 23:30:58 +03:00
VakarisZ 896e6e486f Added env. reset before tests 2019-09-19 14:38:17 +03:00
VakarisZ 9bcaf8b512 Ran 2to3 on changes merged from develop 2019-09-19 10:25:20 +03:00
VakarisZ 1eac005563 Merge remote-tracking branch 'upstream/develop' into 393/python-3
# Conflicts:
#	monkey/infection_monkey/exploit/rdpgrinder.py
#	monkey/infection_monkey/exploit/sshexec.py
#	monkey/infection_monkey/exploit/tools.py
#	monkey/infection_monkey/requirements_windows.txt
#	monkey/infection_monkey/transport/http.py
#	monkey/monkey_island/cc/models/__init__.py
#	monkey/monkey_island/cc/models/monkey_test.py
#	monkey/monkey_island/cc/services/attack/technique_reports/T1110.py
#	monkey/monkey_island/cc/services/reporting/report.py
2019-09-18 16:43:34 +03:00
VakarisZ e0463b6b12 Fixing some string formatting in island 2019-09-18 16:21:12 +03:00
Shay Nehmad 4762cbc545 Using the new utils - probably a merge mistake somewhere along the lines 2019-09-18 10:57:46 +03:00
Shay Nehmad e605c1c410 Merge branch 'develop' into 434/bugfix/plaintext-passwords-logged 2019-09-18 10:51:40 +03:00
Shay Nehmad 6fc37cef07 Hashing passwords to make sure we don't log passwords plaintext 2019-09-18 10:39:25 +03:00
Daniel Goldberg f0ee88182f
Merge pull request #435 from VakarisZ/attack_winapi_smallfix
WinAPI attack telem fix.
2019-09-18 09:51:15 +03:00
Shay Nehmad 014e47ad5e
Merge pull request #405 from guardicore/400/zero-trust-mvp
400/zero trust mvp
2019-09-18 08:43:42 +03:00
Shay Nehmad 5754ec6044
Merge pull request #428 from guardicore/400/more-tests
400/more tests
2019-09-18 08:37:44 +03:00
Shay Nehmad 6a2510a657 Merge branch 'develop' into 400/more-tests 2019-09-18 08:19:44 +03:00
VakarisZ 01a2a448de delays singleton attack telem and sends it when monkey can communicate with server 2019-09-17 14:51:42 +03:00
VakarisZ 81fb8adc02 Refactoring island to python3.7 2019-09-17 11:59:00 +03:00
VakarisZ 5d8662deb4 Merge remote-tracking branch 'upstream/develop' into 420/blackbox 2019-09-17 09:20:12 +03:00
VakarisZ bc9b994cba
Merge pull request #422 from guardicore/mssql_bugfix
MSSQL bugs fixed, refactored to be more stable
2019-09-17 09:19:13 +03:00
VakarisZ 018d3ddc08 Fixed bugs regarding waiting for monkeys to die, readability improvements 2019-09-17 09:17:29 +03:00
Shay Nehmad 0667aad87f Small fixes - reversed condition accidentaly and missed one reference to get_windows_commands_to_add_user 2019-09-16 17:57:35 +03:00
Shay Nehmad db328a3432 Accidentaly committed server config testing 👎 2019-09-16 17:42:21 +03:00
Shay Nehmad 841e54afc8 Fixed UTs 2019-09-16 17:41:26 +03:00
Shay Nehmad 9f98025d33 Using protocol as well for cases when we are running on HTTP and not HTTPS (npm run start for example) 2019-09-16 16:44:16 +03:00
Shay Nehmad d4947d97f3 Lock npm version for `pluralize` 2019-09-16 16:37:30 +03:00
Shay Nehmad 1f56e8df61 Use classname instead of self for static method 2019-09-16 16:34:13 +03:00
Shay Nehmad 3b06768a98 Replaced sleep loop for waiting on the process with WaitForSingleObject winapi. 2019-09-16 16:32:21 +03:00
Shay Nehmad 0a11c4b007 Extracted duplicate code to `add_malicious_activity_to_timeline` helper function 2019-09-16 16:17:30 +03:00
Daniel Goldberg d8bac57eb5 Change grouper to be a VictimHost generator 2019-09-16 15:16:56 +03:00
Daniel Goldberg e11be48b80 Add documentation for TCP scan interval in Monkey configuration 2019-09-16 15:16:56 +03:00
Daniel Goldberg 2b14878a9c Bugfix, used wrong logger! 2019-09-16 15:16:56 +03:00
Daniel Goldberg 6c5d6a5ecc Move scanners to be instance variable.
Add MP support (threading/process) for scanning victims in chunks
2019-09-16 15:16:56 +03:00
Daniel Goldberg 7357c8c168 Iterate over ranges as chunks rather than discrete addresses 2019-09-16 15:16:56 +03:00
Daniel Goldberg 17dc764f37 Add support for MP in Windows PyInstaller 2019-09-16 15:16:56 +03:00
Shay Nehmad 76c642e4b3 Lowered code dup in get_result_event 2019-09-16 15:08:22 +03:00
Shay Nehmad dd9a4b2d10 Refactored test_new_user_communication, mostly separated to functions 2019-09-16 15:04:22 +03:00
Shay Nehmad 4330a39725 Removed unused PBA processing funcs 2019-09-16 14:59:27 +03:00
Shay Nehmad bb8a5bf55d Deleted TODO 2019-09-16 14:56:34 +03:00
Shay Nehmad bc94e5854a Moved handle close to finally block 2019-09-16 14:54:02 +03:00
Shay Nehmad b8f48d3542 Unpacking struct from winapi 2019-09-16 14:45:39 +03:00
Shay Nehmad 77269fb3ce Extracted user name creation to separate function 2019-09-16 14:06:21 +03:00
Shay Nehmad 889c8a2378 Moved user add+delete commands into `utils/users` 2019-09-16 13:53:33 +03:00
Shay Nehmad edc2d49307 Broke monkey_utils to utils/ and moved sambacry_runner to exploit. This commit is 100% refactoring without any new code, just deleted unused utils. 2019-09-16 13:00:42 +03:00
Shay Nehmad 4b44fad1cd Fixed typos and grammer errors 2019-09-16 12:27:50 +03:00
VakarisZ 91fe7c22a8 Removed comments that were used in testing 2019-09-13 16:50:12 +03:00