diff options
| author | John Keiser <jkeiser@opscode.com> | 2014-08-21 07:45:19 -0700 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2014-08-22 09:20:50 -0700 |
| commit | c29e097ec938641bc2177387dabf28a99ded59b7 (patch) | |
| tree | 0ae16b2f9bac0841e40ffc0eaff607da024a6ea4 | |
| parent | 3372e864b4d705a4bbca3e52e7edea4656dd89ba (diff) | |
| download | chef-zero-c29e097ec938641bc2177387dabf28a99ded59b7.tar.gz | |
Validator clients don't own clients
| -rw-r--r-- | lib/chef_zero/chef_data/default_creator.rb | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/lib/chef_zero/chef_data/default_creator.rb b/lib/chef_zero/chef_data/default_creator.rb index 0c82bf3..667268b 100644 --- a/lib/chef_zero/chef_data/default_creator.rb +++ b/lib/chef_zero/chef_data/default_creator.rb @@ -336,14 +336,28 @@ module ChefZero path = AclPath.get_object_path(acl_path) if path - # Non-validator clients own themselves, instead of the creator owning them. + # Non-validator clients own themselves. if path.size == 4 && path[0] == 'organizations' && path[2] == 'clients' - client = JSON.parse(data.get(path), :create_additions => false) - if client['validator'] - owners |= @creators[path] if @creators[path] - else + begin + client = JSON.parse(data.get(path), :create_additions => false) + if !client['validator'] + owners |= [ path[3] ] + end + rescue owners |= [ path[3] ] end + + # Add creators as owners (except any validator clients). + if @creators[path] + @creators[path].each do |creator| + begin + client = JSON.parse(data.get(path[0..2] + [ creator ]), :create_additions => false) + next if client['validator'] + rescue + end + owners |= [ creator ] + end + end else owners |= @creators[path] if @creators[path] end |