Use inspec.input to load the attribute #168
Merged
Conversation
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
Signed-off-by: Michée Lengronne <[email protected]>
micheelengronne
force-pushed
the
micheelengronne-patch-2
branch
from
f5c1c19 to
78f35b3
Compare
chris-rock
reviewed
May 20, 2020
libraries/ssh_crypto.rb
Outdated
| # returns the hostkeys value based on valid_algorithms | ||
| def valid_hostkeys | ||
| hostkeys = valid_algorithms.map { |alg| "#{sshd_custom_path}/ssh_host_#{alg}_key" } | ||
| hostkeys = valid_algorithms.map { |alg| "#{inspec.input('sshd_custom_path')}/ssh_host_#{alg}_key" } |
Member
There was a problem hiding this comment.
Since only one test is affected we should probably move that logic directly to the control:
ssh-baseline/controls/sshd_spec.rb
Lines 183 to 190 in fef3eb4
It will also be easier for the reader of the control to understand what the control is actually doing
Signed-off-by: Michée Lengronne <[email protected]>
micheelengronne
force-pushed
the
micheelengronne-patch-2
branch
from
30d0a05 to
e1769c5
Compare
chris-rock
reviewed
May 20, 2020
controls/sshd_spec.rb
Outdated
| end | ||
|
|
||
| sshd_valid_hostkeys = ssh_crypto.valid_algorithms.map { |alg| "#{sshd_custom_path}/ssh_host_#{alg}_key" } | ||
| sshd_valid_hostkeys = sshd_valid_hostkeys[0] if sshd_valid_hostkeys.length == 1 |
Member
There was a problem hiding this comment.
I think that code should be part of the control similar to: https://github.com/dev-sec/linux-baseline/blob/master/controls/sysctl_spec.rb#L388-L411
Member
Author
There was a problem hiding this comment.
It is normally solved in the last commit.
Signed-off-by: Michée Lengronne <[email protected]>
chris-rock
approved these changes
May 20, 2020
Member
chris-rock
left a comment
chris-rock
left a comment
There was a problem hiding this comment.
Great fix. Thank you for the quick turn-around @micheelengronne
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.