Commit Graph

4489 Commits

Author SHA1 Message Date
Mike Salvatore 2d971d95fc build: select server and logger config at runtime in appimage 2021-03-31 07:37:49 -04:00
VakarisZ 64018eb373 Extracted home environment mocking into a reusable fixture and added a todo, to move it to our fixture list 2021-03-31 07:37:49 -04:00
VakarisZ ef1ef3475b Extracted island argument parsing into a separate file 2021-03-31 07:37:49 -04:00
Mike Salvatore 21e0b5170b cc: explicitly cast tmpdir to str in test_island_logger.py 2021-03-31 07:37:49 -04:00
Mike Salvatore 1f57610005 monkey_island.py: Add TODO to refactor argument handling 2021-03-31 07:37:49 -04:00
Mike Salvatore e6bf085d12 address some flake8 errors 2021-03-31 07:37:49 -04:00
Mike Salvatore 5b781c50a4 cc: rename DEFAULT_LOGGING_CONFIG_PATH -> DEFAULT_LOGGER_CONFIG_PATH 2021-03-31 07:37:49 -04:00
Mike Salvatore 74e0dfddc5 cc: expand "~" in log file configuration 2021-03-31 07:37:49 -04:00
Mike Salvatore 8b3703816d run black to format monkey_island.py 2021-03-31 07:37:49 -04:00
Mike Salvatore e8bb2e6be2 cc: allow logger config to be specified at runtime 2021-03-31 07:37:49 -04:00
Mike Salvatore 4cb28db3bc cc: reformat island_logger.py for readability
1. Adjusted some spacing and indentation
2. Reformatted with Black
2021-03-31 07:36:07 -04:00
Mike Salvatore fef44bcd05 cc: deploy "develop" environment by default 2021-03-31 07:36:07 -04:00
Mike Salvatore fc2f8eca45 cc: remove unnecessary private constants in consts.py 2021-03-31 07:33:47 -04:00
Mike Salvatore ea14bcc2f6 cc: rename DEFAULT_STANDARD_SERVER_CONFIG -> DEFAULT_STANDARD_SERVER_CONFIG_PATH 2021-03-31 07:33:47 -04:00
Mike Salvatore dd9e4bdefa cc: address flake8 issues 2021-03-31 07:32:55 -04:00
Mike Salvatore a057dec1fe cc: use DEFAULT_SERVER_CONFIG_PATH in set_server_config 2021-03-31 07:27:25 -04:00
Mike Salvatore 98b64da896 cc: simplify constructor/factory interface for EnvironmentConfig
The `get_from_json()` and `get_from_dict()` static methods were really
just used for testing. The `EnvironmentConfig` class needs to store its
file path so it can wite to the file if needed. In practical usage,
`EnvironmentConfig` objects are initialized from files, so a simpler
interface is for its constructor to take a file path.
2021-03-31 07:27:25 -04:00
Mike Salvatore 4b5415ac0b cc: fix server_config_generator behavior 2021-03-30 19:17:30 -04:00
Mike Salvatore 986219bd86 cc: rework EnvironmentConfig test
1. Rewrote in pytest
2. Removed reduntant tests
3. Added tests for add_user() and get_users()
2021-03-30 19:17:30 -04:00
Mike Salvatore 1d73f6e860 cc: move DEFAULT_SERVER_CONFIG_PATH to consts.py 2021-03-30 16:39:07 -04:00
Mike Salvatore 0230c26f19 cc: allow server_config.json to be specified at runtime 2021-03-30 16:34:29 -04:00
Mike Salvatore 12c40c3968 build: scripts for building MonkeyIsland as an appimage
Adds the basic scripts for generating an AppImage. Code changes are
required to allow Monkey Island to operate on a read-only filesystem.
2021-03-30 16:22:30 -04:00
Mike Salvatore 176ad01c14 Merge branch 'release/1.10.0' into develop 2021-03-30 15:59:20 -04:00
VakarisZ 6c034f2662 Updated checksums page 2021-03-29 12:29:53 -04:00
Mike Salvatore fad19075a2 Add changelog checklist item to pull request template 2021-03-29 12:20:33 -04:00
Mike Salvatore 6693fad0b5 Add empty CHANGELOG.md file 2021-03-29 12:18:47 -04:00
Mike Salvatore 962621aaef docs: add distro compatibility and focal instructions do debian setup 2021-03-29 12:12:50 -04:00
Mike Salvatore 52601bd735 job posting 2021-03-29 10:10:22 -04:00
Mike Salvatore ad0ce3cdeb
Merge pull request #1052 from guardicore/vm-ip-config-docs
docs: update vmware OVA static IP configuration instructions
2021-03-26 12:25:32 -04:00
Mike Salvatore 5d68bc6e1d docs: update vmware OVA static IP configuration instructions for v1.10.0 2021-03-26 12:23:43 -04:00
Mike Salvatore e197008c2f docs: update vmware OVA static IP configuration instructions for v1.9.0 2021-03-26 12:22:20 -04:00
Mike Salvatore d6b2c4e1c4 docs: update docker setup guide for v1.10.0 2021-03-26 09:57:18 -04:00
Mike Salvatore 74d9bf71ab
Merge pull request #1047 from guardicore/home_docs_improvement
Improved home page documentation
2021-03-25 09:18:05 -04:00
VakarisZ e17085d75e Last fix in home docs: attacker's -> an attacker's 2021-03-25 14:33:22 +02:00
VakarisZ 1768a58023 Fixed more typos and style issues with monkey home documentation page 2021-03-25 09:11:13 +02:00
VakarisZ 869d290296 Fixed typos and improved wording in homepage of documentation hub 2021-03-24 16:29:44 +02:00
VakarisZ 8437f8d838
Merge pull request #1050 from guardicore/version_number_bump
Version number bump
2021-03-24 15:28:04 +02:00
VakarisZ 66ce163067 Bumped version number to 1.10 2021-03-24 15:26:20 +02:00
VakarisZ bae0ed38a1 Moved elastic port to HTTP ports to fix a bug of "All web-ports are closed" 2021-03-24 08:48:51 -04:00
Mike Salvatore 9dfebe2460 docs: Fix FAQ links by removing emojis
Fixes #995
2021-03-24 08:31:54 -04:00
VakarisZ 17504c227b Improved home page documentation by adding explanation about how monkey works technically 2021-03-24 12:50:29 +02:00
VakarisZ 24bd8a4db9
Merge pull request #1046 from guardicore/simplejson_requirement
Added simplejson requirements to monkey requirements
2021-03-23 17:08:12 +02:00
VakarisZ c612e7e4b5 Added simplejson requirements to monkey requirements 2021-03-23 16:58:26 +02:00
VakarisZ 08df196a26
Merge pull request #1045 from guardicore/scoutsuite_fix
Minor ScoutSuite related fixes
2021-03-23 14:42:47 +02:00
VakarisZ 9c8e0a8270 Removed unnecessary explicit ScoutSuite import in monkey spec file 2021-03-23 14:15:57 +02:00
VakarisZ 9f839c1743 Removed outdated ScoutSuite setup from deployment scripts 2021-03-23 14:15:07 +02:00
Mike Salvatore ef0c3c2f66
Merge pull request #1044 from guardicore/tunneling_bugfix
Tunneling bugfix
2021-03-19 11:12:04 -04:00
VakarisZ e8c03f9bc4 Fixed tunneling test configuration template 2021-03-19 16:53:31 +02:00
VakarisZ 739afa4fbe Fixed urlib dependency issue 2021-03-19 16:52:01 +02:00
VakarisZ 4b1a8d59be
Merge pull request #1033 from shreyamalviya/bugfix-unicode-decode-error
Handle UnicodeDecodeError in Windows info collector
2021-03-18 10:49:09 +02:00