chef-zero 2.2.1 → 3.0.0.rc.1

data/lib/chef_zero/data_store/v2_to_v1_adapter.rb

@@ -30,7 +30,7 @@ module ChefZero
 
       def clear
         real_store.clear
-        real_store.create_dir([ 'organizations' ], single_org)
+        real_store.create_dir([ 'organizations' ], single_org, :recursive)
       end
 
       def create_dir(path, name, *options)

data/lib/chef_zero/endpoints/acl_endpoint.rb

@@ -0,0 +1,38 @@
+require 'json'
+require 'chef_zero/rest_base'
+require 'chef_zero/chef_data/acl_path'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/<thing>/NAME/_acl/PERM
+    # Where thing is:
+    # clients, data, containers, cookbooks, environments
+    # groups, roles, nodes, users
+    # or
+    # /organizations/ORG/organization/_acl/PERM
+    # or
+    # /users/NAME/_acl/PERM
+    #
+    # Where PERM is create,read,update,delete,grant
+    class AclEndpoint < RestBase
+      def validate_request(request)
+        path = request.rest_path[0..-3]
+        path = path[0..1] if path.size == 3 && path[0] == 'organizations' && %w(organization organizations).include?(path[2])
+        acl_path = ChefData::AclPath.get_acl_data_path(path) # Strip off _acl/PERM
+        perm = request.rest_path[-1]
+        if !acl_path || !%w(read create update delete grant).include?(perm)
+          raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
+        end
+        [acl_path, perm]
+      end
+
+      def put(request)
+        path, perm = validate_request(request)
+        acls = JSON.parse(get_data(request, path), :create_additions => false)
+        acls[perm] = JSON.parse(request.body, :create_additions => false)[perm]
+        set_data(request, path, JSON.pretty_generate(acls))
+        json_response(200, {'uri' => "#{build_uri(request.base_uri, request.rest_path)}"})
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/acls_endpoint.rb

@@ -0,0 +1,29 @@
+require 'json'
+require 'chef_zero/rest_base'
+require 'chef_zero/chef_data/data_normalizer'
+require 'chef_zero/chef_data/acl_path'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/THING/NAME/_acl
+    # Where THING is:
+    # - clients, data, containers, cookbooks, environments
+    #   groups, roles, nodes, users
+    # or
+    # /organizations/ORG/organization/_acl
+    # /users/NAME/_acl
+    class AclsEndpoint < RestBase
+      def get(request)
+        path = request.rest_path[0..-2] # Strip off _acl
+        path = path[0..1] if path.size == 3 && path[0] == 'organizations' && %w(organization organizations).include?(path[2])
+        acl_path = ChefData::AclPath.get_acl_data_path(path)
+        if !acl_path
+          raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
+        end
+        acls = JSON.parse(get_data(request, acl_path), :create_additions => false)
+        acls = ChefData::DataNormalizer.normalize_acls(acls)
+        json_response(200, acls)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/actor_endpoint.rb

@@ -1,14 +1,29 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/endpoints/rest_object_endpoint'
-require 'chef_zero/data_normalizer'
+require 'chef_zero/chef_data/data_normalizer'
 
 module ChefZero
   module Endpoints
-    # /clients/* and /users/*
+    # /organizations/ORG/clients/NAME
+    # /organizations/ORG/users/NAME
+    # /users/NAME
     class ActorEndpoint < RestObjectEndpoint
+      def delete(request)
+        result = super
+        if request.rest_path[0] == 'users'
+          list_data(request, [ 'organizations' ]).each do |org|
+            begin
+              delete_data(request, [ 'organizations', org, 'users', request.rest_path[1] ], :data_store_exceptions)
+            rescue DataStore::DataNotFoundError
+            end
+          end
+        end
+        result
+      end
+
       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 = JSON.parse(request.body, :create_additions => false)
         if request_body['public_key'].nil?
           # If public_key is null, then don't overwrite it.  Weird patchiness.
           body_modified = true
@@ -29,7 +44,7 @@ module ChefZero
         end
 
         # Save request
-        request.body = FFI_Yajl::Encoder.encode(request_body, :pretty => true) if body_modified
+        request.body = JSON.pretty_generate(request_body) if body_modified
 
         # PUT /clients is patchy
         request.body = patch_request_body(request)
@@ -38,7 +53,18 @@ module ChefZero
 
         # Inject private_key into response, delete public_key/password if applicable
         if result[0] == 200 || result[0] == 201
-          response = FFI_Yajl::Parser.parse(result[2], :create_additions => false)
+          if request.rest_path[0] == 'users'
+            key = nil
+            identity_keys.each do |identity_key|
+              key ||= request_body[identity_key]
+            end
+            key ||= request.rest_path[-1]
+            response = {
+              'uri' => build_uri(request.base_uri, [ 'users', key ])
+            }
+          else
+            response = JSON.parse(result[2], :create_additions => false)
+          end
           response['private_key'] = private_key if private_key
           response.delete('public_key') if !updating_public_key && request.rest_path[2] == 'users'
           response.delete('password')
@@ -49,13 +75,13 @@ module ChefZero
       end
 
       def populate_defaults(request, response_json)
-        response = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        response = JSON.parse(response_json, :create_additions => false)
         if request.rest_path[2] == 'clients'
-          response = DataNormalizer.normalize_client(response, request.rest_path[3])
+          response = ChefData::DataNormalizer.normalize_client(response, request.rest_path[3])
         else
-          response = DataNormalizer.normalize_user(response, request.rest_path[3])
+          response = ChefData::DataNormalizer.normalize_user(response, request.rest_path[3], identity_keys, server.options[:osc_compat], request.method)
         end
-        FFI_Yajl::Encoder.encode(response, :pretty => true)
+        JSON.pretty_generate(response)
       end
     end
   end

data/lib/chef_zero/endpoints/actors_endpoint.rb

@@ -1,27 +1,59 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/endpoints/rest_list_endpoint'
 
 module ChefZero
   module Endpoints
-    # /clients or /users
+    # /users, /organizations/ORG/clients or /organizations/ORG/users
     class ActorsEndpoint < RestListEndpoint
+      def get(request)
+        response = super(request)
+
+        if request.query_params['email']
+          results = JSON.parse(response[2], :create_additions => false)
+          new_results = {}
+          results.each do |name, url|
+            record = get_data(request, request.rest_path + [ name ], :nil)
+            if record
+              record = JSON.parse(record, :create_additions => false)
+              new_results[name] = url if record['email'] == request.query_params['email']
+            end
+          end
+          response[2] = JSON.pretty_generate(new_results)
+        end
+
+        if request.query_params['verbose']
+          results = JSON.parse(response[2], :create_additions => false)
+          results.each do |name, url|
+            record = get_data(request, request.rest_path + [ name ], :nil)
+            if record
+              record = JSON.parse(record, :create_additions => false)
+              record = ChefData::DataNormalizer.normalize_user(record, name, identity_keys, server.options[:osc_compat])
+              results[name] = record
+            end
+          end
+          response[2] = JSON.pretty_generate(results)
+        end
+        response
+      end
+
       def post(request)
         # First, find out if the user actually posted a public key.  If not, make
         # one.
-        request_body = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        request_body = JSON.parse(request.body, :create_additions => false)
         public_key = request_body['public_key']
         if !public_key
           private_key, public_key = server.gen_key_pair
           request_body['public_key'] = public_key
-          request.body = FFI_Yajl::Encoder.encode(request_body, :pretty => true)
+          request.body = JSON.pretty_generate(request_body)
         end
 
         result = super(request)
+
         if result[0] == 201
           # If we generated a key, stuff it in the response.
-          response = FFI_Yajl::Parser.parse(result[2], :create_additions => false)
+          response = JSON.parse(result[2], :create_additions => false)
           response['private_key'] = private_key if private_key
-          response['public_key'] = public_key
+          response['public_key'] = public_key unless request.rest_path[0] == 'users'
           json_response(201, response)
         else
           result

data/lib/chef_zero/endpoints/authenticate_user_endpoint.rb

@@ -1,4 +1,4 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/rest_base'
 
 module ChefZero
@@ -6,18 +6,24 @@ module ChefZero
     # /authenticate_user
     class AuthenticateUserEndpoint < RestBase
       def post(request)
-        request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        name = request_json['name']
+        request_json = JSON.parse(request.body, :create_additions => false)
+        name = request_json['username']
         password = request_json['password']
         begin
-          user = data_store.get(request.rest_path[0..1] + ['users', name])
-          verified = FFI_Yajl::Parser.parse(user, :create_additions => false)['password'] == password
-        rescue DataStore::DataNotFoundError
-          verified = false
+          user = data_store.get(['users', name])
+        rescue ChefZero::DataStore::DataNotFoundError
+          raise RestErrorResponse.new(401, "Bad username or password")
         end
+        user = JSON.parse(user, :create_additions => false)
+        user = ChefData::DataNormalizer.normalize_user(user, name, [ 'username' ], server.options[:osc_compat])
+        if user['password'] != password
+          raise RestErrorResponse.new(401, "Bad username or password")
+        end
+        # Include only particular user data in the response
+        user.keep_if { |key,value| %w(first_name last_name display_name email username).include?(key) }
         json_response(200, {
-          'name' => name,
-          'verified' => !!verified
+          'status' => 'linked',
+          'user' => user
         })
       end
     end

data/lib/chef_zero/endpoints/container_endpoint.rb

@@ -0,0 +1,22 @@
+require 'json'
+require 'chef_zero/endpoints/rest_object_endpoint'
+require 'chef_zero/chef_data/data_normalizer'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/containers/NAME
+    class ContainerEndpoint < RestObjectEndpoint
+      def initialize(server)
+        super(server, %w(id containername))
+      end
+
+      undef_method(:put)
+
+      def populate_defaults(request, response_json)
+        container = JSON.parse(response_json, :create_additions => false)
+        container = ChefData::DataNormalizer.normalize_container(container, request.rest_path[3])
+        JSON.pretty_generate(container)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/containers_endpoint.rb

@@ -0,0 +1,13 @@
+require 'json'
+require 'chef_zero/endpoints/rest_list_endpoint'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/containers
+    class ContainersEndpoint < RestListEndpoint
+      def initialize(server)
+        super(server, %w(id containername))
+      end
+    end
+  end
+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 = JSON.parse(get_data(request, request.rest_path[0..1] + ['cookbooks', name, versions[0]]), :create_additions => false)
               result += recipe_names(name, cookbook)
             end
           end

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -1,12 +1,12 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/endpoints/rest_object_endpoint'
 require 'chef_zero/rest_error_response'
-require 'chef_zero/data_normalizer'
+require 'chef_zero/chef_data/data_normalizer'
 require 'chef_zero/data_store/data_not_found_error'
 
 module ChefZero
   module Endpoints
-    # /cookbooks/NAME/VERSION
+    # /organizations/ORG/cookbooks/NAME/VERSION
     class CookbookVersionEndpoint < RestObjectEndpoint
       def get(request)
         if request.rest_path[4] == "_latest" || request.rest_path[4] == "latest"
@@ -22,22 +22,22 @@ module ChefZero
 
         # Honor frozen
         if existing_cookbook
-          existing_cookbook_json = FFI_Yajl::Parser.parse(existing_cookbook, :create_additions => false)
+          existing_cookbook_json = JSON.parse(existing_cookbook, :create_additions => false)
           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 = JSON.parse(request.body, :create_additions => false)
             if !request_body['frozen?']
               request_body['frozen?'] = true
-              request.body = FFI_Yajl::Encoder.encode(request_body, :pretty => true)
+              request.body = JSON.pretty_generate(request_body)
             end
           end
         end
 
         # Set the cookbook
-        set_data(request, request.rest_path[0..1] + ['cookbooks', name, version], request.body, :create_dir, :create)
+        set_data(request, request.rest_path, request.body, :create_dir, :create)
 
         # If the cookbook was updated, check for deleted files and clean them up
         if existing_cookbook
@@ -59,8 +59,9 @@ module ChefZero
 
         response = super(request)
         cookbook_name = request.rest_path[3]
-        if exists_data_dir?(request, request.rest_path[0..1] + [ 'cookbooks', cookbook_name ]) && list_data(request, request.rest_path[0..1] + ['cookbooks', cookbook_name]).size == 0
-          delete_data_dir(request, request.rest_path[0..1] + ['cookbooks', cookbook_name])
+        cookbook_path = request.rest_path[0..1] + ['cookbooks', cookbook_name]
+        if exists_data_dir?(request, cookbook_path) && list_data(request, cookbook_path).size == 0
+          delete_data_dir(request, cookbook_path)
         end
 
         # Hoover deleted files, if they exist
@@ -70,7 +71,7 @@ module ChefZero
 
       def get_checksums(cookbook)
         result = []
-        FFI_Yajl::Parser.parse(cookbook, :create_additions => false).each_pair do |key, value|
+        JSON.parse(cookbook, :create_additions => false).each_pair do |key, value|
           if value.is_a?(Array)
             value.each do |file|
               if file.is_a?(Hash) && file.has_key?('checksum')
@@ -96,7 +97,7 @@ module ChefZero
           # This deals with an exception on delete, but things can still get deleted
           # that shouldn't be.
           begin
-            data_store.delete(request.rest_path[0..1] + ['file_store', 'checksums', checksum])
+            delete_data(request, request.rest_path[0..1] + ['file_store', 'checksums', checksum], :data_store_exceptions)
           rescue ChefZero::DataStore::DataNotFoundError
           end
         end
@@ -104,9 +105,9 @@ 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 = 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)
+        cookbook = JSON.parse(response_json, :create_additions => false)
+        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)
+        JSON.pretty_generate(cookbook)
       end
 
       def latest_version(versions)

data/lib/chef_zero/endpoints/cookbooks_base.rb

@@ -1,6 +1,6 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/rest_base'
-require 'chef_zero/data_normalizer'
+require 'chef_zero/chef_data/data_normalizer'
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/data_bag_endpoint.rb

@@ -1,4 +1,4 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/endpoints/rest_list_endpoint'
 require 'chef_zero/endpoints/data_bag_item_endpoint'
 require 'chef_zero/rest_error_response'
@@ -12,7 +12,8 @@ module ChefZero
       end
 
       def post(request)
-        key = FFI_Yajl::Parser.parse(request.body, :create_additions => false)[identity_key]
+        json = JSON.parse(request.body, :create_additions => false)
+        key = identity_keys.map { |k| json[k] }.select { |v| v }.first
         response = super(request)
         if response[0] == 201
           already_json_response(201, DataBagItemEndpoint::populate_defaults(request, request.body, request.rest_path[3], key))
@@ -22,7 +23,7 @@ module ChefZero
       end
 
       def get_key(contents)
-        data_bag_item = FFI_Yajl::Parser.parse(contents, :create_additions => false)
+        data_bag_item = JSON.parse(contents, :create_additions => false)
         if data_bag_item['json_class'] == 'Chef::DataBagItem' && data_bag_item['raw_data']
           data_bag_item['raw_data']['id']
         else
@@ -42,4 +43,3 @@ module ChefZero
     end
   end
 end
-

data/lib/chef_zero/endpoints/data_bag_item_endpoint.rb

@@ -1,7 +1,7 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/endpoints/rest_object_endpoint'
 require 'chef_zero/endpoints/data_bag_item_endpoint'
-require 'chef_zero/data_normalizer'
+require 'chef_zero/chef_data/data_normalizer'
 
 module ChefZero
   module Endpoints
@@ -16,9 +16,9 @@ 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 = DataNormalizer.normalize_data_bag_item(response, data_bag, data_bag_item, request.method)
-        FFI_Yajl::Encoder.encode(response, :pretty => true)
+        response = JSON.parse(response_json, :create_additions => false)
+        response = ChefData::DataNormalizer.normalize_data_bag_item(response, data_bag, data_bag_item, request.method)
+        JSON.pretty_generate(response)
       end
     end
   end