chef-zero 4.2.3 → 4.3.0

data/lib/chef_zero/endpoints/node_identifiers_endpoint.rb

@@ -0,0 +1,22 @@
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+require 'uuidtools'
+
+module ChefZero
+  module Endpoints
+    # /organizations/NAME/nodes/NAME/_identifiers
+    class NodeIdentifiersEndpoint < RestBase
+      def get(request)
+        if get_data(request, request.rest_path[0..3])
+          result = { 
+            :id => UUIDTools::UUID.parse_raw(request.rest_path[0..4].to_s).to_s.gsub('-',''),
+            :authz_id => '0'*32,
+            :org_id => UUIDTools::UUID.parse_raw(request.rest_path[0..1].to_s).to_s.gsub('-','') }
+          json_response(200, result)
+        else
+          raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
+        end
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/not_found_endpoint.rb

@@ -1,11 +1,11 @@
-require 'ffi_yajl'
-
-module ChefZero
-  module Endpoints
-    class NotFoundEndpoint
-      def call(request)
-        return [404, {"Content-Type" => "application/json"}, FFI_Yajl::Encoder.encode({"error" => ["Object not found: #{request.env['REQUEST_PATH']}"]}, :pretty => true)]
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+
+module ChefZero
+  module Endpoints
+    class NotFoundEndpoint
+      def call(request)
+        return [404, {"Content-Type" => "application/json"}, FFI_Yajl::Encoder.encode({"error" => ["Object not found: #{request.env['REQUEST_PATH']}"]}, :pretty => true)]
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_association_request_endpoint.rb

@@ -1,22 +1,22 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/association_requests/ID
-    class OrganizationAssociationRequestEndpoint < RestBase
-      def delete(request)
-        orgname = request.rest_path[1]
-        id = request.rest_path[3]
-        if id !~ /(.+)-#{orgname}$/
-          raise HttpErrorResponse.new(404, "Invalid ID #{id}.  Must be of the form username-#{orgname}")
-        end
-        username = $1
-        path = request.rest_path[0..-2] + [username]
-        data = FFI_Yajl::Parser.parse(get_data(request, path), :create_additions => false)
-        delete_data(request, path)
-        json_response(200, { "id" => id, "username" => username })
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/association_requests/ID
+    class OrganizationAssociationRequestEndpoint < RestBase
+      def delete(request)
+        orgname = request.rest_path[1]
+        id = request.rest_path[3]
+        if id !~ /(.+)-#{orgname}$/
+          raise HttpErrorResponse.new(404, "Invalid ID #{id}.  Must be of the form username-#{orgname}")
+        end
+        username = $1
+        path = request.rest_path[0..-2] + [username]
+        data = FFI_Yajl::Parser.parse(get_data(request, path), :create_additions => false)
+        delete_data(request, path)
+        json_response(200, { "id" => id, "username" => username })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_association_requests_endpoint.rb

@@ -1,29 +1,30 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/association_requests
-    class OrganizationAssociationRequestsEndpoint < RestBase
-      def post(request)
-        json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        username = json['user']
-        orgname = request.rest_path[1]
-        id = "#{username}-#{orgname}"
-
-        if exists_data?(request, [ 'organizations', orgname, 'users', username ])
-          raise RestErrorResponse.new(409, "User #{username} is already in organization #{orgname}")
-        end
-
-        create_data(request, request.rest_path, username, '{}')
-        json_response(201, { "uri" => build_uri(request.base_uri, request.rest_path + [ id ]) })
-      end
-
-      def get(request)
-        orgname = request.rest_path[1]
-        result = list_data(request).map { |username| { "id" => "#{username}-#{orgname}", 'username' => username } }
-        json_response(200, result)
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/association_requests
+    class OrganizationAssociationRequestsEndpoint < RestBase
+      def post(request)
+        json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        username = json['user']
+        orgname = request.rest_path[1]
+        id = "#{username}-#{orgname}"
+
+        if exists_data?(request, [ 'organizations', orgname, 'users', username ])
+          raise RestErrorResponse.new(409, "User #{username} is already in organization #{orgname}")
+        end
+
+        create_data(request, request.rest_path, username, '{}')
+        json_response(201, { "uri" => build_uri(request.base_uri, request.rest_path + [ id ]) })
+      end
+
+      def get(request)
+        orgname = request.rest_path[1]
+        ChefZero::Endpoints::OrganizationUserBase.get(self, request) do |username|
+          { "id" => "#{username}-#{orgname}", 'username' => username }
+        end
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_authenticate_user_endpoint.rb

@@ -1,26 +1,26 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-
-module ChefZero
-  module Endpoints
-    # /organizations/NAME/authenticate_user
-    class OrganizationAuthenticateUserEndpoint < RestBase
-      def post(request)
-        request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        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)
-          verified = user['password'] == password
-        rescue DataStore::DataNotFoundError
-          verified = false
-        end
-        json_response(200, {
-          'name' => name,
-          'verified' => !!verified
-        })
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # /organizations/NAME/authenticate_user
+    class OrganizationAuthenticateUserEndpoint < RestBase
+      def post(request)
+        request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        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)
+          verified = user['password'] == password
+        rescue DataStore::DataNotFoundError
+          verified = false
+        end
+        json_response(200, {
+          'name' => name,
+          'verified' => !!verified
+        })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_endpoint.rb

@@ -1,41 +1,46 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-
-module ChefZero
-  module Endpoints
-    # /organizations/NAME
-    class OrganizationEndpoint < RestBase
-      def get(request)
-        org = get_data(request, request.rest_path + [ 'org' ])
-        already_json_response(200, populate_defaults(request, org))
-      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)
-        new_org.each do |key, value|
-          org[key] = value
-        end
-        org = FFI_Yajl::Encoder.encode(org, :pretty => true)
-        if new_org['name'] != request.rest_path[-1]
-          # This is a rename
-          return error(400, "Cannot rename org #{request.rest_path[-1]} to #{new_org['name']}: rename not supported for orgs")
-        end
-        set_data(request, request.rest_path + [ 'org' ], org)
-        json_response(200, "uri" => "#{build_uri(request.base_uri, request.rest_path)}")
-      end
-
-      def delete(request)
-        org = get_data(request, request.rest_path + [ 'org' ])
-        delete_data_dir(request, request.rest_path)
-        already_json_response(200, populate_defaults(request, org))
-      end
-
-      def populate_defaults(request, response_json)
-        org = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
-        org = ChefData::DataNormalizer.normalize_organization(org, request.rest_path[1])
-        FFI_Yajl::Encoder.encode(org, :pretty => true)
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # /organizations/NAME
+    class OrganizationEndpoint < RestBase
+      def get(request)
+        org = get_data(request, request.rest_path + [ 'org' ])
+        already_json_response(200, populate_defaults(request, org))
+      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)
+        new_org.each do |key, value|
+          org[key] = value
+        end
+        save_org = FFI_Yajl::Encoder.encode(org, :pretty => true)
+        if new_org['name'] != request.rest_path[-1]
+          # This is a rename
+          return error(400, "Cannot rename org #{request.rest_path[-1]} to #{new_org['name']}: rename not supported for orgs")
+        end
+        set_data(request, request.rest_path + [ 'org' ], save_org)
+        json_response(200, {
+          "uri" => "#{build_uri(request.base_uri, request.rest_path)}",
+          "name" => org['name'],
+          "org_type" => org['org_type'],
+          "full_name" => org['full_name']
+        })
+      end
+
+      def delete(request)
+        org = get_data(request, request.rest_path + [ 'org' ])
+        delete_data_dir(request, request.rest_path, :recursive)
+        already_json_response(200, populate_defaults(request, org))
+      end
+
+      def populate_defaults(request, response_json)
+        org = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        org = ChefData::DataNormalizer.normalize_organization(org, request.rest_path[1])
+        FFI_Yajl::Encoder.encode(org, :pretty => true)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_user_base.rb

@@ -0,0 +1,15 @@
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    module OrganizationUserBase
+
+      def self.get(obj, request, &block)
+        result = obj.list_data(request).map(&block)
+        obj.json_response(200, result)
+      end
+
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_user_endpoint.rb

@@ -1,48 +1,26 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/users/NAME
-    class OrganizationUserEndpoint < RestBase
-      def get(request)
-        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)
-        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)
-        json_response(200, ChefData::DataNormalizer.normalize_user(user, request.rest_path[3], ['username'], server.options[:osc_compat]))
-      end
-
-      def post(request)
-        orgname = request.rest_path[1]
-        username = request.rest_path[3]
-
-        users = get_data(request, [ 'organizations', orgname, 'groups', 'users' ])
-        users = FFI_Yajl::Parser.parse(users, :create_additions => false)
-
-        create_data(request, [ 'organizations', orgname, 'users' ], username, '{}')
-
-        # /organizations/ORG/association_requests/USERNAME-ORG
-        begin
-          delete_data(request, [ 'organizations', orgname, 'association_requests', username], :data_store_exceptions)
-        rescue DataStore::DataNotFoundError
-        end
-
-        # Add the user to the users group if it isn't already there
-        if !users['users'] || !users['users'].include?(username)
-          users['users'] ||= []
-          users['users'] |= [ username ]
-          set_data(request, [ 'organizations', orgname, 'groups', 'users' ], FFI_Yajl::Encoder.encode(users, :pretty => true))
-        end
-        json_response(200, {})
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/users/NAME
+    class OrganizationUserEndpoint < RestBase
+      def get(request)
+        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)
+        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)
+        json_response(200, ChefData::DataNormalizer.normalize_user(user, request.rest_path[3], ['username'], server.options[:osc_compat]))
+      end
+
+      # Note: post to a named org user is not permitted, alllow invalid method handling (405)
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_users_endpoint.rb

@@ -1,14 +1,43 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-
-module ChefZero
-  module Endpoints
-    # /organizations/ORG/users
-    class OrganizationUsersEndpoint < RestBase
-      def get(request)
-        result = list_data(request).map { |username| { "user" => { "username" => username } } }
-        json_response(200, result)
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+require 'chef_zero/endpoints/organization_user_base'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/users
+    class OrganizationUsersEndpoint < RestBase
+      def post(request)
+        orgname = request.rest_path[1]
+        json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        username = json['username']
+
+        if exists_data?(request, [ 'organizations', orgname, 'users', username ])
+          raise RestErrorResponse.new(409, "User #{username} is already in organization #{orgname}")
+        end
+
+        users = get_data(request, [ 'organizations', orgname, 'groups', 'users' ])
+        users = FFI_Yajl::Parser.parse(users, :create_additions => false)
+
+        create_data(request, request.rest_path, username, '{}')
+
+        # /organizations/ORG/association_requests/USERNAME-ORG
+        begin
+          delete_data(request, [ 'organizations', orgname, 'association_requests', username], :data_store_exceptions)
+        rescue DataStore::DataNotFoundError
+        end
+
+        # Add the user to the users group if it isn't already there
+        if !users['users'] || !users['users'].include?(username)
+          users['users'] ||= []
+          users['users'] |= [ username ]
+          set_data(request, [ 'organizations', orgname, 'groups', 'users' ], FFI_Yajl::Encoder.encode(users, :pretty => true))
+        end
+        json_response(201, { "uri" => build_uri(request.base_uri, request.rest_path + [ username ]) })
+      end
+
+      def get(request)
+        ChefZero::Endpoints::OrganizationUserBase.get(self, request) { |username| { "user" => { "username" => username } } }
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_validator_key_endpoint.rb

@@ -1,20 +1,20 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-require 'uuidtools'
-
-module ChefZero
-  module Endpoints
-    # /organizations/NAME/_validator_key
-    class OrganizationValidatorKeyEndpoint < RestBase
-      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)
-        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))
-        json_response(200, { 'private_key' => private_key })
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+require 'uuidtools'
+
+module ChefZero
+  module Endpoints
+    # /organizations/NAME/_validator_key
+    class OrganizationValidatorKeyEndpoint < RestBase
+      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)
+        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))
+        json_response(200, { 'private_key' => private_key })
+      end
+    end
+  end
+end