summaryrefslogtreecommitdiff
path: root/lib/chef_zero/chef_data
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2014-08-21 12:37:22 -0700
committerJohn Keiser <jkeiser@opscode.com>2014-08-22 09:20:50 -0700
commita4efe10a02590f9caa21544504a2b1d6f5ffb295 (patch)
tree52bc642cc69f0f29a804bdbc00cd5d0016e78da5 /lib/chef_zero/chef_data
parent57203ee3aabee96aaa5ba6437e4d6b373793d897 (diff)
downloadchef-zero-a4efe10a02590f9caa21544504a2b1d6f5ffb295.tar.gz
Make acls endpoints return 405 for disallowed methods
Diffstat (limited to 'lib/chef_zero/chef_data')
-rw-r--r--lib/chef_zero/chef_data/default_creator.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef_zero/chef_data/default_creator.rb b/lib/chef_zero/chef_data/default_creator.rb
index 667268b..f0403ab 100644
--- a/lib/chef_zero/chef_data/default_creator.rb
+++ b/lib/chef_zero/chef_data/default_creator.rb
@@ -244,8 +244,8 @@ module ChefZero
when "groups/users"
users = data.list(path[0..1] + [ 'users' ])
- users += @creators[path[0..1]] if @creators[path[0..1]]
- { 'users' => users.uniq }
+ users |= @creators[path[0..1]] if @creators[path[0..1]]
+ { 'users' => users }
when "org"
{}
@@ -362,7 +362,7 @@ module ChefZero
owners |= @creators[path] if @creators[path]
end
- owners += superusers
+ owners |= superusers
end
owners.uniq