Skip to content

Use inspec.input to load the attribute #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chris-rock merged 3 commits into from
May 20, 2020
Merged

Use inspec.input to load the attribute #168

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78f35b3
Use inspec.input to load the attribute
micheelengronne May 19, 2020
e1769c5
valid hostkeys directly in the sshd_spec.rb
micheelengronne May 20, 2020
472f522
code in control
micheelengronne May 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/ssh_crypto.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def valid_algorithms # rubocop:disable Metrics/CyclomaticComplexity

# 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" }
Copy link
Member

@chris-rock chris-rock May 20, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

control 'sshd-14' do
impact 1.0
title 'Server: Specify SSH HostKeys'
desc 'Specify HostKey for protection against Man-In-The-Middle Attacks'
describe sshd_config(sshd_custom_path + '/sshd_config') do
its('HostKey') { should cmp ssh_crypto.valid_hostkeys }
end
end

It will also be easier for the reader of the control to understand what the control is actually doing

# its('HostKey') provides a string for a single-element value.
# we have to return a string if we have a single-element
# https://github.com/chef/inspec/issues/1434
Expand Down