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

Fix gid filtering for etc_group resource (#2297)

Browse source 
'etc_group' resource stores 'gid' as integer but the 'where' method
compares 'gid' as string.
By this fix, the 'where' method always converts the stored data to string
when comparing. And it can also look for groups without members.

Signed-off-by: ERAMOTO Masaya <eramoto.masaya@jp.fujitsu.com>
This commit is contained in:
eramoto 2017-11-14 13:03:50 +09:00 committed by Dominik Richter
parent 99f1631d9e
commit f9ee7596f5
2 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/resources/etc_group.rb
View file

@ -85,7 +85,7 @@ module Inspec::Resources
conditions.each do |k, v|
idx = fields[k.to_sym]
next if idx.nil?
res = res.select { |x| x[idx] == v.to_s }
res = res.select { |x| x[idx].to_s == v.to_s }
end
EtcGroupView.new(self, res)

35
test/unit/resources/etc_group_test.rb
View file

@ -34,4 +34,39 @@ describe 'Inspec::Resources::EtcGroup' do
_(wrong_filter.groups).must_equal []
_(wrong_filter.users).must_equal []
end
it 'verify group filter with gid' do
www_filter = resource.where(gid: 33)
_(www_filter.gids).must_equal [33]
_(www_filter.groups).must_equal ['www-data']
_(www_filter.users).must_equal ['www-data', 'root']
end
it 'verify group filter with wrong gid' do
www_filter = resource.where(group_id: 60)
_(www_filter.gids).must_equal []
_(www_filter.groups).must_equal []
_(www_filter.users).must_equal []
end
it 'verify group filter with group members' do
www_filter = resource.where(users: 'www-data,root')
_(www_filter.gids).must_equal [33]
_(www_filter.groups).must_equal ['www-data']
_(www_filter.users).must_equal ['www-data', 'root']
end
it 'verify group filter with no group members' do
www_filter = resource.where(members: '')
_(www_filter.gids).must_equal [0, 999]
_(www_filter.groups).must_equal ['root', 'GroupWithCaps']
_(www_filter.users).must_equal []
end
it 'verify group filter with wrong member' do
wrong_filter = resource.where(users: 'wrong_member')
_(wrong_filter.gids).must_equal []
_(wrong_filter.groups).must_equal []
_(wrong_filter.users).must_equal []
end
end