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

5446 Commits

Author SHA1 Message Date
VakarisZ feeba1ea60
Merge pull request #1204 from guardicore/config_encrypt 
Config encrypt
 2021-06-11 17:09:07 +03:00
Shreya 41f41015b8 docs: Update supported OS list in AppImage setup page 2021-06-11 19:33:12 +05:30
Shreya 01a2c20d4b docs: Remove unsupported OS section from AppImage setup page 2021-06-11 19:05:30 +05:30
Mike Salvatore 57f35f9045 island: Fix typo in ConfigurationImport error logging 2021-06-11 09:28:29 -04:00
VakarisZ 8a673cc76c Added the logging for errors encountered in configuration decryption workflow 2021-06-11 16:25:47 +03:00
VakarisZ fbe9b4f4d7 Typos and small bugfixes for configuration export/import UI. 2021-06-11 16:06:04 +03:00
VakarisZ 5c7bab7a0d Refactored json parsing out of encryption/decryption functionality. 2021-06-11 16:05:32 +03:00
Shreya c2245ce3c2 docs: Add upgrading section to AppImage setup page 2021-06-11 14:50:04 +05:30
Shreya f15d30a020 docs: Add list of supported OS for AppImage package 2021-06-11 14:42:33 +05:30
Shreya fadc816df0 docs: Remove Debian package setup page 2021-06-11 14:40:04 +05:30
VakarisZ 3450b80a82 Refactored cyphertext to ciphertext for consistency 2021-06-11 11:43:15 +03:00
VakarisZ 5cf002d81a Refactored unit tests and added a unit test for a function which checks whether or not config is encrypted. 2021-06-11 11:40:07 +03:00
VakarisZ a36fc81755 Refactored configuration import and added a check to decide if configuration is encrypted or not. This solved a bug where invalid json was treated as credential error. 2021-06-11 11:40:07 +03:00
Mike Salvatore d287573806 docs: Add instructions for user-provided certs to windows setup 2021-06-10 13:13:12 -04:00
Mike Salvatore e2326fd71f
Merge pull request #1221 from guardicore/remove-ssl-perms-checks 
Remove ssl perms checks
 2021-06-10 13:08:12 -04:00
Mike Salvatore 331d2aeb7e
docs: Add "writable" for more accurate description 
Co-authored-by: Shreya Malviya <shreya.malviya@gmail.com>
 2021-06-10 13:08:02 -04:00
Mike Salvatore ca5450b932 island: Add quotes around --user argument in docker setup 2021-06-10 11:34:08 -04:00
Mike Salvatore 7b14b917cd docs: Tell the user to set secure permissions on /monkey_island_data 2021-06-10 11:33:05 -04:00
Mike Salvatore 9b7c913007 docs: Remove errant comma in linux setup 2021-06-10 11:08:18 -04:00
Mike Salvatore 348118a5ed docs: Minor corrections to docker certificate setup 2021-06-10 10:50:59 -04:00
Mike Salvatore b700870790
Merge pull request #1217 from guardicore/data-dir-race-condition 
Fix data dir race condition on Windows
 2021-06-10 08:05:58 -04:00
shreyamalviya f04f307f78 Add unit test for Linux directory permissions (removed accidentally previously) 2021-06-10 17:23:32 +05:30
Mike Salvatore 6a1a1721bd island: Loosen permissions on ssl cert in create_certificate.sh 2021-06-10 07:38:29 -04:00
Shreya Malviya 5d8db4b112
Update log message in monkey/monkey_island/cc/environment/utils.py 
Co-authored-by: Mike Salvatore <mike.s.salvatore@gmail.com>
 2021-06-10 17:03:01 +05:30
shreyamalviya 92a71451fb Remove unused import in test_utils.py 2021-06-10 17:01:57 +05:30
shreyamalviya 7643102ccd Rename function to not use abbreviations 2021-06-10 16:56:50 +05:30
Mike Salvatore 118dfa53d4 docs: Loosen ssl permissions recommendation for appimage 2021-06-10 07:13:47 -04:00
Mike Salvatore 937dbac4d0 island: Remove SSL permissions checks 
These checks prevent the docker container from working properly, as the
default SSL cert must have at least 444 permissions.
 2021-06-10 06:57:45 -04:00
shreyamalviya 74111f80e9 Remove `create_parents_dir` parameter when creating directories 
Can't create parents on Windows using pywin32.
Removed it completely so that behavior is consistent across OSes.
 2021-06-10 15:25:16 +05:30
shreyamalviya 1fa2ffe8f7 Fix Windows directory creation 2021-06-10 15:25:16 +05:30
shreyamalviya 54f5524760 Fix race condition during Windows directory creation 2021-06-10 15:25:12 +05:30
VakarisZ a4a4219f6a
Merge pull request #1215 from guardicore/win_language_docs 
Added a support section for Windows docs
 2021-06-10 11:53:10 +03:00
VakarisZ b282e5276b
Merge pull request #1216 from guardicore/data_dir_race_condition_linux 
Fixed a race condition for linux secure directory creation
 2021-06-10 11:50:40 +03:00
VakarisZ 36e0309409 Fixed a race condition for linux secure directory creation, by setting dir permissions on creation. 2021-06-10 11:44:50 +03:00
VakarisZ 15a8a4d1c6
Update docs/content/setup/windows.md 
Co-authored-by: Shreya Malviya <shreya.malviya@gmail.com>
 2021-06-10 10:17:22 +03:00
VakarisZ 824a7595bb Added a support section for windows.md, stating that only English system locale is supported. 2021-06-10 09:29:07 +03:00
Mike Salvatore 2fc726dc78 island: Add missing "f" to format string 2021-06-09 15:11:52 -04:00
Mike Salvatore 1c5daf168c Merge branch 'custom-certificate' into develop 2021-06-09 15:10:14 -04:00
Mike Salvatore 6aa76497ec island: Use config file in ~/.monkey_island if it exists 2021-06-09 14:48:59 -04:00
Mike Salvatore 9131f86215 island: remove misleading comment 
We don't check admin permissions at all, and admin is included in
"everyone else".
 2021-06-09 14:20:58 -04:00
Mike Salvatore 67d4f18d65 tests: Refactor create_empty_file() -> create_empty_tmp_file() 2021-06-09 14:14:44 -04:00
Mike Salvatore cf5b1378f2 island: Consolidate duplicate code in test_island_config_options_validator 2021-06-09 14:06:54 -04:00
Mike Salvatore 7fe10af1b2 island: Pass int, not str to has_expected_permissions() 2021-06-09 13:55:48 -04:00
shreyamalviya 5aaa844289 Add missing constant in config_setup.py 2021-06-09 22:00:44 +05:30
shreyamalviya 91a7c42a85 Format test_island_config_options_validator.py with black 2021-06-09 21:56:44 +05:30
shreyamalviya 8a321f0290 Add Windows tests for island_config_options_validator.py 2021-06-09 21:52:07 +05:30
Mike Salvatore 7c49934270
Merge pull request #1213 from guardicore/win-set-perms-tests 
Add unit tests for windows directory permission setting
 2021-06-09 12:00:57 -04:00
Mike Salvatore b98ebc8a69 island: Remove tmpdir cleanup code from test_utils.py 
Pytest automatically cleans up tmpdir fixtures older than 3 runs. See
https://docs.pytest.org/en/6.2.x/tmpdir.html#the-default-base-temporary-directory

Windows10 and Linux will automatically clean their temp directories.
 2021-06-09 10:36:37 -04:00
Mike Salvatore 00b37ca6a5 island: Test windows permissions set by create_secure_directory() 2021-06-09 10:32:42 -04:00
shreyamalviya 91aad66e16 Modify log message when checking file permissions 
Removed code to display it in octal since it makes no sense on Windows.
Added `oct()` around linux permissions when expected_permissions is
being defined.
 2021-06-09 19:51:20 +05:30