New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/support common folder #145

Merged
merged 25 commits into from Sep 13, 2018

Conversation

Projects
None yet
1 participant
@itaymmguardicore
Contributor

itaymmguardicore commented Jun 13, 2018

Feature / Fixes

Add support for a common folder

  • Have you added an explanation of what your changes do and why you'd like to include them?
  • Have you successfully tested your changes locally?

Changes

  • Now you can share code between monkey_island and infection_monkey
  • Directory tree looks better

@itaymmguardicore itaymmguardicore self-assigned this Jun 13, 2018

itaymmguardicore and others added some commits Jun 13, 2018

Merge remote-tracking branch 'origin/develop' into feature/support-co…
…mmon-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
Merge pull request #176 from acepace/feature/support-common-folder-ex…
…ploit-import

Feature/support common folder exploit import
Daniel Goldberg
Fix possible empty initialization of scanner class.
Scanner now defaults to none, and we need to handle that case in the scanner.
Merge remote-tracking branch 'origin/develop' into feature/support-co…
…mmon-folder

# Conflicts:
#	infection_monkey/transport/__init__.py
#	monkey/infection_monkey/config.py
#	monkey/infection_monkey/exploit/__init__.py
#	monkey/infection_monkey/exploit/elasticgroovy.py
#	monkey/infection_monkey/exploit/sambacry.py
#	monkey/infection_monkey/exploit/struts2.py
#	monkey/infection_monkey/exploit/tools.py
#	monkey/infection_monkey/network/tcp_scanner.py
#	monkey/infection_monkey/system_info/mimikatz_collector.py
#	monkey/monkey_island/cc/ui/cfg/base.js
#	monkey/monkey_island/cc/ui/cfg/defaults.js
#	monkey/monkey_island/cc/ui/cfg/dev.js
#	monkey/monkey_island/cc/ui/cfg/dist.js
#	monkey/monkey_island/cc/ui/cfg/test.js

@itaymmguardicore itaymmguardicore merged commit 0518899 into develop Sep 13, 2018

@itaymmguardicore itaymmguardicore deleted the feature/support-common-folder branch Sep 13, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment