chef-server-api 0.8.16 → 0.9.0.a3

data/app/controllers/users.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -18,17 +18,17 @@
 
 require File.join("chef", "webui_user")
 
-class ChefServerApi::Users < ChefServerApi::Application
+class Users < Application
   provides :json
- 
+
   before :authenticate_every
-  
+
   # GET to /users
   def index
-    @user_list = Chef::WebUIUser.cdb_list 
-    display(@user_list.inject({}) { |r,n| r[n] = absolute_slice_url(:user, n); r })
-  end 
-  
+    @user_list = Chef::WebUIUser.cdb_list
+    display(@user_list.inject({}) { |r,n| r[n] = absolute_url(:user, n); r })
+  end
+
   # GET to /users/:id
   def show
     begin
@@ -38,7 +38,7 @@ class ChefServerApi::Users < ChefServerApi::Application
     end
     display @user
   end
-  
+
   # PUT to /users/:id
   def update
     begin
@@ -50,7 +50,7 @@ class ChefServerApi::Users < ChefServerApi::Application
     @user.cdb_save
     display(@user)
   end
-  
+
   # POST to /users
   def create
     @user = params["inflated_object"]
@@ -60,18 +60,18 @@ class ChefServerApi::Users < ChefServerApi::Application
       @user.cdb_save
       self.status = 201
     else
-      raise Conflict, "User already exists" 
+      raise Conflict, "User already exists"
     end
-    display({ :uri => absolute_slice_url(:user, @user.name) })
-  end 
-  
+    display({ :uri => absolute_url(:user, @user.name) })
+  end
+
   def destroy
     begin
       @user = Chef::WebUIUser.cdb_load(params[:id])
-    rescue Chef::Exceptions::CouchDBNotFound => e 
+    rescue Chef::Exceptions::CouchDBNotFound => e
       raise NotFound, "Cannot load user #{params[:id]}"
     end
     @user.cdb_destroy
     display @user
-  end 
+  end
 end

data/app/helpers/tarball_helper.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -17,66 +17,96 @@
 #
 
 module Merb
-  module ChefServerApi
-    module TarballHelper
+  module TarballHelper
 
-      class FileParameterException < StandardError ; end
+    class FileParameterException < StandardError ; end
 
-      def validate_file_parameter(cookbook_name, file_param)
-        raise FileParameterException, "missing required parameter: file" unless file_param
-        raise FileParameterException, "invalid parameter: file must be a File" unless file_param.respond_to?(:has_key?) && file_param[:tempfile].respond_to?(:read)
-        tarball_path = file_param[:tempfile].path
-        raise FileParameterException, "invalid tarball: (try creating with 'tar czf cookbook.tar.gz cookbook/')" unless system("tar", "tzf", tarball_path)
-        entry_roots = `tar tzf #{tarball_path}`.split("\n").map{|e|(e.split('/')-['.']).first}.uniq
-        raise FileParameterException, "invalid tarball: tarball root must contain #{cookbook_name}" unless entry_roots.include?(cookbook_name)
-      end
+    def validate_file_parameter(cookbook_name, file_param)
+      raise FileParameterException, "missing required parameter: file" unless file_param
+      raise FileParameterException, "invalid parameter: file must be a File" unless file_param.respond_to?(:has_key?) && file_param[:tempfile].respond_to?(:read)
+      tarball_path = file_param[:tempfile].path
+      raise FileParameterException, "invalid tarball: (try creating with 'tar czf cookbook.tar.gz cookbook/')" unless system("tar", "tzf", tarball_path)
+      entry_roots = `tar tzf #{tarball_path}`.split("\n").map{|e|(e.split('/')-['.']).first}.uniq
+      raise FileParameterException, "invalid tarball: tarball root must contain #{cookbook_name}" unless entry_roots.include?(cookbook_name)
+    end
+    
+    def sandbox_base
+      Chef::Config.sandbox_path
+    end
+    
+    def sandbox_location(sandbox_guid)
+      File.join(sandbox_base, sandbox_guid)
+    end
+    
+    def sandbox_checksum_location(sandbox_guid, checksum)
+      File.join(sandbox_location(sandbox_guid), checksum)
+    end
 
-      def cookbook_base
-        [Chef::Config.cookbook_path].flatten.first
-      end
-      
-      def cookbook_location(cookbook_name)
-        File.join(cookbook_base, cookbook_name)
-      end
+    def checksum_base
+      Chef::Config.checksum_path
+    end
+    
+    def checksum_location(checksum)
+      File.join(checksum_base, checksum[0..1], checksum)
+    end
+    
+    def cookbook_base
+      [Chef::Config.cookbook_path].flatten.first
+    end
+    
+    def cookbook_location(cookbook_name)
+      File.join(cookbook_base, cookbook_name)
+    end
+    
+    def cookbook_base
+      [Chef::Config.cookbook_path].flatten.first
+    end
+    
+    def cookbook_location(cookbook_name)
+      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
-          args = ["tar", "-C", cookbook_base, "-czf", tarball_location, cookbook_name]
-          Chef::Log.debug("Tarball for #{cookbook_name} not found, so creating at #{tarball_location} with '#{args.join(' ')}'")
-          FileUtils.mkdir_p(Chef::Config.cookbook_tarball_path)
-          system(*args)
-        end
-        tarball_location
-      end
+    def cookbook_location(cookbook_name)
+      File.join(cookbook_base, cookbook_name)
+    end
 
-      def expand_tarball_and_put_in_repository(cookbook_name, file)
-        # untar cookbook tarball into tempdir
-        tempdir = File.join("#{file.path}.data")
-        Chef::Log.debug("Creating #{tempdir} and untarring #{file.path} into it")
-        FileUtils.mkdir_p(tempdir)
-        raise "Could not untar file" unless system("tar", "xzf", file.path, "-C", tempdir)
-        
-        cookbook_path = cookbook_location(cookbook_name)
-        tarball_path = cookbook_tarball_location(cookbook_name)
-        
-        # clear any existing cookbook components and move tempdir into the repository
-        Chef::Log.debug("Moving #{tempdir} to #{cookbook_path}")
-        FileUtils.rm_rf(cookbook_path)
-        FileUtils.mkdir_p(cookbook_path)
-        Dir[File.join(tempdir, cookbook_name, "*")].each{|e| FileUtils.mv(e, cookbook_path)}
+    def cookbook_tarball_location(cookbook_name)
+      File.join(Chef::Config.cookbook_tarball_path, "#{cookbook_name}.tar.gz")
+    end
 
-        # clear the existing tarball (if exists) and move the downloaded tarball to the cache
-        Chef::Log.debug("Moving #{file.path} to #{tarball_path}")
+    def get_or_create_cookbook_tarball_location(cookbook_name)
+      tarball_location = cookbook_tarball_location(cookbook_name)
+      unless File.exists? tarball_location
+        args = ["tar", "-C", cookbook_base, "-czf", tarball_location, cookbook_name]
+        Chef::Log.debug("Tarball for #{cookbook_name} not found, so creating at #{tarball_location} with '#{args.join(' ')}'")
         FileUtils.mkdir_p(Chef::Config.cookbook_tarball_path)
-        FileUtils.rm_f(tarball_path)
-        FileUtils.mv(file.path, tarball_path)
+        system(*args)
       end
-      
+      tarball_location
     end
+
+    def expand_tarball_and_put_in_repository(cookbook_name, file)
+      # untar cookbook tarball into tempdir
+      tempdir = File.join("#{file.path}.data")
+      Chef::Log.debug("Creating #{tempdir} and untarring #{file.path} into it")
+      FileUtils.mkdir_p(tempdir)
+      raise "Could not untar file" unless system("tar", "xzf", file.path, "-C", tempdir)
+
+      cookbook_path = cookbook_location(cookbook_name)
+      tarball_path = cookbook_tarball_location(cookbook_name)
+
+      # clear any existing cookbook components and move tempdir into the repository
+      Chef::Log.debug("Moving #{tempdir} to #{cookbook_path}")
+      FileUtils.rm_rf(cookbook_path)
+      FileUtils.mkdir_p(cookbook_path)
+      Dir[File.join(tempdir, cookbook_name, "*")].each{|e| FileUtils.mv(e, cookbook_path)}
+
+      # clear the existing tarball (if exists) and move the downloaded tarball to the cache
+      Chef::Log.debug("Moving #{file.path} to #{tarball_path}")
+      FileUtils.mkdir_p(Chef::Config.cookbook_tarball_path)
+      FileUtils.rm_f(tarball_path)
+      FileUtils.mv(file.path, tarball_path)
+    end
+
   end
 end

data/app/views/layout/chef_server_api.html.haml

@@ -8,7 +8,7 @@
   %body
     #container
       #header
-        %h1= link_to "Chef REST API", absolute_slice_url(:top)
+        %h1= link_to "Chef REST API", absolute_url(:top)
       #main-navigation
         .clear
       #wrapper

data/bin/chef-server

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+#
+# ./chef-server - Serving up piping hot infrastructure!
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 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.
+
+# Based on the 'merb' command, by Ezra
+
+require "rubygems"
+require "merb-core"
+
+# Load chef and chef-server-api from source rather than gem, if present
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef/lib/'))
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
+
+require 'chef'
+require 'chef-server-api'
+
+# Ensure the chef gem we load is the same version as the chef server
+unless defined?(Chef)
+  gem "chef", "=" + CHEF_SERVER_VERSION
+  require 'chef'
+end
+
+# Print the help message if our argv looks fishy
+if ARGV[0] && ARGV[0] =~ /^[^-]/
+  ARGV.push "-H"
+end
+
+# Default to thin
+unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
+  ARGV.push *%w[-a thin]
+end
+
+# Tell merb where to root
+ARGV.push *[ "-m", CHEF_SERVER_API_ROOT]
+
+# attempt to find the user and group that this process will become. Fixes CHEF-1015
+if (index = ARGV.index("-u"))
+  Chef::Config[:signing_ca_user] = ARGV[index+1]
+end
+if (index = ARGV.index("-G"))
+  Chef::Config[:signing_ca_group] = ARGV[index+1]
+end
+
+# Find and load the config
+if index = ARGV.index("-C")
+  config = ARGV[index+1]
+  ARGV.delete("-C")
+  ARGV.delete(config)
+  Chef::Config.from_file(File.expand_path(config))
+else
+  Chef::Config.from_file(
+    File.join("/etc", "chef", "server.rb")
+  )
+end
+
+Chef::Log.init(Chef::Config[:log_location])
+Chef::Log.level = Chef::Config[:log_level]
+
+Merb.start

data/config/environments/development.rb

@@ -0,0 +1,6 @@
+Merb::Config.use do |c|
+  c[:exception_details] = true
+  c[:reload_classes]    = true 
+end
+
+Merb.logger.level = :debug

data/config/init.rb

@@ -1,19 +1,19 @@
 #
 # ==== Standalone Chefserver configuration
-# 
-# This configuration/environment file is only loaded by bin/slice, which can be 
+#
+# 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 
+# the 'merb' command, and takes all the same options, including -i to drop
 # into an irb session for example.
 #
 # The usual Merb configuration directives and init.rb setup methods apply,
 # including use_orm and before_app_loads/after_app_loads.
 #
-# If you need need different configurations for different environments you can 
+# 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 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'
@@ -21,25 +21,68 @@
 # code and views.
 #
 
-$: << File.join(File.dirname(__FILE__), "..", "..", "chef", "lib")
+require 'merb-assets'
+require 'merb-helpers'
+require 'merb-param-protection'
+
+require 'bunny'
+require 'uuidtools'
+require 'ohai'
+require 'openssl'
+
 require 'chef'
+require 'chef/role'
+require 'chef/data_bag'
+require 'chef/data_bag_item'
+require 'chef/api_client'
+require 'chef/webui_user'
+require 'chef/certificate'
+require 'chef/data_bag'
+require 'chef/data_bag_item'
+require 'chef/cookbook_version'
+require 'chef/sandbox'
+require 'chef/checksum'
 
-merb_gems_version = " > 1.0"
-dependency "merb-assets", merb_gems_version
-dependency "merb-helpers", merb_gems_version
-dependency "chef", :immediate=>true unless defined?(Chef)
+require 'mixlib/authentication'
 
-require 'rubygems'
+Mixlib::Authentication::Log.logger = Ohai::Log.logger = Chef::Log.logger
+
+# Only used for the error page when visiting with a browser...
+use_template_engine :haml
 
 Merb::Config.use do |c|
   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] = true
   c[:log_level] = Chef::Config[:log_level]
   if Chef::Config[:log_location].kind_of?(String)
     c[:log_file] = Chef::Config[:log_location]
   end
 end
 
+unless Merb::Config.environment == "test"
+  # create the couch design docs for nodes, roles, and databags
+  Chef::CouchDB.new.create_id_map
+  Chef::Node.create_design_document
+  Chef::Role.create_design_document
+  Chef::DataBag.create_design_document
+  Chef::ApiClient.create_design_document
+  Chef::WebUIUser.create_design_document
+  Chef::CookbookVersion.create_design_document
+  Chef::Sandbox.create_design_document
+  Chef::Checksum.create_design_document
+
+  # Create the signing key and certificate
+  Chef::Certificate.generate_signing_ca
+
+  # Generate the validation key
+  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], true)
+
+  Chef::Log.info('Loading roles')
+  Chef::Role.sync_from_disk_to_couchdb
+end

data/config/rack.rb

@@ -0,0 +1,5 @@
+# Correctly set a content length.
+use Rack::ContentLength
+
+# this is our main merb application
+run Merb::Rack::Application.new

data/config/router.rb

@@ -1,6 +1,82 @@
-# This file is here so slice can be testing as a stand alone application.
+Merb::Router.prepare do
+  resources :users
 
-#Merb::Router.prepare do
-#  resources :roles
-#  ... 
-#end
+  # Nodes
+  resources :nodes, :id => /[^\/]+/
+  match('/nodes/:id/cookbooks',
+        :id => /[^\/]+/,
+        :method => 'get').
+    to(:controller => "nodes", :action => "cookbooks")
+  # Roles
+  resources :roles
+
+  # Status
+  match("/status").to(:controller => "status", :action => "index").name(:status)
+
+  # Clients
+  match("/clients", :method=>"post").to(:controller=>'clients', :action=>'create')
+  match("/clients", :method=>"get").to(:controller=>'clients', :action=>'index').name(:clients)
+  match("/clients/:id", :id => /[\w\.-]+/, :method=>"get").to(:controller=>'clients', :action=>'show').name(:client)
+  match("/clients/:id", :id => /[\w\.-]+/, :method=>"put").to(:controller=>'clients', :action=>'update')
+  match("/clients/:id", :id => /[\w\.-]+/, :method=>"delete").to(:controller=>'clients', :action=>'destroy')
+
+  # Search
+  resources :search
+  match('/search/reindex', :method => 'post').to(:controller => "search", :action => "reindex")
+
+  # Cookbooks
+  match('/nodes/:id/cookbooks', :method => 'get').to(:controller => "nodes", :action => "cookbooks")
+
+  match("/cookbooks",
+        :method => 'get'
+        ).to(:controller => "cookbooks", :action => "index")
+
+  match("/cookbooks/:cookbook_name/:cookbook_version",
+        :method => 'put',
+        :cookbook_name => /[\w\.]+/,
+        :cookbook_version => /\d+\.\d+\.\d+/
+        ).to(:controller => "cookbooks", :action => "update")
+
+  match("/cookbooks/:cookbook_name/:cookbook_version",
+        :method => 'get',
+        :cookbook_name => /[\w\.]+/,
+        :cookbook_version => /(\d+\.\d+\.\d+|_latest)/
+        ).to(:controller => "cookbooks", :action => "show")
+
+  match("/cookbooks/:cookbook_name/:cookbook_version",
+        :method => 'delete',
+        :cookbook_name => /[\w\.]+/,
+        :cookbook_version => /(\d+\.\d+\.\d+|_latest)/
+        ).to(:controller => "cookbooks", :action => "destroy")
+
+  match("/cookbooks/:cookbook_name",
+        :method => 'get',
+        :cookbook_name => /[\w\.]+/
+        ).to(:controller => "cookbooks", :action => "show_versions").name(:cookbook)
+
+  match("/cookbooks/:cookbook_name/:cookbook_version/files/:checksum",
+        :cookbook_name => /[\w\.]+/,
+        :cookbook_version => /(\d+\.\d+\.\d+|_latest)/
+        ).to(
+             :controller => "cookbooks",
+             :action => "show_file"
+             ).name(:cookbook_file)
+
+  # Sandbox
+  match('/sandboxes', :method => 'get').to(:controller => "sandboxes", :action => "index").name(:sandboxes)
+  match('/sandboxes', :method => 'post').to(:controller => "sandboxes", :action => "create")
+  match('/sandboxes/:sandbox_id', :method => 'get', :sandbox_id => /[\w\.]+/).to(:controller => "sandboxes", :action => "show").name(:sandbox)
+  match('/sandboxes/:sandbox_id', :method => 'put', :sandbox_id => /[\w\.]+/).to(:controller => "sandboxes", :action => "update")
+  match('/sandboxes/:sandbox_id/:checksum', :method => 'put', :sandbox_id => /[\w\.]+/, :checksum => /[\w\.]+/).to(:controller => "sandboxes", :action => "upload_checksum").name(:sandbox_checksum)
+  match('/sandboxes/:sandbox_id/:checksum', :method => 'get', :sandbox_id => /[\w\.]+/, :checksum => /[\w\.]+/).to(:controller => "sandboxes", :action => "download_checksum")
+
+  # Data
+  match("/data/:data_bag_id/:id", :method => 'get').to(:controller => "data_item", :action => "show").name("data_bag_item")
+  match("/data/:data_bag_id", :method => 'post').to(:controller => "data_item", :action => "create").name("create_data_bag_item")
+  match("/data/:data_bag_id/:id", :method => 'put').to(:controller => "data_item", :action => "update").name("update_data_bag_item")
+  match("/data/:data_bag_id/:id", :method => 'delete').to(:controller => "data_item", :action => "destroy").name("destroy_data_bag_item")
+  resources :data, :controller => "data_bags"
+
+  match('/').to(:controller => 'main', :action =>'index').name(:top)
+
+end