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

Merge pull request #196 from chef/improvement-file

Browse source 
Merged change 3946fe59-5e88-4d93-ba41-500e67a6fce5

From review branch improvement-file into master

Signed-off-by: drichter <drichter@chef.io>
This commit is contained in:
chef-delivery 2015-11-02 15:21:53 -08:00
commit 86f37395d6
1 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lib/resources/file.rb
View file

@ -30,38 +30,50 @@ module Inspec::Resources
end
def readable?(by_owner, by_user)
by_owner, by_user = check_preconditions(by_owner, by_user)
if inspec.os.unix?
by_owner, by_user = check_preconditions(by_owner, by_user)
if by_user.nil?
m = @file.unix_mode_mask(by_owner, 'r') ||
fail("#{by_owner} is not a valid unix owner.")
(@file.mode & m) != 0
if by_user.nil?
m = @file.unix_mode_mask(by_owner, 'r') ||
fail("#{by_owner} is not a valid unix owner.")
(@file.mode & m) != 0
else
check_user_access(by_user, @path, 'r')
end
else
check_user_access(by_user, @path, 'r')
fail "`file(#{@path}).executable?` is not suported on you OS: #{inspec.os['family']}"
end
end
def writable?(by_owner, by_user)
by_owner, by_user = check_preconditions(by_owner, by_user)
if inspec.os.unix?
by_owner, by_user = check_preconditions(by_owner, by_user)
if by_user.nil?
m = @file.unix_mode_mask(by_owner, 'w') ||
fail("#{by_owner} is not a valid unix owner.")
(@file.mode & m) != 0
if by_user.nil?
m = @file.unix_mode_mask(by_owner, 'w') ||
fail("#{by_owner} is not a valid unix owner.")
(@file.mode & m) != 0
else
check_user_access(by_user, @path, 'w')
end
else
check_user_access(by_user, @path, 'w')
fail "`file(#{@path}).executable?` is not suported on you OS: #{inspec.os['family']}"
end
end
def executable?(by_owner, by_user)
by_owner, by_user = check_preconditions(by_owner, by_user)
if inspec.os.unix?
by_owner, by_user = check_preconditions(by_owner, by_user)
if by_user.nil?
m = @file.unix_mode_mask(by_owner, 'x') ||
fail("#{by_owner} is not a valid unix owner.")
(@file.mode & m) != 0
if by_user.nil?
m = @file.unix_mode_mask(by_owner, 'x') ||
fail("#{by_owner} is not a valid unix owner.")
return (@file.mode & m) != 0
else
return check_user_access(by_user, @path, 'x')
end
else
check_user_access(by_user, @path, 'x')
fail "`file(#{@path}).executable?` is not suported on you OS: #{inspec.os['family']}"
end
end