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

iptables resource: Add support for other bin paths (#2783)

Browse source 
* iptables resource: Add support for other bin paths
* Use `%w{}` instead of `[]`

Signed-off-by: Jerry Aldrich <jerryaldrichiii@gmail.com>
This commit is contained in:
Jerry Aldrich 2018-03-06 03:56:15 -10:00 committed by Jared Quick
parent 0853e12cc3
commit e4e907624a
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/resources/iptables.rb
View file

@ -52,8 +52,9 @@ module Inspec::Resources
return @iptables_cache if defined?(@iptables_cache)
# construct iptables command to read all rules
bin = find_iptables_or_error
table_cmd = "-t #{@table}" if @table
iptables_cmd = format('iptables %s -S %s', table_cmd, @chain).strip
iptables_cmd = format('%s %s -S %s', bin, table_cmd, @chain).strip
cmd = inspec.command(iptables_cmd)
return [] if cmd.exit_status.to_i != 0
@ -65,5 +66,15 @@ module Inspec::Resources
def to_s
format('Iptables %s %s', @table && "table: #{@table}", @chain && "chain: #{@chain}").strip
end
private
def find_iptables_or_error
%w{/usr/sbin/iptables /sbin/iptables iptables}.each do |cmd|
return cmd if inspec.command(cmd).exist?
end
raise Inspec::Exceptions::ResourceFailed, 'Could not find `iptables`'
end
end
end

3
test/helper.rb
View file

@ -339,7 +339,8 @@ class MockLoader
# apt
"find /etc/apt/ -name *.list -exec sh -c 'cat {} || echo -n' \\;" => cmd.call('etc-apt'),
# iptables
'iptables -S' => cmd.call('iptables-s'),
'/usr/sbin/iptables -S' => cmd.call('iptables-s'),
%{bash -c 'type "/usr/sbin/iptables"'} => empty.call,
# apache_conf
"sh -c 'find /etc/apache2/ports.conf -type f -maxdepth 1'" => cmd.call('find-apache2-ports-conf'),
"sh -c 'find /etc/httpd/conf.d/*.conf -type f -maxdepth 1'" => cmd.call('find-httpd-ssl-conf'),