chef-server-api 0.9.6 → 0.9.8.beta.1

data/Rakefile

@@ -21,7 +21,7 @@ spec = Gem::Specification.new do |s|
   s.version = ChefServerApi::VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE", "config.ru", "development.ru" ]
   s.summary = SUMMARY
   s.description = s.summary
   s.author = AUTHOR
@@ -29,11 +29,12 @@ spec = Gem::Specification.new do |s|
   s.homepage = HOMEPAGE
 
   s.add_dependency "merb-core", "~> 1.1.0"
-  s.add_dependency "merb-slices", "~> 1.1.0"
   s.add_dependency "merb-assets", "~> 1.1.0"
   s.add_dependency "merb-helpers", "~> 1.1.0"
   s.add_dependency "merb-param-protection", "~> 1.1.0"
 
+  s.add_dependency "mixlib-authentication", '>= 1.1.3'
+
   s.add_dependency "json", "<= 1.4.2"
 
   s.add_dependency "uuidtools", "~> 2.1.1"

data/app/controllers/application.rb

@@ -28,28 +28,36 @@ class Application < Merb::Controller
   include Chef::Mixin::Checksum
 
   def authenticate_every
-    authenticator = Mixlib::Authentication::SignatureVerification.new
-
-    auth = begin
-             headers = request.env.inject({ }) { |memo, kv| memo[$2.downcase.gsub(/\-/,"_").to_sym] = kv[1] if kv[0] =~ /^(HTTP_)(.*)/; memo }
-             Chef::Log.debug("Headers in authenticate_every: #{headers.inspect}")
-             username = headers[:x_ops_userid].chomp
-             Chef::Log.info("Authenticating client #{username}")
-             user = Chef::ApiClient.cdb_load(username)
-             Chef::Log.debug("Found API Client: #{user.inspect}")
-             user_key = OpenSSL::PKey::RSA.new(user.public_key)
-             Chef::Log.debug "Authenticating:\n #{user.inspect}\n"
-             # Store this for later..
-             @auth_user = user
-             authenticator.authenticate_user_request(request, user_key)
-           rescue StandardError => se
-             Chef::Log.debug "Authentication failed: #{se}, #{se.backtrace.join("\n")}"
-             nil
-           end
-
-    raise Unauthorized, "Failed to authenticate!" unless auth
-
-    auth
+    begin
+      # Raises an error if required auth headers are missing
+      authenticator = Mixlib::Authentication::SignatureVerification.new(request)
+
+      username = authenticator.user_id
+      Chef::Log.info("Authenticating client #{username}")
+
+      user = Chef::ApiClient.cdb_load(username)
+      user_key = OpenSSL::PKey::RSA.new(user.public_key)
+      Chef::Log.debug "Authenticating Client:\n #{user.inspect}\n"
+
+      # Store this for later..
+      @auth_user = user
+      authenticator.authenticate_request(user_key)
+    rescue Mixlib::Authentication::MissingAuthenticationHeader => e
+      Chef::Log.debug "Authentication failed: #{e.class.name}: #{e.message}\n#{e.backtrace.join("\n")}"
+      raise Unauthorized, "#{e.class.name}: #{e.message}"
+    rescue StandardError => se
+      Chef::Log.debug "Authentication failed: #{se}, #{se.backtrace.join("\n")}"
+      raise Unauthorized, "Failed to authenticate. Ensure that your client key is valid."
+    end
+
+    unless authenticator.valid_request?
+      if authenticator.valid_timestamp?
+        raise Unauthorized, "Failed to authenticate. Ensure that your client key is valid."
+      else
+        raise Unauthorized, "Failed to authenticate. Please synchronize the clock on your client"
+      end
+    end
+    true
   end
 
   def is_admin

data/app/helpers/tarball_helper.rb

@@ -70,10 +70,6 @@ module Merb
       File.join(cookbook_base, cookbook_name)
     end
 
-    def cookbook_tarball_location(cookbook_name)
-      File.join(Chef::Config.cookbook_tarball_path, "#{cookbook_name}.tar.gz")
-    end
-
     def get_or_create_cookbook_tarball_location(cookbook_name)
       tarball_location = cookbook_tarball_location(cookbook_name)
       unless File.exists? tarball_location

data/bin/chef-server

@@ -27,6 +27,13 @@ require "merb-core"
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef/lib/'))
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 
+# Print the version if we have -v or --version
+if ARGV.any? { |arg| arg =~ /\-v|\-\-version/ }
+  require 'chef-server-api/version'
+  puts "Chef Server (API) Version: #{ChefServerApi::VERSION}"
+  exit 1
+end
+
 require 'chef'
 require 'chef-server-api'
 

data/config.ru

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'merb-core'
+require 'chef'
+
+Chef::Config.from_file(File.join("/etc", "chef", "server.rb"))
+
+Merb::Config.setup(:merb_root   => File.expand_path(File.dirname(__FILE__)), 
+                   :environment => 'production',
+                   :fork_for_class_load => false,
+                   :init_file => File.dirname(__FILE__) / "config/init.rb")
+Merb.environment = Merb::Config[:environment]
+Merb.root = Merb::Config[:merb_root]
+Merb::BootLoader.run
+ 
+# Uncomment if your app is mounted at a suburi
+#if prefix = ::Merb::Config[:path_prefix]
+#  use Merb::Rack::PathPrefix, prefix
+#end
+
+run Merb::Rack::Application.new
+

data/config/environments/development.rb

@@ -1,6 +1,30 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2010 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.
+#
+
+Chef::Log.info("")
+Chef::Log.info("*" * 80)
+Chef::Log.info("*   Starting Chef Server in Development Mode.")
+Chef::Log.info("*   Start the server with `-e production` for normal use")
+Chef::Log.info("*" * 80)
+Chef::Log.info("")
+
 Merb::Config.use do |c|
   c[:exception_details] = true
-  c[:reload_classes]    = true 
+  c[:reload_classes]    = true
+  c[:log_level]         = :debug
 end
-
-Merb.logger.level = :debug

data/config/init.rb

@@ -1,24 +1,20 @@
 #
-# ==== Standalone Chefserver configuration
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2008-2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
 #
-# This configuration/environment file is only loaded by bin/slice, which can be
-# used during development of the slice. It has no effect on this slice being
-# loaded in a host application. To run your slice in standalone mode, just
-# run 'slice' from its directory. The 'slice' command is very similar to
-# the 'merb' command, and takes all the same options, including -i to drop
-# into an irb session for example.
+# 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
 #
-# The usual Merb configuration directives and init.rb setup methods apply,
-# including use_orm and before_app_loads/after_app_loads.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# If you need need different configurations for different environments you can
-# even create the specific environment file in config/environments/ just like
-# in a regular Merb application.
-#
-# In fact, a slice is no different from a normal # Merb application - it only
-# differs by the fact that seamlessly integrates into a so called 'host'
-# application, which in turn can override or finetune the slice implementation
-# code and views.
+# 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 'merb-assets'
@@ -51,11 +47,13 @@ Mixlib::Authentication::Log.logger = Ohai::Log.logger = Chef::Log.logger
 use_template_engine :haml
 
 Merb::Config.use do |c|
+  c[:name] = "chef-server (api)"
+  c[:fork_for_class_load] = false
   c[:session_id_key] = '_chef_server_session_id'
   c[:session_secret_key]  = Chef::Config.manage_secret_key
   c[:session_store] = 'cookie'
   c[:exception_details] = true
-  c[:reload_classes] = true
+  c[:reload_classes] = false
   c[:log_level] = Chef::Config[:log_level]
   if Chef::Config[:log_location].kind_of?(String)
     c[:log_file] = Chef::Config[:log_location]

data/config/rack.rb

@@ -1,3 +1,21 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2010 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.
+#
+
 # Correctly set a content length.
 use Rack::ContentLength
 

data/config/router.rb

@@ -1,3 +1,22 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2008-2010 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.
+#
+
 Merb::Router.prepare do
   resources :users
 

data/development.ru

@@ -0,0 +1,30 @@
+require 'rubygems'
+
+$:.unshift(File.dirname(__FILE__) + '/../chef/lib')
+
+require 'merb-core'
+require 'chef'
+
+#Chef::Config.from_file(File.join("/etc", "chef", "server.rb"))
+Chef::Config.from_file(File.dirname(__FILE__) + '/../features/data/config/server.rb')
+
+Chef::Config[:log_location] = '/tmp/fuuu'
+Chef::Config[:log_level] = :debug
+Chef::Log.level = :debug
+
+Merb::Config.setup(:merb_root   => File.expand_path(File.dirname(__FILE__)), 
+                   :environment => 'development',
+                   :fork_for_class_load => false,
+                   :init_file => File.dirname(__FILE__) / "config/init.rb")
+Merb.environment = Merb::Config[:environment]
+Merb.root = Merb::Config[:merb_root]
+
+Merb::BootLoader.run
+ 
+# Uncomment if your app is mounted at a suburi
+#if prefix = ::Merb::Config[:path_prefix]
+#  use Merb::Rack::PathPrefix, prefix
+#end
+
+run Merb::Rack::Application.new
+

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

@@ -1,3 +1,3 @@
 module ChefServerApi
-  VERSION = '0.9.6'
+  VERSION = '0.9.8.beta.1'
 end

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: chef-server-api
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 8
+  - beta
+  - 1
+  version: 0.9.8.beta.1
 platform: ruby
 authors: 
 - Opscode
@@ -14,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -07:00
+date: 2010-07-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +35,7 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: merb-slices
+  name: merb-assets
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,7 +50,7 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: merb-assets
+  name: merb-helpers
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,7 +65,7 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: merb-helpers
+  name: merb-param-protection
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,17 +80,17 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: merb-param-protection
+  name: mixlib-authentication
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        - 3
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: *id005
@@ -144,6 +146,8 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 - LICENSE
+- config.ru
+- development.ru
 files: 
 - LICENSE
 - README.rdoc
@@ -192,6 +196,8 @@ files:
 - public/stylesheets/themes/orange/style.css
 - public/stylesheets/themes/reidb-greenish/style.css
 - bin/chef-server
+- config.ru
+- development.ru
 has_rdoc: true
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
@@ -212,11 +218,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: