chef-server-api 10.12.0 → 10.14.0.beta.1

data/app/controllers/clients.rb

@@ -23,9 +23,9 @@ class Clients < Application
   provides :json
 
   before :authenticate_every
-  before :is_admin, :only => [ :index, :update, :destroy ]
+  before :is_admin, :only => [ :index, :update ]
   before :is_admin_or_validator, :only => [ :create ]
-  before :admin_or_requesting_node, :only => [ :show ]
+  before :admin_or_requesting_node, :only => [ :show, :destroy ]
   
   # GET /clients
   def index

data/lib/chef-server-api/version.rb

@@ -1,3 +1,3 @@
 module ChefServerApi
-  VERSION = '10.12.0'
+  VERSION = '10.14.0.beta.1'
 end

data/spec/spec_helper.rb

@@ -78,12 +78,14 @@ def request_json(method, path, params, env, &block)
   @response_json = Chef::JSONCompat.from_json(@response_raw)
 end
 
-def stub_authentication(controller)
+def stub_authentication(controller,user=nil)
   username = "tester"
 
-  user = Chef::ApiClient.new
-  user.name(username)
-  user.admin(true)
+  unless user
+    user = Chef::ApiClient.new
+    user.name(username)
+    user.admin(true)
+  end
 
   # authenticate_every has a side-effect of setting @auth_user
   controller.stub!(:authenticate_every).and_return(true)

data/spec/spec_model_helper.rb

@@ -53,6 +53,13 @@ def make_runlist(*items)
   res
 end
 
+def make_client(name,admin=false)
+  res = Chef::ApiClient.new
+  res.name(name)
+  res.admin(admin)
+  res
+end
+
 def stub_checksum(checksum, present = true)
   Chef::Checksum.should_receive(:new).with(checksum).and_return do
     obj = stub(Chef::Checksum)

data/spec/unit/clients_controller_spec.rb

@@ -0,0 +1,74 @@
+#
+# Author:: Michael Ivey (<ivey@gweezlebur.com>)
+# Copyright:: Copyright (c) 2012 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 File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_model_helper')
+require 'pp'
+
+describe "Clients Controller" do
+  before do
+    Merb.logger.set_log(StringIO.new)
+  end
+
+  describe "when deleting a client" do
+    before do
+      @client = make_client("deleted_client")
+      @caller = make_client("deleting_client")
+    end
+
+    describe "from an admin client" do
+      before do
+        @caller.admin(true)
+      end
+
+      it "should delete the client" do
+        Chef::ApiClient.stub!(:cdb_load).and_return(@client)
+        @client.should_receive(:cdb_destroy).and_return(true)
+        @controller = mock_request("/clients/deleted_client", {}, {'HTTP_ACCEPT' => "application/json", :request_method => "DELETE"}) do |controller|
+          stub_authentication(controller, @caller)
+        end
+        @response_raw = @controller.body
+        @response_json = Chef::JSONCompat.from_json(@response_raw)
+      end
+    end
+
+    describe "from a non-admin client" do
+      it "should not delete the client" do
+        Chef::ApiClient.stub!(:cdb_load).and_return(@client)
+        lambda {
+          @controller = mock_request("/clients/deleted_client", {}, {'HTTP_ACCEPT' => "application/json", :request_method => "DELETE"}) do |controller|
+            stub_authentication(controller, @caller)
+          end
+        }.should raise_error(Merb::ControllerExceptions::Forbidden, /You are not the correct node.*not an API admin/)
+      end
+    end
+    
+    describe "from the same client as it is trying to delete" do
+      it "should delete the client" do
+        Chef::ApiClient.stub!(:cdb_load).and_return(@client)
+        @client.should_receive(:cdb_destroy).and_return(true)
+        @controller = mock_request("/clients/deleted_client", {}, {'HTTP_ACCEPT' => "application/json", :request_method => "DELETE"}) do |controller|
+          stub_authentication(controller, @client)
+        end
+        @response_raw = @controller.body
+        @response_json = Chef::JSONCompat.from_json(@response_raw)
+      end
+    end
+
+  end
+end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: chef-server-api
 version: !ruby/object:Gem::Version 
-  hash: 127
-  prerelease: 
+  hash: 628631041
+  prerelease: 8
   segments: 
   - 10
-  - 12
+  - 14
   - 0
-  version: 10.12.0
+  - beta
+  - 1
+  version: 10.14.0.beta.1
 platform: ruby
 authors: 
 - Opscode
@@ -15,9 +17,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-18 00:00:00 Z
+date: 2012-07-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +33,11 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  version_requirements: *id001
   name: merb-core
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +49,11 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  version_requirements: *id002
   name: merb-assets
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,11 +65,11 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  version_requirements: *id003
   name: merb-helpers
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,11 +81,11 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  version_requirements: *id004
   name: merb-param-protection
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -93,11 +97,11 @@ dependencies:
         - 1
         - 3
         version: 1.1.3
-  version_requirements: *id005
   name: mixlib-authentication
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -109,11 +113,11 @@ dependencies:
         - 0
         - 3
         version: 0.0.3
-  version_requirements: *id006
   name: dep_selector
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -125,11 +129,11 @@ dependencies:
         - 1
         - 1
         version: 2.1.1
-  version_requirements: *id007
   name: uuidtools
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -139,10 +143,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
   name: thin
-  prerelease: false
-  type: :runtime
+  version_requirements: *id008
 description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
 email: chef@opscode.com
 executables: 
@@ -159,54 +161,55 @@ files:
 - README.rdoc
 - Rakefile
 - config/init.rb
+- config/environments/development.rb
 - config/router.rb
 - config/rack.rb
-- config/environments/development.rb
-- lib/chef-server-api/version.rb
 - lib/chef-server-api.rb
+- lib/chef-server-api/version.rb
 - spec/unit/sandbox_file_spec.rb
 - spec/unit/nodes_controller_environments_spec.rb
-- spec/unit/environments_controller_spec.rb
-- spec/unit/cookbooks_controller_spec.rb
 - spec/unit/nodes_controller_spec.rb
+- spec/unit/clients_controller_spec.rb
+- spec/unit/cookbooks_controller_spec.rb
+- spec/unit/environments_controller_spec.rb
 - spec/spec_helper.rb
 - spec/spec.opts
 - spec/spec_model_helper.rb
-- app/views/layout/application.html.erb
-- app/views/main/index.html.erb
-- app/views/exceptions/not_found.html.erb
-- app/views/exceptions/bad_request.json.erb
-- app/views/exceptions/internal_server_error.html.erb
-- app/views/exceptions/standard_error.html.erb
-- app/views/exceptions/not_acceptable.html.haml
-- app/controllers/search.rb
-- app/controllers/exceptions.rb
-- app/controllers/nodes.rb
+- app/controllers/roles.rb
 - app/controllers/application.rb
-- app/controllers/data_item.rb
+- app/controllers/cookbooks.rb
 - app/controllers/main.rb
-- app/controllers/roles.rb
+- app/controllers/data_item.rb
+- app/controllers/exceptions.rb
+- app/controllers/nodes.rb
+- app/controllers/environments.rb
 - app/controllers/users.rb
 - app/controllers/clients.rb
-- app/controllers/sandboxes.rb
-- app/controllers/environments.rb
 - app/controllers/data_bags.rb
-- app/controllers/cookbooks.rb
+- app/controllers/search.rb
+- app/controllers/sandboxes.rb
+- app/models/sandbox_file.rb
+- app/views/main/index.html.erb
+- app/views/exceptions/standard_error.html.erb
+- app/views/exceptions/internal_server_error.html.erb
+- app/views/exceptions/not_found.html.erb
+- app/views/exceptions/bad_request.json.erb
+- app/views/exceptions/not_acceptable.html.haml
+- app/views/layout/application.html.erb
 - app/helpers/tarball_helper.rb
 - app/helpers/cookbook_version_helper.rb
-- app/models/sandbox_file.rb
-- public/images/avatar.png
 - public/images/indicator.gif
 - public/images/merb.jpg
+- public/images/avatar.png
 - public/stylesheets/base.css
 - public/stylesheets/chef.css
-- public/stylesheets/themes/default/style.css
 - public/stylesheets/themes/kathleene/style.css
-- public/stylesheets/themes/djime-cerulean/style.css
 - public/stylesheets/themes/blue/style.css
-- public/stylesheets/themes/bec-green/style.css
-- public/stylesheets/themes/reidb-greenish/style.css
+- public/stylesheets/themes/djime-cerulean/style.css
 - public/stylesheets/themes/orange/style.css
+- public/stylesheets/themes/default/style.css
+- public/stylesheets/themes/reidb-greenish/style.css
+- public/stylesheets/themes/bec-green/style.css
 - public/stylesheets/themes/bec/style.css
 - bin/chef-server
 - config.ru
@@ -231,12 +234,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: