Commit Graph

2596 Commits

Author SHA1 Message Date
Shay Nehmad 61a81c2da4 Created the report generation sync module and now using it exclusivly to create reports.
Almost all debug logs should probably be deleted once testing is done
2019-10-02 16:31:31 +03:00
Daniel Goldberg c767250760
Merge pull request #450 from VakarisZ/T1078_removal
Bugfix unused attack technique and bad import of is_windows_os
2019-10-02 16:19:10 +03:00
Shay Nehmad 35befae6e0 Revert network_scanner fix 2019-10-02 14:24:01 +03:00
VakarisZ 84830015fd Fixed bad is_windows_os import 2019-10-02 14:00:49 +03:00
VakarisZ f600a0b2c9 Removed unused attack technique from schema 2019-10-02 13:59:06 +03:00
Shay Nehmad f5d7850802 Bad import -_- 2019-10-02 13:21:55 +03:00
Shay Nehmad 19dcf689fe Added documentation 2019-10-02 13:12:48 +03:00
Shay Nehmad 006c177abd Added lock on report generation and improved the get_completed_steps method 2019-10-02 13:04:58 +03:00
Shay Nehmad 656184e8b5 Deleted unused function 2019-10-02 12:35:09 +03:00
Shay Nehmad d02e349f71 Added cached checking of is_monkey to optimise runtime of EdgeService 2019-10-02 12:18:53 +03:00
VakarisZ 2af17bc371 Windows deployment scripts to python3 2019-10-02 11:52:57 +03:00
Shay Nehmad e3b93f1506 get_edge_label is a little quicker - uses cache. Still calls the DB on every run to check if something is a node or a monkey. 2019-10-02 11:08:49 +03:00
Shay Nehmad 264e7407fb Optimised monkey_to_net_node 2019-10-02 11:01:47 +03:00
Shay Nehmad 122919d73c Added cache test to test_monkey.py 2019-10-02 11:01:08 +03:00
Shay Nehmad 6327f6e85c Added monkey island logic to get label by id 2019-10-02 11:00:50 +03:00
Shay Nehmad 628ebc06c1 Updated docs and TODO (we won't get to it this PR) 2019-10-02 09:59:25 +03:00
Shay Nehmad 4d9467bac9 Using `ring` as the primary caching library, no functools.
Lowers amount of deps
2019-10-02 09:54:47 +03:00
VakarisZ f065f30de0 Merge remote-tracking branch 'upstream/develop' into 420/blackbox 2019-10-01 16:12:08 +03:00
VakarisZ f962894038 Real time logging implemented 2019-10-01 16:11:53 +03:00
VakarisZ 73d434119d CR comments fixed 2019-10-01 10:42:51 +03:00
Shay Nehmad 93c9aaa513 Fixed decorator order, now caching works 2019-09-29 17:14:28 +03:00
Shay Nehmad 1060c004bd Started improving and researching the performence issues - still in progress... 2019-09-29 15:54:24 +03:00
Daniel Goldberg 32e98fa418
Merge pull request #437 from guardicore/feature/scan_hosts_fast
Feature/scan hosts fast 
Yay, done with my longest waiting branch. 
Next up, OS sniffing.
2019-09-29 09:37:58 +03:00
Daniel Goldberg f55a3e483b Changed VictimHostGenerator to accept the local addresses rather than generating them itself.
Changed UTs to be independent.
2019-09-27 18:10:59 +03:00
Daniel Goldberg 297686dc53 Changed default scanning size to be bigger. 2019-09-27 17:00:18 +03:00
Daniel Goldberg 0a61e83a15 Add chunking test and some basic docs 2019-09-27 16:57:36 +03:00
Daniel Goldberg 2f25e5b127 Added basic tests for VictimHostGenerator 2019-09-27 16:51:55 +03:00
Daniel Goldberg a1d631b39e Remove list comprehension 2019-09-27 16:33:29 +03:00
Daniel Goldberg cf66a096f8
Merge pull request #445 from VakarisZ/weblogic_fix
Delay in weblogic to make exploiter more reliable
2019-09-27 15:37:57 +03:00
VakarisZ 9a21a50fd1 Windows deployment scripts to python3 2019-09-26 10:53:25 +03:00
VakarisZ a194bb5622 More byte/str mixups fixed 2019-09-25 16:06:15 +03:00
VakarisZ 06182a485a Added delay in weblogic to make exploiter more reliable 2019-09-25 15:42:24 +03:00
VakarisZ 72e30bb631 Added 2 PTH tests, changed consts to improve stability 2019-09-24 16:18:11 +03:00
VakarisZ c40ec2adaf Outdated sort, byte/string mixups fixed 2019-09-24 11:47:29 +03:00
VakarisZ 5c680256cd
Merge pull request #444 from guardicore/434/bugfix/plaintext-passwords-logged
Hashing lm+ntlm hashes to make sure we don't log them plaintext
2019-09-24 08:44:26 +03:00
Daniel Goldberg 8c55d2acd4 Refactor victim generation.
Now we have a VictimHost generator that handles all the filtering.
2019-09-23 18:01:39 +03:00
Daniel Goldberg c76cc72821 Fixed horrible bug where we would return more victims than we needed to 2019-09-23 17:45:17 +03:00
Shay Nehmad bea41409d5 WIP commit, added caches, found place which is n*n 2019-09-22 19:59:58 +03:00
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