p59342861
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,437 Commits 30 Branches 0 Tags 47 MiB
Commit Graph

6437 Commits

Author SHA1 Message Date
Mike Salvatore 6b0a689adb Docker: Fix `git rev-parse` command 
Add -C to git command in order
to execute rev-parse outside the repo.
 2021-10-21 16:52:13 +02:00
VakarisZ eedf4484bc Deployments: fix the extraction of commit number in docker.sh 2021-10-21 16:52:13 +02:00
VakarisZ 46ef9df1d2 Deployments: change the default monkey_version to "" 
If the version is none (default) the commit number will be used which is preferred in dev environment
 2021-10-21 16:52:13 +02:00
VakarisZ 25df96da63 Deployments: Rename docker deployment only if a version is not specified 
With this change, Jenkins will output docker packages in the following naming conventions:

Develop: InfectionMonkey-docker-$commit_number.tgz

Release: InfectionMonkey-docker-v$version.tgz
 2021-10-21 16:52:13 +02:00
VakarisZ 226c72df5f Deployments: Rename appImage deployment only if a specific version is not specified 
With this change, Jenkins will output packages in the following naming conventions:

Develop: InfectionMonkey-$commit_number_x86_64.AppImage

Release: InfectionMonkey-v$version.AppImage
 2021-10-21 16:52:13 +02:00
VakarisZ 65f7fd0131 Deployments: change the outputs of appimage build and docker build to conform to the naming convention of InfectionMonkey-v*.* 
AppImages are built into InfectionMonkey-v1.11.0.AppImage

Docker is build into InfectionMonkey-docker-v1.11.0.tgz
 2021-10-21 16:52:13 +02:00
Mike Salvatore 3a907c3cae Build: Link to setup instructions from Docker README.md 2021-10-21 09:22:57 -04:00
Mike Salvatore e5b130296e
Merge pull request #1541 from guardicore/1530-docs-use-backup-data-dir 
Documentation updates for data directory deletion/backup on installing a new version
 2021-10-21 08:54:51 -04:00
Mike Salvatore a43c1b0a18 Docs: Add delete data directory tip to Linux and Windows setup 2021-10-21 08:53:46 -04:00
Mike Salvatore be04384efe Docs: Add instructions to configure data_dir on Linux 2021-10-21 08:53:46 -04:00
Shreya Malviya 8b93b45545 Docs: Add FAQ for data dir deletion and backup on installing new version 2021-10-21 08:53:44 -04:00
Shreya Malviya f0f2f02b96 Changelog: Fix issue number in entry for browser window popup fix 2021-10-21 15:03:20 +05:30
VakarisZ 19cce1fb8b
Merge pull request #1539 from guardicore/1432-disable-browser-prompt-windows 
1428 disable browser prompt windows
 2021-10-21 10:07:20 +03:00
Mike Salvatore 1488ca96d9
Merge pull request #1530 from guardicore/version_file_in_data_dir 
Version file in data dir
 2021-10-20 13:54:45 -04:00
VakarisZ 39047a3a90 Island: Remove the browser popup on the island launch in production 
These changes alter the run_server.bat to not throw a browser pop-up.
These changes are needed to focus users attention to the command prompt.
We plan to add interactivity to the prompt

Fixes #1432
 2021-10-20 13:52:02 -04:00
Mike Salvatore f17183a76a Island: Replace joinpath() with / 2021-10-20 13:48:19 -04:00
Mike Salvatore 9b005255f1 Changelog: Update changelog for issue #1114 2021-10-20 13:30:11 -04:00
Shreya Malviya d048f4e4ce Island: Move data directory deletion prompt to data_dir.py 2021-10-20 20:48:16 +05:30
Shreya Malviya b4c48e7cfb island: Remove unneeded functions in monkey_island/cc/setup/data_dir.py 2021-10-20 20:48:16 +05:30
Shreya Malviya 4ec53cb1d1 island: Extract old data dir manipulation to a separate function 2021-10-20 20:48:16 +05:30
Shreya Malviya dd480d1703 island: Prompt user for old data dir's deletion during Island setup if old data dir's and Island's versions mismatch 2021-10-20 20:48:16 +05:30
Mike Salvatore 6a363c1fc3
Merge pull request #1531 from guardicore/1486/powershell-multi-hop 
1486/powershell multi hop
 2021-10-19 10:20:42 -04:00
Mike Salvatore 8d7a5a410c BB: Remove ".\\m0nk3y" user from Powershell user list 
This user was added to work around issue #1486. Since d4a1c2bda resolves
that issue, this user can be removed from the config for this test.
 2021-10-19 08:23:07 -04:00
Mike Salvatore 701d589c77 Agent: Include domain with usernames in PowerShell exploiter 
Fixes #1486
 2021-10-19 08:23:06 -04:00
VakarisZ 27d04e4de6 Monkey: simplify version comparison to string comparison instead of using a package to parse the version 2021-10-19 10:45:44 +03:00
VakarisZ c23a0721c5 CHANGELOG.md entry about data dir backup based on version file 2021-10-18 12:26:21 +03:00
VakarisZ 988bdf0471 Island: check if version from version file is the same as in island instead of checking if it's lower 
This change enables to clean the directory if an older version of monkey island is installed after removing the new one
 2021-10-18 12:26:03 +03:00
VakarisZ b0e96822dd Island: split up _reset_data_dir method into _backup_current_data_dir and _is_backup_needed in data_dir.py 
Change makes the code more readable because the functions have better names and the logic of finding out if the back up is needed / doing the actual back up is separated
 2021-10-18 12:26:03 +03:00
VakarisZ c9335f90a4 Island UT's: rename methods that return directories from "mocked_..." notation to "temp_..." notation in test_data_dir.py 2021-10-18 12:26:03 +03:00
VakarisZ 93adbae2bf Island: change some less important log messages to debug level, log data directory path in data_dir.py 2021-10-18 12:26:03 +03:00
VakarisZ 0efcffbe54 Monkey island: instead of deleting the backup of data_dir, rename it to data_dir.old. If it already exists, delete it prior to renaming 
This change saves the users data in case version update destroyed some progress. We don't care about removing old backups because user is unlikely to do two updates at once
 2021-10-18 12:26:03 +03:00
VakarisZ 15949a9ed5 Monkey island: change the methods in data_dir.py and version_file_setup.py to handle Path rather than str. 2021-10-18 12:26:03 +03:00
VakarisZ e77ed9769b Island: expand data directory setup process with workflow that drops a version file or cleans the directory if it's outdated 
Version file is needed in the data directory to know if data directory is from an earlier version
 2021-10-18 12:26:03 +03:00
VakarisZ 9dad253fcc Island: create data_dir.py where data dir setup logic will be held 2021-10-18 12:26:03 +03:00
Ilija Lazoroski 6787cce1d0 Zoo: Change API registration parameter 2021-10-14 14:52:13 +02:00
Mike Salvatore 997ad1ee4b
Merge pull request #1526 from guardicore/1392/telemetry-filter-fix 
UI: Fix telemetry filter
 2021-10-14 08:32:03 -04:00
Mike Salvatore 3133ee3217
Merge pull request #1525 from guardicore/fix-t1075-reporting 
Modify ATT&CK report messages for unscanned techniques
 2021-10-14 08:30:33 -04:00
Ilija Lazoroski 99c0288886 UI: Refactor Telemetry page 2021-10-14 14:03:17 +02:00
Mike Salvatore 9215ed32ad Travis: Download latest swimm from github 2021-10-14 07:51:33 -04:00
Mike Salvatore 81779cdfa1
Merge pull request #1529 from guardicore/1523/docs-update-password-reset 
Docs: update password reset
 2021-10-14 07:23:18 -04:00
Mike Salvatore 6b672fb451 Docs: Reword password reset instructions 
* Write instuctions for Docker
* Add a note to try deleting the entire data_directory
 2021-10-14 07:21:47 -04:00
Shreya Malviya ae6ebcf3c7 tests: Modify unit test for reverse schema generation 2021-10-14 14:22:20 +05:30
Shreya Malviya faa4c18cab island: Create class for reverse schema generation to avoid output arguments 2021-10-14 14:22:20 +05:30
Shreya Malviya 74095b6fc6 island: Modify logic for reverse schema generation recursion 2021-10-14 14:22:20 +05:30
Shreya Malviya b6923edbe9 tests: Modify technique reports' tests 2021-10-14 14:22:20 +05:30
Shreya Malviya f7f2e69152 tests: Modify tests to test reverse schema generation with multiple levels of nesting 2021-10-14 14:22:19 +05:30
Shreya Malviya ffd8f4edfe island: Check related attack techniques recursively when generating reverse schema so it doesn't break when another level of nesting is added 2021-10-14 14:22:19 +05:30
Shreya Malviya 08e57f3824 island: Use '.get()' when accessing value in dictionary during reverse schema generation 2021-10-14 14:22:19 +05:30
Shreya Malviya b24b8439c5 island: Change 'tab' to 'category' in reverse schema generation 2021-10-14 14:22:19 +05:30
Shreya Malviya 55fcfa9813 island: Move code for generating reverse schema into functions for better readibility 2021-10-14 14:22:19 +05:30