Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-23 05:03:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add nil check for sshd config file (#2217)

Browse source 
* Add nil check for sshd config file

This fixes #1778. There was a issue where if the user did not have read
permissions on /etc/ssh/sshd_config it would error out on the empty?
check. The fix here is to also look for nil on the file content. Along
with this I refactored the inspec file empty? check as it does not exist
and was also erroring during my testing.

Signed-off-by: Jared Quick <jquick@chef.io>

* Add emptyfile test object and refactor tests

Signed-off-by: Jared Quick <jquick@chef.io>
This commit is contained in:
Jared Quick 2017-10-06 09:41:48 -04:00 committed by Christoph Hartmann
parent 3d04127385
commit 7bb7767dae
4 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/resources/ssh_conf.rb
View file

@ -63,7 +63,7 @@ module Inspec::Resources
end
@content = file.content
if @content.empty? && !file.empty?
if @content.nil? || (@content.empty? && !file.size.zero?)
return skip_resource "Can't read file \"#{@conf_path}\""
end

5
test/helper.rb
View file

@ -104,11 +104,16 @@ class MockLoader
end
md
}
emptyfile = lambda {
mockfile.call('emptyfile')
}
mock.files = {
'/proc/net/bonding/bond0' => mockfile.call('bond0'),
'/etc/ssh/ssh_config' => mockfile.call('ssh_config'),
'/etc/ssh/sshd_config' => mockfile.call('sshd_config'),
'/etc/ssh/sshd_config_does_not_exist' => mockfile.call('sshd_config_does_not_exist'),
'/etc/ssh/sshd_config_empty' => emptyfile.call,
'/etc/passwd' => mockfile.call('passwd'),
'/etc/shadow' => mockfile.call('shadow'),
'/etc/ntp.conf' => mockfile.call('ntp.conf'),

0
test/unit/mock/files/emptyfile Normal file
View file

13
test/unit/resources/ssh_conf_test.rb
View file

@ -35,5 +35,18 @@ describe 'Inspec::Resources::SshConf' do
'/etc/ssh/ssh_host_ecdsa_key',
]
end
it 'check bad path' do
resource = load_resource('sshd_config', '/etc/ssh/sshd_config_does_not_exist')
_(resource.send(:read_content)).must_equal "Can't find file \"/etc/ssh/sshd_config_does_not_exist\""
_(resource.Protocol).must_be_nil
end
it 'check cannot read' do
Inspec::Resources::FileResource.any_instance.stubs(:size).at_least_once.returns(5)
resource = load_resource('sshd_config', '/etc/ssh/sshd_config_empty')
_(resource.send(:read_content)).must_equal "Can't read file \"/etc/ssh/sshd_config_empty\""
_(resource.Protocol).must_be_nil
end
end
end