Self-signed SSL certificate#1208
Merged
Merged
Conversation
mssalvatore
requested changes
Jun 4, 2021
…y/monkey_island/cc/setup/certificate_setup.py
Codecov Report
@@ Coverage Diff @@
## develop #1208 +/- ##
===========================================
+ Coverage 28.72% 28.91% +0.19%
===========================================
Files 428 430 +2
Lines 12959 13001 +42
===========================================
+ Hits 3722 3759 +37
- Misses 9237 9242 +5
Continue to review full report at Codecov.
|
The file is named "test_island_config_options.py". Including "island_config_options" in every test/function name is reduntant.
_expand_path() is a utility function used by IslandConfigOptions. It doesn't need to be part of the class. It can potentially be reused by other modules that require the same functionality.
shreyamalviya
force-pushed
the
custom-certificate
branch
from
3841dd7 to
2e3a22d
Compare
mssalvatore
force-pushed
the
custom-certificate
branch
from
94dca1e to
dc8e2b0
Compare
shreyamalviya
commented
Jun 9, 2021
| return False | ||
| elif sid == admins_sid: | ||
| continue | ||
| # TODO: consider removing; so many system accounts/groups exist, it's likely to fail |
Contributor
Author
There was a problem hiding this comment.
If we can know if the ACE is of a built-in account/group, skip those and check others.
mssalvatore
requested changes
Jun 9, 2021
Comment on lines
+25
to
+26
| # checks that admin has any permissions, user has `expected_permissions`, | ||
| # and everyone else has no permissions |
Collaborator
There was a problem hiding this comment.
checks that admin has any permissions
I think this comment is misleading. If I'm reading the code correctly, we don't check the admin permissions at all, we just skip/ignore them. We can probably nix this comment.
|
|
||
| def raise_on_invalid_options(options: IslandConfigOptions): | ||
| _raise_if_not_isfile(options.crt_path) | ||
| _raise_if_incorrect_permissions(options.crt_path, 0o400, 1179817) |
Collaborator
There was a problem hiding this comment.
Lets use constants instead of magic numbers.
Comment on lines
+25
to
+27
| expected_permissions = ( | ||
| windows_expected_permissions if is_windows_os() else linux_expected_permissions | ||
| ) |
Collaborator
There was a problem hiding this comment.
Need unit tests for this.
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.
mssalvatore
reviewed
Jun 9, 2021
We don't check admin permissions at all, and admin is included in "everyone else".
mssalvatore
approved these changes
Jun 9, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #1145
PR Checklist
Testing Checklist
Explain Changes
Are the commit messages enough? If not, elaborate.