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

110 Commits

Author SHA1 Message Date
VakarisZ ade2917ba3 Merge remote-tracking branch 'upstream/develop' into 519/scoutsuite-integration 
# Conflicts:
#	.swm/OwcKMnALpn7tuBaJY1US.swm
#	.swm/tbxb2cGgUiJQ8Btma0fp.swm
#	.travis.yml
#	deployment_scripts/config
#	monkey/common/utils/exceptions.py
#	monkey/infection_monkey/control.py
#	monkey/infection_monkey/exploit/hadoop.py
#	monkey/monkey_island/cc/environment/set_server_config.py
#	monkey/monkey_island/cc/resources/pba_file_upload.py
#	monkey/monkey_island/cc/services/version_update.py
#	monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/RunOptions.js
#	monkey/monkey_island/cc/ui/src/styles/Main.scss
#	monkey/monkey_island/cc/ui/src/styles/components/Buttons.scss
 2021-01-28 16:13:26 +02:00
VakarisZ 28601d97ed Refactored utility method and added unit test 2021-01-08 10:57:44 +02:00
Ace Pace 030b1c683e Monkey: Guard against exceptions while fingerprinting 2020-12-07 16:54:58 +02:00
VakarisZ 821024035e Specified line-wrap option to isort and skipped a file that's not correctly wrapped 2020-10-06 14:54:05 +03:00
VakarisZ b88cb8bf3c Fixed python linting warnings 2020-10-05 15:16:35 +03:00
VakarisZ 672c19ef0d Fixed scoutsuite bug that caused bad exception handling 2020-10-02 11:00:06 +03:00
VakarisZ d2a8597903 Fixed error caused by mixing up the value of "started_on_island" with whether the current monkey is running on island. 2020-10-01 17:56:29 +03:00
VakarisZ 2356ea50f4 Fixed a bug, where monkey config did not get set to "on_island" immediatelly, so any further monkey code could not rely on this value 2020-10-01 15:15:27 +03:00
ophirharpazg b9186376f9 add OS name to logs 2020-09-02 00:18:12 +03:00
Shay Nehmad 910e8355f9 Fix or noqa some python linter errors 
Also, replace os.path with Path
 2020-08-31 14:13:56 +03:00
Shreya 444c2cb7dd Change max threads from 4 to 5 & modify log message 2020-08-10 11:29:37 +05:30
Shreya c0bff448c4 Run post-breach phase in separate thread 2020-08-10 11:28:32 +05:30
VakarisZ 2c96ace908 Mimikatz, Azure collectors moved to system info collectors in config, "Behaviour" renamed to "Post breach" in config 2020-07-22 18:06:49 +03:00
VakarisZ eb4056ab7f Removed should exploit network machines config param - same will be achieved by removing all exploiters. 2020-07-21 11:29:29 +03:00
Shay Nehmad 81c950b469 Ran isort to order all imports and pass CI tests 2020-07-15 17:55:45 +03:00
VakarisZ 4a082fb390 Merge remote-tracking branch 'upstream/develop' into password_setup 
# Conflicts:
#	monkey/monkey_island/cc/resources/netmap.py
#	monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js
#	monkey/monkey_island/cc/ui/src/components/report-components/security/ScannedServers.js
 2020-06-22 09:56:01 +03:00
VakarisZ 18dec0c652 Password setup: Backed environment changes and unit tests 2020-06-10 11:52:55 +03:00
Shay Nehmad 9ea6718d37 Moved a function into common, since Monkey doesn't have ring as a dependency 
Also renamed it and added UTs
 2020-06-03 16:18:19 +03:00
VakarisZ 436472b578 Added parameter logging on monkey start, fixed bug where dropper launched monkey inproperly 2020-05-21 19:23:23 +03:00
VakarisZ c817415ef3 Fixed "is monkey running on island" check by splitting port from ip string 2020-05-20 11:25:24 +03:00
VakarisZ 0e54b78664 Changes that allow to avoid monkey exploitation redundancy: checking if island can see vulnerable port, checking if monkey was started on island and comparing depth vs maximum depth 2020-05-20 10:00:42 +03:00
VakarisZ 54ac059d5e Prototype changes that fix redundant exploitations, but break multiple iterations 2020-05-15 10:42:03 +03:00
Shay Nehmad bd18893089 Added depth logging for easier debugging down the line 2020-05-10 15:09:43 +03:00
VakarisZ 10d1e7dc0b Fixed monkey ignoring depth restrictions 2020-05-08 17:15:59 +03:00
Shay Nehmad a7aeb7d7ff Report version as part of state telem and log it in island. 2020-02-09 11:28:47 +02:00
Shay Nehmad a3d81a0086 Renamed PlannedShutdown to PlannedShutdownException 2020-01-08 14:00:12 +02:00
Shay Nehmad fb0fea6f6a Improved the monkey start function structure a bit, extracted to functions 
Prep work for changing system info collection to modular system
 2020-01-01 15:33:02 +02:00
Daniel Goldberg dae5c789b5 Revert bad PEP fix 2019-11-24 10:40:33 +02:00
Daniel Goldberg 43d4c36507 Refactor exploiters into plugins. 
Change configuration to support it and remove unneeded complex importing.
Changed main monkey code to support exploiter plugins.
 2019-11-21 19:20:41 +02:00
Daniel Goldberg 69c66072af Turn get_instances into class method. 
This leads to package_name and package_file both also being class methods.
Now, each plugin family can load itself.
Reimplemented Fingerprinters and PBAs to use this interface.
No more need for fingerprinter collector
 2019-11-12 19:33:51 +02:00
Daniel Goldberg 30f7d724b9 Merge branch '393/python-3' into feature/refactor_fingerprinting 
# Conflicts:
#	monkey/infection_monkey/monkey.py
#	monkey/infection_monkey/network/ping_scanner.py
#	monkey/infection_monkey/network/tcp_scanner.py
 2019-11-05 21:20:10 +02:00
Daniel Goldberg b0d77e3c21 Rename fingerprinter_manager to collector 2019-11-05 21:11:55 +02:00
Daniel Goldberg 48740238e2
Merge branch '393/python-3' into bugfix/circular_import 2019-11-05 10:52:31 +02:00
Shay Nehmad 2773002af7
Merge pull request #470 from guardicore/393/python-3-fix-linter-warnings 
[WIP] 393/python 3 fix linter warnings
 2019-11-04 15:29:48 +02:00
Daniel Goldberg 0044eb393b Formatting fail 2019-11-03 14:51:33 -05:00
Daniel Goldberg 8edb55723c Introduce fingerprint manager to avoid having to explictly import classes in configuration. 
Similar to PBA manager.
 2019-10-31 10:39:33 -04:00
VakarisZ e5715f5a7e Removed unnecessary logging of config in BB and MSSQL unhandled error 2019-10-31 12:11:22 +02:00
Daniel Goldberg 2517ab0284 Move get_interface_to_target to network, helping prevent a circular import 
between pba.py and exploiter modules.
 2019-10-30 20:23:19 -04:00
Shay Nehmad 40494d3c3c Auto reformat all code 2019-10-28 21:11:05 +02:00
VakarisZ c0f661d337 More python3 fixes 2019-10-18 18:14:42 +03:00
VakarisZ 8ede629b13 Merge remote-tracking branch 'upstream/develop' into 393/python-3 
# Conflicts:
#	monkey/common/cloud/aws_instance.py
 2019-10-10 11:40:51 +03:00
VakarisZ ea40620373 String vs byte stream mixup bugs fixed 2019-09-20 18:07:17 +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
Shay Nehmad 4762cbc545 Using the new utils - probably a merge mistake somewhere along the lines 2019-09-18 10:57:46 +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 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 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
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
VakarisZ 650ef12149 Bugfix for monkey not reporting being dead 2019-09-11 13:03:12 +03:00