chef-zero 4.2.3 → 4.3.0

data/lib/chef_zero/data_store/v2_to_v1_adapter.rb

@@ -1,107 +1,107 @@
-#
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2014 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef_zero/data_store/interface_v1'
-
-module ChefZero
-  module DataStore
-    class V2ToV1Adapter < ChefZero::DataStore::InterfaceV1
-      def initialize
-        @single_org = 'chef'
-      end
-
-      attr_reader :real_store
-      attr_reader :single_org
-
-      def clear
-        real_store.clear
-        real_store.create_dir([ 'organizations' ], single_org, :recursive)
-      end
-
-      def create_dir(path, name, *options)
-        fix_exceptions do
-          real_store.create_dir(fix_path(path), name, *options)
-        end
-      end
-
-      def create(path, name, data, *options)
-        fix_exceptions do
-          real_store.create(fix_path(path), name, data, *options)
-        end
-      end
-
-      def get(path, request=nil)
-        fix_exceptions do
-          real_store.get(fix_path(path), request)
-        end
-      end
-
-      def set(path, data, *options)
-        fix_exceptions do
-          real_store.set(fix_path(path), data, *options)
-        end
-      end
-
-      def delete(path)
-        fix_exceptions do
-          real_store.delete(fix_path(path))
-        end
-      end
-
-      def delete_dir(path, *options)
-        fix_exceptions do
-          real_store.delete_dir(fix_path(path), *options)
-        end
-      end
-
-      def list(path)
-        fix_exceptions do
-          real_store.list(fix_path(path))
-        end
-      end
-
-      def exists?(path)
-        fix_exceptions do
-          real_store.exists?(fix_path(path))
-        end
-      end
-
-      def exists_dir?(path)
-        fix_exceptions do
-          real_store.exists_dir?(fix_path(path))
-        end
-      end
-
-      protected
-
-      def fix_exceptions
-        begin
-          yield
-        rescue DataAlreadyExistsError => e
-          raise DataAlreadyExistsError.new(e.path[2..-1], e)
-        rescue DataNotFoundError => e
-          raise DataNotFoundError.new(e.path[2..-1], e)
-        end
-      end
-
-      def fix_path(path)
-        [ 'organizations', single_org ] + path
-      end
-    end
-  end
-end
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2014 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef_zero/data_store/interface_v1'
+
+module ChefZero
+  module DataStore
+    class V2ToV1Adapter < ChefZero::DataStore::InterfaceV1
+      def initialize
+        @single_org = 'chef'
+      end
+
+      attr_reader :real_store
+      attr_reader :single_org
+
+      def clear
+        real_store.clear
+        real_store.create_dir([ 'organizations' ], single_org, :recursive)
+      end
+
+      def create_dir(path, name, *options)
+        fix_exceptions do
+          real_store.create_dir(fix_path(path), name, *options)
+        end
+      end
+
+      def create(path, name, data, *options)
+        fix_exceptions do
+          real_store.create(fix_path(path), name, data, *options)
+        end
+      end
+
+      def get(path, request=nil)
+        fix_exceptions do
+          real_store.get(fix_path(path), request)
+        end
+      end
+
+      def set(path, data, *options)
+        fix_exceptions do
+          real_store.set(fix_path(path), data, *options)
+        end
+      end
+
+      def delete(path)
+        fix_exceptions do
+          real_store.delete(fix_path(path))
+        end
+      end
+
+      def delete_dir(path, *options)
+        fix_exceptions do
+          real_store.delete_dir(fix_path(path), *options)
+        end
+      end
+
+      def list(path)
+        fix_exceptions do
+          real_store.list(fix_path(path))
+        end
+      end
+
+      def exists?(path)
+        fix_exceptions do
+          real_store.exists?(fix_path(path))
+        end
+      end
+
+      def exists_dir?(path)
+        fix_exceptions do
+          real_store.exists_dir?(fix_path(path))
+        end
+      end
+
+      protected
+
+      def fix_exceptions
+        begin
+          yield
+        rescue DataAlreadyExistsError => e
+          raise DataAlreadyExistsError.new(e.path[2..-1], e)
+        rescue DataNotFoundError => e
+          raise DataNotFoundError.new(e.path[2..-1], e)
+        end
+      end
+
+      def fix_path(path)
+        [ 'organizations', single_org ] + path
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/acl_endpoint.rb

@@ -1,38 +1,38 @@
-require 'ffi_yajl'
-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] # Strip off _acl/PERM
-        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)
-        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 = FFI_Yajl::Parser.parse(get_data(request, path), :create_additions => false)
-        acls[perm] = FFI_Yajl::Parser.parse(request.body, :create_additions => false)[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
-    end
-  end
-end
+require 'ffi_yajl'
+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] # Strip off _acl/PERM
+        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)
+        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 = FFI_Yajl::Parser.parse(get_data(request, path), :create_additions => false)
+        acls[perm] = FFI_Yajl::Parser.parse(request.body, :create_additions => false)[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
+    end
+  end
+end

data/lib/chef_zero/endpoints/acls_endpoint.rb

@@ -1,29 +1,29 @@
-require 'ffi_yajl'
-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 = FFI_Yajl::Parser.parse(get_data(request, acl_path), :create_additions => false)
-        acls = ChefData::DataNormalizer.normalize_acls(acls)
-        json_response(200, acls)
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+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 = FFI_Yajl::Parser.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,88 +1,94 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_object_endpoint'
-require 'chef_zero/chef_data/data_normalizer'
-
-module ChefZero
-  module Endpoints
-    # /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)
-        if request_body['public_key'].nil?
-          # If public_key is null, then don't overwrite it.  Weird patchiness.
-          body_modified = true
-          request_body.delete('public_key')
-        else
-          updating_public_key = true
-        end
-
-        # Generate private_key if requested.
-        if request_body.has_key?('private_key')
-          body_modified = true
-          if request_body['private_key']
-            private_key, public_key = server.gen_key_pair
-            updating_public_key = true
-            request_body['public_key'] = public_key
-          end
-          request_body.delete('private_key')
-        end
-
-        # Save request
-        request.body = FFI_Yajl::Encoder.encode(request_body, :pretty => true) if body_modified
-
-        # PUT /clients is patchy
-        request.body = patch_request_body(request)
-
-        result = super(request)
-
-        # Inject private_key into response, delete public_key/password if applicable
-        if result[0] == 200 || result[0] == 201
-          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 = FFI_Yajl::Parser.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')
-          json_response(result[0], response)
-        else
-          result
-        end
-      end
-
-      def populate_defaults(request, response_json)
-        response = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
-        if request.rest_path[2] == 'clients'
-          response = ChefData::DataNormalizer.normalize_client(response, request.rest_path[3])
-        else
-          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)
-      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/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)
+        if request_body['public_key'].nil?
+          # If public_key is null, then don't overwrite it.  Weird patchiness.
+          body_modified = true
+          request_body.delete('public_key')
+        else
+          updating_public_key = true
+        end
+
+        # Generate private_key if requested.
+        if request_body.has_key?('private_key')
+          body_modified = true
+          if request_body['private_key']
+            private_key, public_key = server.gen_key_pair
+            updating_public_key = true
+            request_body['public_key'] = public_key
+          end
+          request_body.delete('private_key')
+        end
+
+        # Save request
+        request.body = FFI_Yajl::Encoder.encode(request_body, :pretty => true) if body_modified
+
+        # PUT /clients is patchy
+        request.body = patch_request_body(request)
+
+        result = super(request)
+
+        # Inject private_key into response, delete public_key/password if applicable
+        if result[0] == 200 || result[0] == 201
+          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 = FFI_Yajl::Parser.parse(result[2], :create_additions => false)
+          end
+
+          if request.rest_path[2] == 'clients'
+            response['private_key'] = private_key ? private_key : false
+          else
+            response['private_key'] = private_key if private_key
+          end
+
+          response.delete('public_key') if !updating_public_key && request.rest_path[2] == 'users'
+          response.delete('password')
+          json_response(result[0], response)
+        else
+          result
+        end
+      end
+
+      def populate_defaults(request, response_json)
+        response = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        if request.rest_path[2] == 'clients'
+          response = ChefData::DataNormalizer.normalize_client(response,request.rest_path[3], request.rest_path[1])
+        else
+          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)
+      end
+    end
+  end
+end