chef-server-api 0.8.10 → 0.8.14

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "chef-server-api"
-CHEF_SERVER_VERSION="0.8.10"
+CHEF_SERVER_VERSION="0.8.14"
 AUTHOR = "Opscode"
 EMAIL = "chef@opscode.com"
 HOMEPAGE = "http://wiki.opscode.com/display/chef"
@@ -22,16 +22,18 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  
+
   s.add_dependency "merb-core", "~> 1.0.0"
   s.add_dependency "merb-slices", "~> 1.0.0"
   s.add_dependency "merb-assets", "~> 1.0.0"
   s.add_dependency "merb-helpers", "~> 1.0.0"
-  ["thin",
-   "json", 
-   "uuidtools"
-  ].each { |g| s.add_dependency g}
-  
+
+  s.add_dependency "json", "<= 1.4.2"
+
+  s.add_dependency "uuidtools", "~> 2.1.1"
+
+  s.add_dependency "thin"
+
   s.require_path = 'lib'
   s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{config,lib,spec,app,public,stubs}/**/*")
 end

data/app/controllers/application.rb

@@ -88,6 +88,14 @@ class ChefServerApi::Application < Merb::Controller
     end
   end
 
+  def is_admin_or_validator
+    if @auth_user.admin || @auth_user.name == Chef::Config[:validation_client_name]
+      true
+    else
+      raise Unauthorized, "You are not allowed to take this action."
+    end
+  end
+
   def is_correct_node
     if @auth_user.admin || @auth_user.name == params[:id]
       true

data/app/controllers/clients.rb

@@ -23,8 +23,9 @@ class ChefServerApi::Clients < ChefServerApi::Application
   provides :json
 
   before :authenticate_every
-  before :is_admin, :only => :index
-  before :is_correct_node, :only => [ :show, :create, :update, :destroy ]
+  before :is_admin, :only => [ :index, :update, :destroy ]
+  before :is_admin_or_validator, :only => [ :create ]
+  before :is_correct_node, :only => [ :show ]
   
   # GET /clients
   def index
@@ -48,7 +49,13 @@ class ChefServerApi::Clients < ChefServerApi::Application
     exists = true 
     if params.has_key?(:inflated_object)
       params[:name] ||= params[:inflated_object].name
-      params[:admin] ||= params[:inflated_object].admin
+      # We can only get here if we're admin or the validator. Only
+      # allow creating admin clients if we're already an admin.
+      if @auth_user.admin
+        params[:admin] ||= params[:inflated_object].admin
+      else
+        params[:admin] = false
+      end
     end
 
     begin

data/lib/chef-server-api.rb

@@ -75,7 +75,7 @@ if defined?(Merb::Plugins)
         Chef::Certificate.gen_validation_key
 
         # Generate the Web UI Key 
-        Chef::Certificate.gen_validation_key(Chef::Config[:web_ui_client_name], Chef::Config[:web_ui_key])
+        Chef::Certificate.gen_validation_key(Chef::Config[:web_ui_client_name], Chef::Config[:web_ui_key], true)
         
         Chef::Log.info('Loading roles')
         Chef::Role.sync_from_disk_to_couchdb

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 10
-  version: 0.8.10
+  - 14
+  version: 0.8.14
 platform: ruby
 authors: 
 - Opscode
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -07:00
+date: 2010-05-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: merb-slices
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -49,6 +51,7 @@ dependencies:
   name: merb-assets
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -63,6 +66,7 @@ dependencies:
   name: merb-helpers
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -74,33 +78,40 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: thin
+  name: json
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        - 2
+        version: 1.4.2
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: uuidtools
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 1
+        - 1
+        version: 2.1.1
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: uuidtools
+  name: thin
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -177,6 +188,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -184,6 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -193,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.6.1
 signing_key: 
 specification_version: 3
 summary: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.