chef-zero 4.3.0 → 4.3.1

data/lib/chef_zero/endpoints/actors_endpoint.rb

@@ -1,64 +1,64 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_list_endpoint'
-
-module ChefZero
-  module Endpoints
-    # /users, /organizations/ORG/clients or /organizations/ORG/users
-    class ActorsEndpoint < RestListEndpoint
-      def get(request)
-        response = super(request)
-
-        if request.query_params['email']
-          results = FFI_Yajl::Parser.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 = FFI_Yajl::Parser.parse(record, :create_additions => false)
-              new_results[name] = url if record['email'] == request.query_params['email']
-            end
-          end
-          response[2] = FFI_Yajl::Encoder.encode(new_results, :pretty => true)
-        end
-
-        if request.query_params['verbose']
-          results = FFI_Yajl::Parser.parse(response[2], :create_additions => false)
-          results.each do |name, url|
-            record = get_data(request, request.rest_path + [ name ], :nil)
-            if record
-              record = FFI_Yajl::Parser.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] = FFI_Yajl::Encoder.encode(results, :pretty => true)
-        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)
-        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)
-        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['private_key'] = private_key if private_key
-          response['public_key'] = public_key unless request.rest_path[0] == 'users'
-          json_response(201, response)
-        else
-          result
-        end
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/endpoints/rest_list_endpoint'
+
+module ChefZero
+  module Endpoints
+    # /users, /organizations/ORG/clients or /organizations/ORG/users
+    class ActorsEndpoint < RestListEndpoint
+      def get(request)
+        response = super(request)
+
+        if request.query_params['email']
+          results = FFI_Yajl::Parser.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 = FFI_Yajl::Parser.parse(record, :create_additions => false)
+              new_results[name] = url if record['email'] == request.query_params['email']
+            end
+          end
+          response[2] = FFI_Yajl::Encoder.encode(new_results, :pretty => true)
+        end
+
+        if request.query_params['verbose']
+          results = FFI_Yajl::Parser.parse(response[2], :create_additions => false)
+          results.each do |name, url|
+            record = get_data(request, request.rest_path + [ name ], :nil)
+            if record
+              record = FFI_Yajl::Parser.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] = FFI_Yajl::Encoder.encode(results, :pretty => true)
+        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)
+        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)
+        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['private_key'] = private_key if private_key
+          response['public_key'] = public_key unless request.rest_path[0] == 'users'
+          json_response(201, response)
+        else
+          result
+        end
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/authenticate_user_endpoint.rb

@@ -1,31 +1,31 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-
-module ChefZero
-  module Endpoints
-    # /authenticate_user
-    class AuthenticateUserEndpoint < RestBase
-      def post(request)
-        request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        name = request_json['username']
-        password = request_json['password']
-        begin
-          user = data_store.get(['users', name])
-        rescue ChefZero::DataStore::DataNotFoundError
-          raise RestErrorResponse.new(401, "Bad username or password")
-        end
-        user = FFI_Yajl::Parser.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, {
-          'status' => 'linked',
-          'user' => user
-        })
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # /authenticate_user
+    class AuthenticateUserEndpoint < RestBase
+      def post(request)
+        request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        name = request_json['username']
+        password = request_json['password']
+        begin
+          user = data_store.get(['users', name])
+        rescue ChefZero::DataStore::DataNotFoundError
+          raise RestErrorResponse.new(401, "Bad username or password")
+        end
+        user = FFI_Yajl::Parser.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, {
+          'status' => 'linked',
+          'user' => user
+        })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/container_endpoint.rb

@@ -1,22 +1,22 @@
-require 'ffi_yajl'
-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 = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
-        container = ChefData::DataNormalizer.normalize_container(container, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(container, :pretty => true)
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+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 = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        container = ChefData::DataNormalizer.normalize_container(container, request.rest_path[3])
+        FFI_Yajl::Encoder.encode(container, :pretty => true)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/containers_endpoint.rb

@@ -1,13 +1,13 @@
-require 'ffi_yajl'
-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
+require 'ffi_yajl'
+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

@@ -1,39 +1,39 @@
-require 'chef_zero/endpoints/cookbooks_base'
-
-module ChefZero
-  module Endpoints
-    # /cookbooks/NAME
-    class CookbookEndpoint < CookbooksBase
-      def get(request)
-        filter = request.rest_path[3]
-        case filter
-        when '_latest'
-          result = {}
-          filter_cookbooks(all_cookbooks_list(request), {}, 1) do |name, versions|
-            if versions.size > 0
-              result[name] = build_uri(request.base_uri, request.rest_path[0..1] + ['cookbooks', name, versions[0]])
-            end
-          end
-          json_response(200, result)
-        when '_recipes'
-          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)
-              result += recipe_names(name, cookbook)
-            end
-          end
-          json_response(200, result.sort)
-        else
-          cookbook_list = { filter => list_data(request, request.rest_path) }
-          json_response(200, format_cookbooks_list(request, cookbook_list))
-        end
-      end
-
-      def latest_version(versions)
-        sorted = versions.sort_by { |version| Gem::Version.new(version.dup) }
-        sorted[-1]
-      end
-    end
-  end
-end
+require 'chef_zero/endpoints/cookbooks_base'
+
+module ChefZero
+  module Endpoints
+    # /cookbooks/NAME
+    class CookbookEndpoint < CookbooksBase
+      def get(request)
+        filter = request.rest_path[3]
+        case filter
+        when '_latest'
+          result = {}
+          filter_cookbooks(all_cookbooks_list(request), {}, 1) do |name, versions|
+            if versions.size > 0
+              result[name] = build_uri(request.base_uri, request.rest_path[0..1] + ['cookbooks', name, versions[0]])
+            end
+          end
+          json_response(200, result)
+        when '_recipes'
+          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)
+              result += recipe_names(name, cookbook)
+            end
+          end
+          json_response(200, result.sort)
+        else
+          cookbook_list = { filter => list_data(request, request.rest_path) }
+          json_response(200, format_cookbooks_list(request, cookbook_list))
+        end
+      end
+
+      def latest_version(versions)
+        sorted = versions.sort_by { |version| Gem::Version.new(version.dup) }
+        sorted[-1]
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -1,119 +1,119 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_object_endpoint'
-require 'chef_zero/rest_error_response'
-require 'chef_zero/chef_data/data_normalizer'
-require 'chef_zero/data_store/data_not_found_error'
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/cookbooks/NAME/VERSION
-    class CookbookVersionEndpoint < RestObjectEndpoint
-      def get(request)
-        if request.rest_path[4] == "_latest" || request.rest_path[4] == "latest"
-          request.rest_path[4] = latest_version(list_data(request, request.rest_path[0..3]))
-        end
-        super(request)
-      end
-
-      def put(request)
-        name = request.rest_path[3]
-        version = request.rest_path[4]
-        existing_cookbook = get_data(request, request.rest_path, :nil)
-
-        # Honor frozen
-        if existing_cookbook
-          existing_cookbook_json = FFI_Yajl::Parser.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)
-            if !request_body['frozen?']
-              request_body['frozen?'] = true
-              request.body = FFI_Yajl::Encoder.encode(request_body, :pretty => true)
-            end
-          end
-        end
-
-        # Set the cookbook
-        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
-          missing_checksums = get_checksums(existing_cookbook) - get_checksums(request.body)
-          if missing_checksums.size > 0
-            hoover_unused_checksums(missing_checksums, request)
-          end
-        end
-
-        already_json_response(existing_cookbook ? 200 : 201, populate_defaults(request, request.body))
-      end
-
-      def delete(request)
-        if request.rest_path[4] == "_latest" || request.rest_path[4] == "latest"
-          request.rest_path[4] = latest_version(list_data(request, request.rest_path[0..3]))
-        end
-
-        deleted_cookbook = get_data(request)
-
-        response = super(request)
-        cookbook_name = request.rest_path[3]
-        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
-        hoover_unused_checksums(get_checksums(deleted_cookbook), request)
-        response
-      end
-
-      def get_checksums(cookbook)
-        result = []
-        FFI_Yajl::Parser.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')
-                result << file['checksum']
-              end
-            end
-          end
-        end
-        result.uniq
-      end
-
-      private
-
-      def hoover_unused_checksums(deleted_checksums, request)
-        data_store.list(request.rest_path[0..1] + ['cookbooks']).each do |cookbook_name|
-          data_store.list(request.rest_path[0..1] + ['cookbooks', cookbook_name]).each do |version|
-            cookbook = data_store.get(request.rest_path[0..1] + ['cookbooks', cookbook_name, version], request)
-            deleted_checksums = deleted_checksums - get_checksums(cookbook)
-          end
-        end
-        deleted_checksums.each do |checksum|
-          # There can be a race here if multiple cookbooks are uploading.
-          # This deals with an exception on delete, but things can still get deleted
-          # that shouldn't be.
-          begin
-            delete_data(request, request.rest_path[0..1] + ['file_store', 'checksums', checksum], :data_store_exceptions)
-          rescue ChefZero::DataStore::DataNotFoundError
-          end
-        end
-      end
-
-      def populate_defaults(request, response_json)
-        # Inject URIs into each cookbook file
-        cookbook = FFI_Yajl::Parser.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)
-        FFI_Yajl::Encoder.encode(cookbook, :pretty => true)
-      end
-
-      def latest_version(versions)
-        sorted = versions.sort_by { |version| Gem::Version.new(version.dup) }
-        sorted[-1]
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/endpoints/rest_object_endpoint'
+require 'chef_zero/rest_error_response'
+require 'chef_zero/chef_data/data_normalizer'
+require 'chef_zero/data_store/data_not_found_error'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/cookbooks/NAME/VERSION
+    class CookbookVersionEndpoint < RestObjectEndpoint
+      def get(request)
+        if request.rest_path[4] == "_latest" || request.rest_path[4] == "latest"
+          request.rest_path[4] = latest_version(list_data(request, request.rest_path[0..3]))
+        end
+        super(request)
+      end
+
+      def put(request)
+        name = request.rest_path[3]
+        version = request.rest_path[4]
+        existing_cookbook = get_data(request, request.rest_path, :nil)
+
+        # Honor frozen
+        if existing_cookbook
+          existing_cookbook_json = FFI_Yajl::Parser.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)
+            if !request_body['frozen?']
+              request_body['frozen?'] = true
+              request.body = FFI_Yajl::Encoder.encode(request_body, :pretty => true)
+            end
+          end
+        end
+
+        # Set the cookbook
+        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
+          missing_checksums = get_checksums(existing_cookbook) - get_checksums(request.body)
+          if missing_checksums.size > 0
+            hoover_unused_checksums(missing_checksums, request)
+          end
+        end
+
+        already_json_response(existing_cookbook ? 200 : 201, populate_defaults(request, request.body))
+      end
+
+      def delete(request)
+        if request.rest_path[4] == "_latest" || request.rest_path[4] == "latest"
+          request.rest_path[4] = latest_version(list_data(request, request.rest_path[0..3]))
+        end
+
+        deleted_cookbook = get_data(request)
+
+        response = super(request)
+        cookbook_name = request.rest_path[3]
+        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
+        hoover_unused_checksums(get_checksums(deleted_cookbook), request)
+        response
+      end
+
+      def get_checksums(cookbook)
+        result = []
+        FFI_Yajl::Parser.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')
+                result << file['checksum']
+              end
+            end
+          end
+        end
+        result.uniq
+      end
+
+      private
+
+      def hoover_unused_checksums(deleted_checksums, request)
+        data_store.list(request.rest_path[0..1] + ['cookbooks']).each do |cookbook_name|
+          data_store.list(request.rest_path[0..1] + ['cookbooks', cookbook_name]).each do |version|
+            cookbook = data_store.get(request.rest_path[0..1] + ['cookbooks', cookbook_name, version], request)
+            deleted_checksums = deleted_checksums - get_checksums(cookbook)
+          end
+        end
+        deleted_checksums.each do |checksum|
+          # There can be a race here if multiple cookbooks are uploading.
+          # This deals with an exception on delete, but things can still get deleted
+          # that shouldn't be.
+          begin
+            delete_data(request, request.rest_path[0..1] + ['file_store', 'checksums', checksum], :data_store_exceptions)
+          rescue ChefZero::DataStore::DataNotFoundError
+          end
+        end
+      end
+
+      def populate_defaults(request, response_json)
+        # Inject URIs into each cookbook file
+        cookbook = FFI_Yajl::Parser.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)
+        FFI_Yajl::Encoder.encode(cookbook, :pretty => true)
+      end
+
+      def latest_version(versions)
+        sorted = versions.sort_by { |version| Gem::Version.new(version.dup) }
+        sorted[-1]
+      end
+    end
+  end
+end