Commit Graph

2718 Commits

Author SHA1 Message Date
Daniel Goldberg 3ce81ee78a Rewrote config parsing. Avoid the horrible cast by example function and avoid possible circular import issues. 2018-08-27 11:16:40 -04:00
Daniel Goldberg cad9aca5dd Fix one more old style import 2018-08-27 11:06:58 -04:00
Daniel Goldberg b23418782c Move configuration to be a exploit object field rather than every exploit importing it. 2018-08-27 11:04:09 -04:00
Daniel Goldberg be08027221 Fix relative imports 2018-08-27 10:58:43 -04: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
Itay Mizeretz ddaeb7dbf8 more fixes to deb 2018-06-13 20:48:04 +03:00
Itay Mizeretz 79d8012bb2 Merge branch 'develop' into feature/support-common-folder
# Conflicts:
#	monkey/infection_monkey/exploit/shellshock.py
#	monkey/infection_monkey/test/config__test.py
2018-06-13 18:03:43 +03:00
Itay Mizeretz 36230fa25c monkey island can now be run from both monkey_island.py and run_cc.bat 2018-06-13 15:40:13 +03:00
Itay Mizeretz 4e207256dd infection monkey works via infection_monkey.py or monkey.exe 2018-06-13 14:38:58 +03:00
Itay Mizeretz 8a56144a09 Various required fixes 2018-05-23 20:29:32 +03:00
Itay Mizeretz d30f2cf8dc Update scripts 2018-05-23 20:26:33 +03:00
Itay Mizeretz a594bd11c2 Update gitignore, another relative file fix 2018-05-23 16:09:35 +03:00
Itay Mizeretz 0c6f9cb7c2 Move everything under monkey 2018-05-23 16:05:41 +03:00