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

api: specinfra reports nil on non-existent files

Browse source 
Check the responses and make sure we dont blindly return eg: size=0 or group="" or user="" for files that dont exist.

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
This commit is contained in:
Dominik Richter 2015-09-15 14:52:27 +02:00
parent ffcd12ba97
commit ef9b299319
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/vulcano/backend/specinfra.rb
View file

@ -223,15 +223,18 @@ module Vulcano::Backends
end
def mode
Specinfra::Runner.get_file_mode(@path).stdout.to_i(8)
m = Specinfra::Runner.get_file_mode(@path).stdout.strip
m.empty? ? nil : m.to_i(8)
end
def owner
Specinfra::Runner.get_file_owner_user(@path).stdout.strip
o = Specinfra::Runner.get_file_owner_user(@path).stdout.strip
o.empty? ? nil : o
end
def group
Specinfra::Runner.get_file_owner_group(@path).stdout.strip
g = Specinfra::Runner.get_file_owner_group(@path).stdout.strip
g.empty? ? nil : g
end
def link_path
@ -242,7 +245,7 @@ module Vulcano::Backends
def content
s = Specinfra::Runner.get_file_content(@path).stdout.strip
if s.empty? && (size > 0 or block_device?)
if s.empty? && (size.nil? or size > 0 or block_device?)
nil
else
s
@ -261,12 +264,13 @@ module Vulcano::Backends
def mtime
mt = Specinfra::Runner.get_file_mtime(@path).stdout.strip
return -1 if mt.empty?
return nil if mt.empty?
mt.to_i
end
def size
Specinfra::Runner.get_file_size(@path).stdout.strip.to_i
s = Specinfra::Runner.get_file_size(@path).stdout.strip
s.empty? ? nil : s.to_i
end
def selinux_label