chef-zero 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af78d3b28c39a909122160ebeb4abe7086ba495d
-  data.tar.gz: e151250b3435d68022ace2ea846f839e0bbeaddf
+  metadata.gz: 2b00232a363d25d0bd7a96ce90fe890da73e828c
+  data.tar.gz: 588b5fcd98c7df1f73df1a3c8e9b881bd992bfa1
 SHA512:
-  metadata.gz: 65df47af4dcf486c45c84285ba99ec247c15bdb5d4fa83d1b827d12831e29fa47e88bb02da82a78b129554fcde26a621dc2b4495ef87c1af4892d5594ddb8da3
-  data.tar.gz: 9ab659ccb4ad813a3a9cde3cdd3496ae448f97bd7129b0ef8c2a44c258078503e5980ca4b6954019344f57028a52133ef58697bcc8738abe26bc6a7b8cacff2b
+  metadata.gz: 9563e75f68e99b6d113778834468f4c5bd40a705fccfc6007432a0c390d9494d8669b245f12f04aae0d250d01551f27c67bc9c4c4075846076cd0835e5c8c45a
+  data.tar.gz: 6c669dac6b41d749bd5a99e515caf6cc95099925e890ceff4b98ade5a0b3db8e09dee999d54324789caafc9b88b6d67d509ca95753cb963ee01d065cee727d03

data/lib/chef_zero/chef_data/data_normalizer.rb

@@ -14,8 +14,8 @@ module ChefZero
             # is the final list of actors that a subsequent GET will
             # provide. Each list is guaranteed to be unique, but the
             # combined list is not.
-            acls[perm]["actors"] = acls[perm].delete("users").uniq +
-              acls[perm].delete("clients").uniq
+            acls[perm]["actors"] = acls[perm]["clients"].uniq +
+              acls[perm]["users"].uniq
           else
             # this gets doubled sometimes, for reasons.
             (acls[perm]["actors"] ||= []).uniq!

data/lib/chef_zero/chef_data/default_creator.rb

@@ -240,11 +240,11 @@ module ChefZero
 
           when "groups/admins"
             admins = data.list(path[0..1] + [ "users" ]).select do |name|
-              user = FFI_Yajl::Parser.parse(data.get(path[0..1] + [ "users", name ]), :create_additions => false)
+              user = FFI_Yajl::Parser.parse(data.get(path[0..1] + [ "users", name ]))
               user["admin"]
             end
             admins += data.list(path[0..1] + [ "clients" ]).select do |name|
-              client = FFI_Yajl::Parser.parse(data.get(path[0..1] + [ "clients", name ]), :create_additions => false)
+              client = FFI_Yajl::Parser.parse(data.get(path[0..1] + [ "clients", name ]))
               client["admin"]
             end
             admins += @creators[path[0..1]] if @creators[path[0..1]]
@@ -346,57 +346,83 @@ module ChefZero
       end
 
       def get_owners(acl_path)
-        owners = []
-
+        unknown_owners = []
         path = AclPath.get_object_path(acl_path)
         if path
 
           # Non-validator clients own themselves.
           if path.size == 4 && path[0] == "organizations" && path[2] == "clients"
             begin
-              client = FFI_Yajl::Parser.parse(data.get(path), :create_additions => false)
+              client = FFI_Yajl::Parser.parse(data.get(path))
               if !client["validator"]
-                owners |= [ path[3] ]
+                unknown_owners |= [ path[3] ]
               end
             rescue
-              owners |= [ path[3] ]
+              unknown_owners |= [ path[3] ]
             end
 
             # Add creators as owners (except any validator clients).
             if @creators[path]
               @creators[path].each do |creator|
                 begin
-                  client = FFI_Yajl::Parser.parse(data.get(path[0..2] + [ creator ]), :create_additions => false)
+                  client = FFI_Yajl::Parser.parse(data.get(path[0..2] + [ creator ]))
                   next if client["validator"]
                 rescue
                 end
-                owners |= [ creator ]
+                unknown_owners |= [ creator ]
               end
             end
           else
-            owners |= @creators[path] if @creators[path]
+            unknown_owners |= @creators[path] if @creators[path]
           end
+          owners = filter_owners(path, unknown_owners)
 
           #ANGRY
           # Non-default containers do not get superusers added to them,
           # because reasons.
           unless path.size == 4 && path[0] == "organizations" && path[2] == "containers" && !exists?(path)
-            owners += superusers
+            owners[:users] += superusers
           end
+        else
+          owners = { clients: [], users: [] }
         end
 
-        # we don't de-dup this list, because pedant expects to see ["pivotal", "pivotal"] in some cases.
+        owners[:users].uniq!
+        owners[:clients].uniq!
+        owners
+      end
+
+      # Figures out if an  object was created by a user or client.
+      # If the object does not exist in the context
+      # of an organization, it can only be a user
+      #
+      # This isn't perfect, because we are never explicitly told
+      # if a requestor creating an object is a user or client -
+      # but it gets us reasonably close
+      def filter_owners(path, unknown_owners)
+        owners = { clients: [], users: [] }
+        unknown_owners.each do |entity|
+          if path[0] == "organizations" && path.length > 2
+            begin
+              data.get(["organizations", path[1], "clients", entity])
+              owners[:clients] |= [ entity ]
+            rescue
+              owners[:users] |= [ entity ]
+            end
+          else
+            owners[:users] |= [ entity ]
+          end
+        end
         owners
       end
 
       def default_acl(acl_path, acl = {})
-        owners = nil
+        owners = get_owners(acl_path)
         container_acl = nil
         PERMISSIONS.each do |perm|
           acl[perm] ||= {}
-          acl[perm]["actors"] ||= begin
-            owners ||= get_owners(acl_path)
-          end
+          acl[perm]["users"] = owners[:users]
+          acl[perm]["clients"] = owners[:clients]
           acl[perm]["groups"] ||= begin
             # When we create containers, we don't merge groups (not sure why).
             if acl_path[0] == "organizations" && acl_path[3] == "containers"
@@ -406,6 +432,7 @@ module ChefZero
               (container_acl[perm] ? container_acl[perm]["groups"] : []) || []
             end
           end
+          acl[perm]["actors"] = acl[perm]["clients"] + acl[perm]["users"]
         end
         acl
       end
@@ -413,7 +440,7 @@ module ChefZero
       def get_container_acl(acl_path)
         parent_path = AclPath.parent_acl_data_path(acl_path)
         if parent_path
-          FFI_Yajl::Parser.parse(data.get(parent_path), :create_additions => false)
+          FFI_Yajl::Parser.parse(data.get(parent_path))
         else
           nil
         end

data/lib/chef_zero/endpoints/acl_endpoint.rb

@@ -28,8 +28,8 @@ module ChefZero
 
       def put(request)
         path, perm = validate_request(request)
-        acls = FFI_Yajl::Parser.parse(get_data(request, path), :create_additions => false)
-        acls[perm] = FFI_Yajl::Parser.parse(request.body, :create_additions => false)[perm]
+        acls = FFI_Yajl::Parser.parse(get_data(request, path))
+        acls[perm] = FFI_Yajl::Parser.parse(request.body)[perm]
         set_data(request, path, FFI_Yajl::Encoder.encode(acls, :pretty => true))
         json_response(200, { "uri" => "#{build_uri(request.base_uri, request.rest_path)}" })
       end

data/lib/chef_zero/endpoints/acls_endpoint.rb

@@ -20,8 +20,19 @@ module ChefZero
         if !acl_path
           raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
         end
-        acls = FFI_Yajl::Parser.parse(get_data(request, acl_path), :create_additions => false)
+        acls = FFI_Yajl::Parser.parse(get_data(request, acl_path))
         acls = ChefData::DataNormalizer.normalize_acls(acls)
+        if request.query_params["detail"] == "granular"
+          acls.each do |perm, ace|
+            acls[perm]["actors"] = []
+          end
+        else
+          acls.each do |perm, ace|
+            acls[perm].delete("clients")
+            acls[perm].delete("users")
+          end
+        end
+
         json_response(200, acls)
       end
     end

data/lib/chef_zero/endpoints/actor_endpoint.rb

@@ -36,7 +36,7 @@ module ChefZero
 
       def put(request)
         # Find out if we're updating the public key.
-        request_body = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        request_body = FFI_Yajl::Parser.parse(request.body)
 
         if request_body["public_key"].nil?
           # If public_key is null, then don't overwrite it.  Weird patchiness.

data/lib/chef_zero/endpoints/authenticate_user_endpoint.rb

@@ -6,7 +6,7 @@ module ChefZero
     # /authenticate_user
     class AuthenticateUserEndpoint < RestBase
       def post(request)
-        request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        request_json = FFI_Yajl::Parser.parse(request.body)
         name = request_json["username"]
         password = request_json["password"]
         begin
@@ -14,7 +14,7 @@ module ChefZero
         rescue ChefZero::DataStore::DataNotFoundError
           raise RestErrorResponse.new(401, "Bad username or password")
         end
-        user = FFI_Yajl::Parser.parse(user, :create_additions => false)
+        user = FFI_Yajl::Parser.parse(user)
         user = ChefData::DataNormalizer.normalize_user(user, name, [ "username" ], server.options[:osc_compat])
         if user["password"] != password
           raise RestErrorResponse.new(401, "Bad username or password")

data/lib/chef_zero/endpoints/container_endpoint.rb

@@ -13,7 +13,7 @@ module ChefZero
       undef_method(:put)
 
       def populate_defaults(request, response_json)
-        container = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        container = FFI_Yajl::Parser.parse(response_json)
         container = ChefData::DataNormalizer.normalize_container(container, request.rest_path[3])
         FFI_Yajl::Encoder.encode(container, :pretty => true)
       end

data/lib/chef_zero/endpoints/cookbook_endpoint.rb

@@ -19,7 +19,7 @@ module ChefZero
           result = []
           filter_cookbooks(all_cookbooks_list(request), {}, 1) do |name, versions|
             if versions.size > 0
-              cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]), :create_additions => false)
+              cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]))
               result += recipe_names(name, cookbook)
             end
           end

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -22,13 +22,13 @@ module ChefZero
 
         # Honor frozen
         if existing_cookbook
-          existing_cookbook_json = FFI_Yajl::Parser.parse(existing_cookbook, :create_additions => false)
+          existing_cookbook_json = FFI_Yajl::Parser.parse(existing_cookbook)
           if existing_cookbook_json["frozen?"]
             if request.query_params["force"] != "true"
               raise RestErrorResponse.new(409, "The cookbook #{name} at version #{version} is frozen. Use the 'force' option to override.")
             end
             # For some reason, you are forever unable to modify "frozen?" on a frozen cookbook.
-            request_body = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+            request_body = FFI_Yajl::Parser.parse(request.body)
             if !request_body["frozen?"]
               request_body["frozen?"] = true
               request.body = FFI_Yajl::Encoder.encode(request_body, :pretty => true)
@@ -71,7 +71,7 @@ module ChefZero
 
       def get_checksums(cookbook)
         result = []
-        FFI_Yajl::Parser.parse(cookbook, :create_additions => false).each_pair do |key, value|
+        FFI_Yajl::Parser.parse(cookbook).each_pair do |key, value|
           if value.is_a?(Array)
             value.each do |file|
               if file.is_a?(Hash) && file.has_key?("checksum")
@@ -118,7 +118,7 @@ module ChefZero
 
       def populate_defaults(request, response_json)
         # Inject URIs into each cookbook file
-        cookbook = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        cookbook = FFI_Yajl::Parser.parse(response_json)
         cookbook = ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1], cookbook, request.rest_path[3], request.rest_path[4], request.base_uri, request.method)
         FFI_Yajl::Encoder.encode(cookbook, :pretty => true)
       end

data/lib/chef_zero/endpoints/data_bag_endpoint.rb

@@ -12,7 +12,7 @@ module ChefZero
       end
 
       def post(request)
-        json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        json = FFI_Yajl::Parser.parse(request.body)
         key = identity_keys.map { |k| json[k] }.select { |v| v }.first
         response = super(request)
         if response[0] == 201
@@ -23,7 +23,7 @@ module ChefZero
       end
 
       def get_key(contents)
-        data_bag_item = FFI_Yajl::Parser.parse(contents, :create_additions => false)
+        data_bag_item = FFI_Yajl::Parser.parse(contents)
         if data_bag_item["json_class"] == "Chef::DataBagItem" && data_bag_item["raw_data"]
           data_bag_item["raw_data"]["id"]
         else

data/lib/chef_zero/endpoints/data_bag_item_endpoint.rb

@@ -16,7 +16,7 @@ module ChefZero
       end
 
       def self.populate_defaults(request, response_json, data_bag, data_bag_item)
-        response = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        response = FFI_Yajl::Parser.parse(response_json)
         response = ChefData::DataNormalizer.normalize_data_bag_item(response, data_bag, data_bag_item, request.method)
         FFI_Yajl::Encoder.encode(response, :pretty => true)
       end

data/lib/chef_zero/endpoints/data_bags_endpoint.rb

@@ -7,7 +7,7 @@ module ChefZero
     class DataBagsEndpoint < RestListEndpoint
       def post(request)
         contents = request.body
-        json = FFI_Yajl::Parser.parse(contents, :create_additions => false)
+        json = FFI_Yajl::Parser.parse(contents)
         name = identity_keys.map { |k| json[k] }.select { |v| v }.first
         if name.nil?
           error(400, "Must specify #{identity_keys.map { |k| k.inspect }.join(' or ')} in JSON")

data/lib/chef_zero/endpoints/environment_cookbook_endpoint.rb

@@ -7,7 +7,7 @@ module ChefZero
     class EnvironmentCookbookEndpoint < CookbooksBase
       def get(request)
         cookbook_name = request.rest_path[5]
-        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
+        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
         constraints = environment["cookbook_versions"] || {}
         cookbook_versions = list_data(request, request.rest_path[0..1] + request.rest_path[4..5])
         if request.query_params["num_versions"] == "all"

data/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb

@@ -12,7 +12,7 @@ module ChefZero
 
         # Get the list of cookbooks and versions desired by the runlist
         desired_versions = {}
-        run_list = FFI_Yajl::Parser.parse(request.body, :create_additions => false)["run_list"]
+        run_list = FFI_Yajl::Parser.parse(request.body)["run_list"]
         run_list.each do |run_list_entry|
           if run_list_entry =~ /(.+)::.+\@(.+)/ || run_list_entry =~ /(.+)\@(.+)/
             raise RestErrorResponse.new(412, "No such cookbook: #{$1}") if !cookbook_names.include?($1)
@@ -26,7 +26,7 @@ module ChefZero
         end
 
         # Filter by environment constraints
-        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
+        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
         environment_constraints = environment["cookbook_versions"] || {}
 
         desired_versions.each_key do |name|
@@ -48,7 +48,7 @@ module ChefZero
 
         result = {}
         solved.each_pair do |name, versions|
-          cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]), :create_additions => false)
+          cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]))
           result[name] = ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1], cookbook, name, versions[0], request.base_uri, "MIN")
         end
         json_response(200, result)
@@ -74,7 +74,7 @@ module ChefZero
           new_unsolved = unsolved[1..-1]
 
           # Pick this cookbook, and add dependencies
-          cookbook_obj = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", solve_for, desired_version]), :create_additions => false)
+          cookbook_obj = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", solve_for, desired_version]))
           cookbook_metadata = cookbook_obj["metadata"] || {}
           cookbook_dependencies = cookbook_metadata["dependencies"] || {}
           dep_not_found = false

data/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb

@@ -6,7 +6,7 @@ module ChefZero
     # /environments/NAME/cookbooks
     class EnvironmentCookbooksEndpoint < CookbooksBase
       def get(request)
-        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
+        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
         constraints = environment["cookbook_versions"] || {}
         if request.query_params["num_versions"] == "all"
           num_versions = nil

data/lib/chef_zero/endpoints/environment_endpoint.rb

@@ -24,7 +24,7 @@ module ChefZero
       end
 
       def populate_defaults(request, response_json)
-        response = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        response = FFI_Yajl::Parser.parse(response_json)
         response = ChefData::DataNormalizer.normalize_environment(response, request.rest_path[3])
         FFI_Yajl::Encoder.encode(response, :pretty => true)
       end

data/lib/chef_zero/endpoints/environment_nodes_endpoint.rb

@@ -11,7 +11,7 @@ module ChefZero
 
         result = {}
         list_data(request, request.rest_path[0..1] + ["nodes"]).each do |name|
-          node = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["nodes", name]), :create_additions => false)
+          node = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["nodes", name]))
           if node["chef_environment"] == request.rest_path[3]
             result[name] = build_uri(request.base_uri, request.rest_path[0..1] + ["nodes", name])
           end

data/lib/chef_zero/endpoints/environment_recipes_endpoint.rb

@@ -6,12 +6,12 @@ module ChefZero
     # /environment/NAME/recipes
     class EnvironmentRecipesEndpoint < CookbooksBase
       def get(request)
-        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
+        environment = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
         constraints = environment["cookbook_versions"] || {}
         result = []
         filter_cookbooks(all_cookbooks_list(request), constraints, 1) do |name, versions|
           if versions.size > 0
-            cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]), :create_additions => false)
+            cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]))
             result += recipe_names(name, cookbook)
           end
         end

data/lib/chef_zero/endpoints/environment_role_endpoint.rb

@@ -18,7 +18,7 @@ module ChefZero
         # Verify that the environment exists
         get_data(request, environment_path)
 
-        role = FFI_Yajl::Parser.parse(get_data(request, role_path), :create_additions => false)
+        role = FFI_Yajl::Parser.parse(get_data(request, role_path))
         environment_name = environment_path[3]
         if environment_name == "_default"
           run_list = role["run_list"]

data/lib/chef_zero/endpoints/group_endpoint.rb

@@ -11,7 +11,7 @@ module ChefZero
       end
 
       def populate_defaults(request, response_json)
-        group = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        group = FFI_Yajl::Parser.parse(response_json)
         group = ChefData::DataNormalizer.normalize_group(group, request.rest_path[3], request.rest_path[1])
         FFI_Yajl::Encoder.encode(group, :pretty => true)
       end

data/lib/chef_zero/endpoints/node_endpoint.rb

@@ -21,7 +21,7 @@ module ChefZero
       end
 
       def populate_defaults(request, response_json)
-        node = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        node = FFI_Yajl::Parser.parse(response_json)
         node = ChefData::DataNormalizer.normalize_node(node, request.rest_path[3])
         FFI_Yajl::Encoder.encode(node, :pretty => true)
       end

data/lib/chef_zero/endpoints/nodes_endpoint.rb

@@ -25,7 +25,7 @@ module ChefZero
       end
 
       def populate_defaults(request, response_json)
-        node = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        node = FFI_Yajl::Parser.parse(response_json)
         node = ChefData::DataNormalizer.normalize_node(node, request.rest_path[3])
         FFI_Yajl::Encoder.encode(node, :pretty => true)
       end

data/lib/chef_zero/endpoints/organization_association_request_endpoint.rb

@@ -13,7 +13,7 @@ module ChefZero
         end
         username = $1
         path = request.rest_path[0..-2] + [username]
-        data = FFI_Yajl::Parser.parse(get_data(request, path), :create_additions => false)
+        data = FFI_Yajl::Parser.parse(get_data(request, path))
         delete_data(request, path)
         json_response(200, { "id" => id, "username" => username })
       end

data/lib/chef_zero/endpoints/organization_association_requests_endpoint.rb

@@ -6,7 +6,7 @@ module ChefZero
     # /organizations/ORG/association_requests
     class OrganizationAssociationRequestsEndpoint < RestBase
       def post(request)
-        json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        json = FFI_Yajl::Parser.parse(request.body)
         username = json["user"]
         orgname = request.rest_path[1]
         id = "#{username}-#{orgname}"

data/lib/chef_zero/endpoints/organization_authenticate_user_endpoint.rb

@@ -6,12 +6,12 @@ module ChefZero
     # /organizations/NAME/authenticate_user
     class OrganizationAuthenticateUserEndpoint < RestBase
       def post(request)
-        request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        request_json = FFI_Yajl::Parser.parse(request.body)
         name = request_json["name"]
         password = request_json["password"]
         begin
           user = data_store.get(request.rest_path[0..-2] + ["users", name])
-          user = FFI_Yajl::Parser.parse(user, :create_additions => false)
+          user = FFI_Yajl::Parser.parse(user)
           verified = user["password"] == password
         rescue DataStore::DataNotFoundError
           verified = false

data/lib/chef_zero/endpoints/organization_endpoint.rb

@@ -11,8 +11,8 @@ module ChefZero
       end
 
       def put(request)
-        org = FFI_Yajl::Parser.parse(get_data(request, request.rest_path + [ "org" ]), :create_additions => false)
-        new_org = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        org = FFI_Yajl::Parser.parse(get_data(request, request.rest_path + [ "org" ]))
+        new_org = FFI_Yajl::Parser.parse(request.body)
         new_org.each do |key, value|
           org[key] = value
         end
@@ -37,7 +37,7 @@ module ChefZero
       end
 
       def populate_defaults(request, response_json)
-        org = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        org = FFI_Yajl::Parser.parse(response_json)
         org = ChefData::DataNormalizer.normalize_organization(org, request.rest_path[1])
         FFI_Yajl::Encoder.encode(org, :pretty => true)
       end

data/lib/chef_zero/endpoints/organization_user_endpoint.rb

@@ -9,14 +9,14 @@ module ChefZero
         username = request.rest_path[3]
         get_data(request) # 404 if user is not in org
         user = get_data(request, [ "users", username ])
-        user = FFI_Yajl::Parser.parse(user, :create_additions => false)
+        user = FFI_Yajl::Parser.parse(user)
         json_response(200, ChefData::DataNormalizer.normalize_user(user, username, ["username"], server.options[:osc_compat], request.method))
       end
 
       def delete(request)
         user = get_data(request)
         delete_data(request)
-        user = FFI_Yajl::Parser.parse(user, :create_additions => false)
+        user = FFI_Yajl::Parser.parse(user)
         json_response(200, ChefData::DataNormalizer.normalize_user(user, request.rest_path[3], ["username"], server.options[:osc_compat]))
       end
 

data/lib/chef_zero/endpoints/organization_users_endpoint.rb

@@ -8,7 +8,7 @@ module ChefZero
     class OrganizationUsersEndpoint < RestBase
       def post(request)
         orgname = request.rest_path[1]
-        json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        json = FFI_Yajl::Parser.parse(request.body)
         username = json["username"]
 
         if exists_data?(request, [ "organizations", orgname, "users", username ])
@@ -16,7 +16,7 @@ module ChefZero
         end
 
         users = get_data(request, [ "organizations", orgname, "groups", "users" ])
-        users = FFI_Yajl::Parser.parse(users, :create_additions => false)
+        users = FFI_Yajl::Parser.parse(users)
 
         create_data(request, request.rest_path, username, "{}")
 

data/lib/chef_zero/endpoints/organization_validator_key_endpoint.rb

@@ -9,7 +9,7 @@ module ChefZero
       def post(request)
         org_name = request.rest_path[-2]
         validator_path = [ "organizations", org_name, "clients", "#{org_name}-validator"]
-        validator = FFI_Yajl::Parser.parse(get_data(request, validator_path), :create_additions => false)
+        validator = FFI_Yajl::Parser.parse(get_data(request, validator_path))
         private_key, public_key = server.gen_key_pair
         validator["public_key"] = public_key
         set_data(request, validator_path, FFI_Yajl::Encoder.encode(validator, :pretty => true))

data/lib/chef_zero/endpoints/organizations_endpoint.rb

@@ -15,7 +15,7 @@ module ChefZero
       end
 
       def post(request)
-        contents = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        contents = FFI_Yajl::Parser.parse(request.body)
         name = contents["name"]
         full_name = contents["full_name"]
         if name.nil?

data/lib/chef_zero/endpoints/rest_list_endpoint.rb

@@ -34,7 +34,7 @@ module ChefZero
       end
 
       def get_key(contents)
-        json = FFI_Yajl::Parser.parse(contents, :create_additions => false)
+        json = FFI_Yajl::Parser.parse(contents)
         identity_keys.map { |k| json[k] }.select { |v| v }.first
       end
     end

data/lib/chef_zero/endpoints/rest_object_endpoint.rb

@@ -48,8 +48,8 @@ module ChefZero
       def patch_request_body(request)
         existing_value = get_data(request, nil, :nil)
         if existing_value
-          request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-          existing_json = FFI_Yajl::Parser.parse(existing_value, :create_additions => false)
+          request_json = FFI_Yajl::Parser.parse(request.body)
+          existing_json = FFI_Yajl::Parser.parse(existing_value)
           merged_json = existing_json.merge(request_json)
           if merged_json.size > request_json.size
             return FFI_Yajl::Encoder.encode(merged_json, :pretty => true)

data/lib/chef_zero/endpoints/role_endpoint.rb

@@ -7,7 +7,7 @@ module ChefZero
     # /roles/NAME
     class RoleEndpoint < RestObjectEndpoint
       def populate_defaults(request, response_json)
-        role = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        role = FFI_Yajl::Parser.parse(response_json)
         role = ChefData::DataNormalizer.normalize_role(role, request.rest_path[3])
         FFI_Yajl::Encoder.encode(role, :pretty => true)
       end

data/lib/chef_zero/endpoints/role_environments_endpoint.rb

@@ -6,7 +6,7 @@ module ChefZero
     # /roles/NAME/environments
     class RoleEnvironmentsEndpoint < RestBase
       def get(request)
-        role = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
+        role = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]))
         json_response(200, [ "_default" ] + (role["env_run_lists"].keys || []))
       end
     end

data/lib/chef_zero/endpoints/sandbox_endpoint.rb

@@ -7,7 +7,7 @@ module ChefZero
     # /sandboxes/ID
     class SandboxEndpoint < RestBase
       def put(request)
-        existing_sandbox = FFI_Yajl::Parser.parse(get_data(request), :create_additions => false)
+        existing_sandbox = FFI_Yajl::Parser.parse(get_data(request))
         existing_sandbox["checksums"].each do |checksum|
           if !exists_data?(request, request.rest_path[0..1] + ["file_store", "checksums", checksum])
             raise RestErrorResponse.new(503, "Checksum not uploaded: #{checksum}")

data/lib/chef_zero/endpoints/sandboxes_endpoint.rb

@@ -13,7 +13,7 @@ module ChefZero
       def post(request)
         sandbox_checksums = []
 
-        needed_checksums = FFI_Yajl::Parser.parse(request.body, :create_additions => false)["checksums"]
+        needed_checksums = FFI_Yajl::Parser.parse(request.body)["checksums"]
         result_checksums = {}
         needed_checksums.keys.each do |needed_checksum|
           if list_data(request, request.rest_path[0..1] + %w{file_store checksums}).include?(needed_checksum)

data/lib/chef_zero/endpoints/search_endpoint.rb

@@ -21,7 +21,7 @@ module ChefZero
       def post(request)
         orgname = request.rest_path[1]
         full_results = search(request, orgname)
-        keys = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        keys = FFI_Yajl::Parser.parse(request.body)
         partial_results = full_results["rows"].map do |name, uri, doc, search_value|
           data = {}
           keys.each_pair do |key, path|
@@ -124,7 +124,7 @@ module ChefZero
         result = []
         list_data(request, container).each do |name|
           value = get_data(request, container + [name])
-          expanded = expander.call(FFI_Yajl::Parser.parse(value, :create_additions => false), name)
+          expanded = expander.call(FFI_Yajl::Parser.parse(value), name)
           result << [ name, build_uri(request.base_uri, container + [name]), expanded, expand_for_indexing(expanded, index, name) ]
         end
         result = result.select do |name, uri, value, search_value|

data/lib/chef_zero/endpoints/system_recovery_endpoint.rb

@@ -6,7 +6,7 @@ module ChefZero
     # /system_recovery
     class SystemRecoveryEndpoint < RestBase
       def post(request)
-        request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        request_json = FFI_Yajl::Parser.parse(request.body)
         name = request_json["username"]
         password = request_json["password"]
         user = get_data(request, request.rest_path[0..-2] + ["users", name], :nil)
@@ -14,7 +14,7 @@ module ChefZero
           raise RestErrorResponse.new(403, "Nonexistent user")
         end
 
-        user = FFI_Yajl::Parser.parse(user, :create_additions => false)
+        user = FFI_Yajl::Parser.parse(user)
         user = ChefData::DataNormalizer.normalize_user(user, name, [ "username" ], server.options[:osc_compat])
         if !user["recovery_authentication_enabled"]
           raise RestErrorResponse.new(403, "Only users with recovery_authentication_enabled=true may use /system_recovery to log in")

data/lib/chef_zero/endpoints/user_association_request_endpoint.rb

@@ -13,11 +13,11 @@ module ChefZero
         end
         orgname = $1
 
-        json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        json = FFI_Yajl::Parser.parse(request.body)
         association_request_path = [ "organizations", orgname, "association_requests", username ]
         if json["response"] == "accept"
           users = get_data(request, [ "organizations", orgname, "groups", "users" ])
-          users = FFI_Yajl::Parser.parse(users, :create_additions => false)
+          users = FFI_Yajl::Parser.parse(users)
 
           delete_data(request, association_request_path)
           create_data(request, [ "organizations", orgname, "users" ], username, "{}")

data/lib/chef_zero/endpoints/user_organizations_endpoint.rb

@@ -12,7 +12,7 @@ module ChefZero
         end
         result = result.map do |orgname|
           org = get_data(request, [ "organizations", orgname, "org" ])
-          org = FFI_Yajl::Parser.parse(org, :create_additions => false)
+          org = FFI_Yajl::Parser.parse(org)
           { "organization" => ChefData::DataNormalizer.normalize_organization(org, orgname) }
         end
         json_response(200, result)

data/lib/chef_zero/rest_base.rb

@@ -285,7 +285,7 @@ module ChefZero
     end
 
     def parse_json(json)
-      FFI_Yajl::Parser.parse(json, create_additions: false)
+      FFI_Yajl::Parser.parse(json)
     end
 
     def to_json(data)

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "5.0.0"
+  VERSION = "5.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log