chef-zero 2.2.1 → 3.0.0.rc.1

data/lib/chef_zero/endpoints/data_bags_endpoint.rb

@@ -1,4 +1,4 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/endpoints/rest_list_endpoint'
 
 module ChefZero
@@ -7,13 +7,14 @@ module ChefZero
     class DataBagsEndpoint < RestListEndpoint
       def post(request)
         contents = request.body
-        name = FFI_Yajl::Parser.parse(contents, :create_additions => false)[identity_key]
+        json = JSON.parse(contents, :create_additions => false)
+        name = identity_keys.map { |k| json[k] }.select { |v| v }.first
         if name.nil?
-          error(400, "Must specify '#{identity_key}' in JSON")
+          error(400, "Must specify #{identity_keys.map { |k| k.inspect }.join(' or ')} in JSON")
         elsif exists_data_dir?(request, request.rest_path[0..1] + ['data', name])
           error(409, "Object already exists")
         else
-          data_store.create_dir(request.rest_path[0..1] + ['data'], name, :recursive)
+          create_data_dir(request, request.rest_path[0..1] + ['data'], name, :recursive)
           json_response(201, {"uri" => "#{build_uri(request.base_uri, request.rest_path + [name])}"})
         end
       end

data/lib/chef_zero/endpoints/environment_cookbook_endpoint.rb

@@ -1,4 +1,4 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/endpoints/cookbooks_base'
 
 module ChefZero
@@ -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 = JSON.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
         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

@@ -1,4 +1,4 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/rest_base'
 require 'chef_zero/rest_error_response'
 
@@ -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 = JSON.parse(request.body, :create_additions => false)['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 = JSON.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
         environment_constraints = environment['cookbook_versions'] || {}
 
         desired_versions.each_key do |name|
@@ -48,8 +48,8 @@ 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)
-          result[name] = DataNormalizer.normalize_cookbook(self, request.rest_path[0..1], cookbook, name, versions[0], request.base_uri, 'MIN')
+          cookbook = JSON.parse(get_data(request, request.rest_path[0..1] + ['cookbooks', name, versions[0]]), :create_additions => false)
+          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)
       end
@@ -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 = JSON.parse(get_data(request, request.rest_path[0..1] + ['cookbooks', solve_for, desired_version]), :create_additions => false)
           cookbook_metadata = cookbook_obj['metadata'] || {}
           cookbook_dependencies = cookbook_metadata['dependencies'] || {}
           dep_not_found = false

data/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb

@@ -1,4 +1,4 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/endpoints/cookbooks_base'
 
 module ChefZero
@@ -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 = JSON.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
         constraints = environment['cookbook_versions'] || {}
         if request.query_params['num_versions'] == 'all'
           num_versions = nil

data/lib/chef_zero/endpoints/environment_endpoint.rb

@@ -1,6 +1,6 @@
-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
@@ -24,9 +24,9 @@ module ChefZero
       end
 
       def populate_defaults(request, response_json)
-        response = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
-        response = DataNormalizer.normalize_environment(response, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(response, :pretty => true)
+        response = JSON.parse(response_json, :create_additions => false)
+        response = ChefData::DataNormalizer.normalize_environment(response, request.rest_path[3])
+        JSON.pretty_generate(response)
       end
     end
   end

data/lib/chef_zero/endpoints/environment_nodes_endpoint.rb

@@ -1,4 +1,4 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/rest_base'
 
 module ChefZero
@@ -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 = JSON.parse(get_data(request, request.rest_path[0..1] + ['nodes', name]), :create_additions => false)
           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

@@ -1,4 +1,4 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/endpoints/cookbooks_base'
 
 module ChefZero
@@ -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 = JSON.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
         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 = 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/environment_role_endpoint.rb

@@ -1,4 +1,4 @@
-require 'ffi_yajl'
+require 'json'
 require 'chef_zero/endpoints/cookbooks_base'
 
 module ChefZero
@@ -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 = JSON.parse(get_data(request, role_path), :create_additions => false)
         environment_name = environment_path[3]
         if environment_name == '_default'
           run_list = role['run_list']

data/lib/chef_zero/endpoints/file_store_file_endpoint.rb

@@ -14,7 +14,7 @@ module ChefZero
       end
 
       def put(request)
-        data_store.set(request.rest_path, request.body, :create, :create_dir)
+        data_store.set(request.rest_path, request.body, :create, :create_dir, :requestor => request.requestor)
         json_response(200, {})
       end
     end

data/lib/chef_zero/endpoints/group_endpoint.rb

@@ -0,0 +1,20 @@
+require 'json'
+require 'chef_zero/endpoints/rest_object_endpoint'
+require 'chef_zero/chef_data/data_normalizer'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/groups/NAME
+    class GroupEndpoint < RestObjectEndpoint
+      def initialize(server)
+        super(server, %w(id groupname))
+      end
+
+      def populate_defaults(request, response_json)
+        group = JSON.parse(response_json, :create_additions => false)
+        group = ChefData::DataNormalizer.normalize_group(group, request.rest_path[3], request.rest_path[1])
+        JSON.pretty_generate(group)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/groups_endpoint.rb

@@ -0,0 +1,13 @@
+require 'json'
+require 'chef_zero/endpoints/rest_list_endpoint'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/groups/NAME
+    class GroupsEndpoint < RestListEndpoint
+      def initialize(server)
+        super(server, %w(id groupname))
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/license_endpoint.rb

@@ -0,0 +1,25 @@
+require 'json'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # /license
+    class LicenseEndpoint < RestBase
+      MAX_NODE_COUNT = 25
+
+      def get(request)
+        node_count = 0
+        list_data(request, [ 'organizations' ]).each do |orgname|
+          node_count += list_data(request, [ 'organizations', orgname, 'nodes' ]).size
+        end
+
+        json_response(200, {
+          "limit_exceeded" => (node_count > MAX_NODE_COUNT) ? true : false,
+          "node_license" => MAX_NODE_COUNT,
+          "node_count" => node_count,
+          "upgrade_url" => 'http://blah.com'
+        })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/node_endpoint.rb

@@ -1,15 +1,15 @@
-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
     # /nodes/ID
     class NodeEndpoint < RestObjectEndpoint
       def populate_defaults(request, response_json)
-        node = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
-        node = DataNormalizer.normalize_node(node, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(node, :pretty => true)
+        node = JSON.parse(response_json, :create_additions => false)
+        node = ChefData::DataNormalizer.normalize_node(node, request.rest_path[3])
+        JSON.pretty_generate(node)
       end
     end
   end

data/lib/chef_zero/endpoints/not_found_endpoint.rb

@@ -1,10 +1,10 @@
-require 'ffi_yajl'
+require 'json'
 
 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)]
+        return [404, {"Content-Type" => "application/json"}, JSON.pretty_generate({"error" => ["Object not found: #{request.env['REQUEST_PATH']}"]})]
       end
     end
   end

data/lib/chef_zero/endpoints/organization_association_request_endpoint.rb

@@ -0,0 +1,22 @@
+require 'json'
+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 = JSON.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

@@ -0,0 +1,29 @@
+require 'json'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/association_requests
+    class OrganizationAssociationRequestsEndpoint < RestBase
+      def post(request)
+        json = JSON.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

data/lib/chef_zero/endpoints/organization_authenticate_user_endpoint.rb

@@ -0,0 +1,26 @@
+require 'json'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # /organizations/NAME/authenticate_user
+    class OrganizationAuthenticateUserEndpoint < RestBase
+      def post(request)
+        request_json = JSON.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 = JSON.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

@@ -0,0 +1,41 @@
+require 'json'
+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 = JSON.parse(get_data(request, request.rest_path + [ 'org' ]), :create_additions => false)
+        new_org = JSON.parse(request.body, :create_additions => false)
+        new_org.each do |key, value|
+          org[key] = value
+        end
+        org = JSON.pretty_generate(org)
+        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 = JSON.parse(response_json, :create_additions => false)
+        org = ChefData::DataNormalizer.normalize_organization(org, request.rest_path[1])
+        JSON.pretty_generate(org)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/organization_user_endpoint.rb

@@ -0,0 +1,48 @@
+require 'json'
+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 = JSON.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 = JSON.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 = JSON.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}-#{orgname}"], :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' ], JSON.pretty_generate(users))
+        end
+        json_response(200, {})
+      end
+    end
+  end
+end