This repository has been archived by the owner on Sep 16, 2022. It is now read-only.
OpenSSH audit: range tests. #288
Merged
Conversation
This file contains 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
a-martynovich
force-pushed
the
277-cis-openssh
branch
2 times, most recently
from
a661d24 to
e53e2c6
Compare
rptrchv
suggested changes
Mar 26, 2020
agent/security_helper.py
Outdated
| self._safe = safe | ||
| self.is_safe = {self.COMPARE.MATCH: self.match, | ||
| self.COMPARE.RANGE: self.range}[compare] | ||
| self._safe_value = (safe if compare == self.COMPARE.MATCH else str(self._safe[1])) |
| 'openssh-agent-forwarding': | ||
| ('OpenSSH: Disable agent forwarding', 'AllowAgentForwarding'), | ||
| 'openssh-protocol': | ||
| ('\tOpenSSH: Force protocol version 2', 'Protocol'), |
There was a problem hiding this comment.
What's the purpose of this '\t' here?
There was a problem hiding this comment.
To align the output in the console. Otherwise it's hard to read.
agent/security_helper.py
Outdated
| def __init__(self, default, safe, compare=COMPARE.MATCH): | ||
| self.default = default | ||
| self._safe = safe | ||
| self.is_safe = {self.COMPARE.MATCH: self.match, |
agent/security_helper.py
Outdated
| @@ -362,7 +395,7 @@ def patch_sshd_config(patch_param): | |||
| logger.exception('sshd or service executable not found') | |||
| return | |||
|
|
|||
| safe_value_string = '\n# Added by wott-agent on {}\n{} {}\n'.format(time.ctime(), patch_param, safe_value) | |||
| safe_value_string = '\n# Added by wott-agent on {}\n{} {}\n'.format(time.ctime(), patch_param, param_info.safe_value) | |||
agent/security_helper.py
Outdated
| if not replaced and not safe and default_value != safe_value: | ||
| logger.info('{}: replacing default "{}" with "{}"'.format(patch_param, default_value, safe_value)) | ||
| if not replaced and not safe and not param_info.is_safe(param_info.default): | ||
| logger.info('{}: replacing default "{}" with "{}"'.format(patch_param, param_info.default, param_info.safe_value)) |
a-martynovich
force-pushed
the
277-cis-openssh
branch
2 times, most recently
from
19b8a45 to
08cc181
Compare
a-martynovich
force-pushed
the
277-cis-openssh
branch
from
08cc181 to
392caf3
Compare
rptrchv
suggested changes
Apr 2, 2020
a-martynovich
force-pushed
the
277-cis-openssh
branch
from
392caf3 to
e5b3e0e
Compare
|
Kudos, SonarCloud Quality Gate passed!
|
|
I'm doing this to silence Codacy warnings. It says i should always use %-formatting for logging. It is a valid point, though |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
#277