Commit Graph

1039 Commits

Author SHA1 Message Date
Itay Mizeretz 369795e375 small fixes to make everything work 2018-08-21 17:17:21 +03:00
Vakaris 911404ef68 Implemented default_exploit_host method that can implement whole framework's workflow according to some flags/params 2018-08-21 12:34:59 +03:00
Itay Mizeretz a18061d45d Merge branch 'develop' into feature/detect-cross-segment-traffic
# Conflicts:
#	infection_monkey/config.py
#	infection_monkey/example.conf
#	monkey_island/cc/services/report.py
2018-08-21 11:42:45 +03:00
Itay Mizeretz 203943bf27 Merge remote-tracking branch 'origin/master' into develop 2018-08-21 11:34:59 +03:00
Itay Mizeretz bafa0e42a0 Make feature simpler
Change config value phrasing
2018-08-21 11:34:26 +03:00
itaymmguardicore b56dec318e
Merge pull request #166 from guardicore/hotfix/fix-dep-security-vul
Hotfix/fix dep security vul
2018-08-20 14:43:29 +03:00
Vakaris e3d286dbc0 Minor bugfix for error handling in new custom monkey destination paths feature 2018-08-18 13:14:05 +03:00
Vakaris 5565a80418 Web_RCE framework now supports custom monkey uploading paths( we don't always have permissions to uppload to C:\Windows) 2018-08-17 13:53:09 +03:00
Itay Mizeretz 6e7706f9bf Fix bug which is now critical 2018-08-16 18:55:29 +03:00
Itay Mizeretz 5724d14583 Fix webpack lookup issue 2018-08-16 18:30:51 +03:00
Itay Mizeretz 422df7c71f Replace deprecated modal component 2018-08-16 18:30:26 +03:00
Itay Mizeretz a65721d0c5 Fix known bug necessary for building 2018-08-16 17:09:23 +03:00
Itay Mizeretz b8dd37c5df Temprarily comment out broken component 2018-08-16 17:08:34 +03:00
Itay Mizeretz 2a393d6ed5 Upgrade npm packages and make required modifications 2018-08-16 17:08:03 +03:00
Vakaris b8bda692b9 Notes fixed v.2 2018-08-15 16:01:27 +03:00
Vakaris 0d45a44d6b Final, tested framework fixes 2018-08-10 15:07:56 +03:00
Vakaris 5232d84e06 Almost all notes fixed, but nothing tested. 2018-08-09 16:52:15 +03:00
Vakaris d1a29872c4 Fixed half of the notes and added a small tcp_port_to_service method in network/tools
no message
2018-08-09 12:13:44 +03:00
maor.rayzin 44ee74aaca * Added a coverage for the force connection closing in the mssql fingerprinter.
(cherry picked from commit 782ced912d)
2018-08-08 16:48:51 +03:00
Vakaris 8e684a3fad Bugfix: model.__init__ changed( I forgot to add the file to the branch) and server lock is not a singleton anymore 2018-08-07 17:44:31 +03: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
Vakaris 3f8d63c2d9 Timeout of joining set to 5 seconds. No use of waiting for another thread to stop. We can run our program while the thread stops 2018-08-04 13:01:19 +03:00
Vakaris 40957f865c Struts2 compatability fix 2018-07-19 13:04:52 +03:00
Vakaris 68d949c655 Web RCE framework core files/changes 2018-07-19 12:33:44 +03:00
Daniel Goldberg 3e1edeac61
Merge pull request #156 from VakarisZ/dropper_samefile_fix
Dropper bug fix
2018-07-18 20:53:52 +03:00
Vakaris d78e81db06 Changed to a better file comparison function 2018-07-18 20:48:15 +03:00
Vakaris dfecc6d6ac os.path.samefile does not work on windows. My code checks if files handlers are the same instead 2018-07-18 12:44:19 +03:00
Daniel Goldberg ae4227731c
Merge pull request #155 from guardicore/bugfix/remove_ftp_server
Remove FTP server from infra
2018-07-18 10:50:31 +03:00
Daniel Goldberg d853e02693 Remove FTP server from infra
New FTP server will come from pyftp
2018-07-17 13:08:08 +03:00
Daniel Goldberg 97e5b96637 Opportunistic waiting, make get_tcp_ports O(timeout) rather than timeout. 2018-07-15 16:27:46 +03:00
Daniel Goldberg 977e0a8769
Merge pull request #151 from guardicore/master
Update develop from master
2018-07-09 18:53:57 +03:00
Daniel Goldberg f98a121c51
Merge branch 'develop' into master 2018-07-09 18:53:43 +03:00
Daniel Goldberg 35b535f97a Removed hard coded debug address and replaced with non routable IP 2018-07-08 12:14:45 +03:00
Daniel Goldberg 3118620c8a
Merge pull request #146 from VakarisZ/struts2RCE
Struts2 rce
2018-06-26 18:37:07 +03:00
Vakaris c278b0a29c Small changes 2018-06-26 18:03:31 +03:00
Vakaris 6a37f2b953 removed debugging code 2018-06-25 19:11:58 +03:00
Vakaris 671452243d Fixed some bugs and more notes 2018-06-25 18:26:34 +03:00
Vakaris 81712ddbf0 Merge branch 'struts2RCE' of https://github.com/VakarisZ/monkey into struts2RCE 2018-06-22 14:57:04 +03:00
Vakaris 7ce790affa Some notes fixed 2018-06-22 14:55:52 +03:00
Daniel Goldberg d510476658
Merge branch 'develop' into struts2RCE 2018-06-21 13:23:12 +03:00
Daniel Goldberg f55133e8c1
Merge pull request #142 from guardicore/feature/MSSQL_fingerprint
Feature/mssql fingerprint
2018-06-21 11:46:21 +03:00
Daniel Goldberg 2ddae99687
Merge pull request #144 from guardicore/bugfix/fix-bad-default-config
Fix default config values
2018-06-21 11:40:44 +03:00
Daniel Goldberg 385cf13636
Merge pull request #143 from guardicore/hotfix/update-growl
Update mocha
2018-06-21 11:40:07 +03:00
Vakaris 208411d6fc Cosmetic changes 2018-06-21 00:10:56 +03:00
Vakaris ef6c512ea9 Finished up exploitation and added reporting 2018-06-20 22:35:18 +03:00