Merge branch 'master' into imbriaco/chef-248

Author: adamhjk

chef-server-slice/app/controllers/application.rb

@@ -22,6 +22,8 @@
 
 class ChefServerSlice::Application < Merb::Controller
 
+  include Chef::Mixin::Checksum
+
   controller_for_slice
 
   # Generate the absolute url for a slice - takes the slice's :path_prefix into account.
@@ -168,7 +170,8 @@ def load_all_files(segment)
         file_name = mo[1]
         files << { 
           :cookbook => cookbook.name, 
-          :name => file_name
+          :name => file_name,
+          :checksum => checksum(sf)
         }
       end
     end

chef-server-slice/app/controllers/cookbook_files.rb

@@ -45,15 +45,19 @@ def index
 
   def show
     only_provides :json
-    to_send = find_preferred_file(
-      params[:cookbook_id], 
-      :remote_file, 
-      params[:id], 
-      params[:fqdn], 
-      params[:platform], 
-      params[:version]
-    )
-    raise NotFound, "Cannot find a suitable file!" unless to_send
+    begin
+      to_send = find_preferred_file(
+        params[:cookbook_id], 
+        :remote_file, 
+        params[:id], 
+        params[:fqdn], 
+        params[:platform], 
+        params[:version]
+      )
+    rescue Chef::Exceptions::FileNotFound
+      raise NotFound, "Cannot find a suitable file!"
+    end
+
     current_checksum = checksum(to_send)
     Chef::Log.debug("old sum: #{params[:checksum]}, new sum: #{current_checksum}") 
     if current_checksum == params[:checksum]

chef-server-slice/app/controllers/openid_consumer.rb

@@ -28,23 +28,22 @@ class ChefServerSlice::OpenidConsumer < ChefServerSlice::Application
   def index
     if request.xhr?
       render :layout => false
-    else  
+    else
       render
     end
   end
-  
+
   def start
     oid = params[:openid_identifier]
     providers = Chef::Config[:openid_providers]
-    raise(Unauthorized, "Sorry, #{openid} is not an authorized OpenID.") unless is_authorized_openid_identifier?(oid, providers)    
-    raise(Unauthorized, "Sorry, #{openid} is not an allowed OpenID Provider.") unless is_valid_openid_provider?(oid,providers)
-    
+    raise(Unauthorized, "Sorry, #{oid} is not an allowed OpenID Provider.") unless is_valid_openid_provider?(oid,providers)
+
     begin
       oidreq = consumer.begin(oid)
     rescue OpenID::OpenIDError => e
       raise BadRequest, "Discovery failed for #{params[:openid_identifier]}: #{e}"
     end
-    
+
     return_to = absolute_slice_url(:openid_consumer_complete)
     realm = absolute_slice_url(:openid_consumer)
 
@@ -57,9 +56,12 @@ def start
   end
 
   def login
+    oid = params[:openid_identifier]
+    authorized_openids = Chef::Config[:authorized_openid_identifiers]
+    raise(Unauthorized, "Sorry, #{oid} is not an authorized OpenID.") unless is_authorized_openid_identifier?(oid, authorized_openids)
     start
   end
-  
+
   def complete
     # FIXME - url_for some action is not necessarily the current URL.
     current_url = absolute_slice_url(:openid_consumer_complete)
@@ -96,17 +98,17 @@ def logout
   end
 
   private
-  #      
-  #    
-  
+  #
+  #
+
   # Returns true if the openid is at a valid provider, based on whether :openid_providers is
   # defined.  Raises an exception if it is not an allowed provider.
   def is_valid_openid_provider?(openid,providers)
     (providers && providers.detect {|p| openid =~ /^https?:\/\/#{p}/ or openid =~ /^#{p}/}) || true
    end
 
-  def is_authorized_openid_identifier?(openid,providers)
-    (providers && providers.detect { |p| openid==p }) || true
+  def is_authorized_openid_identifier?(openid,authorized_openids)
+    (authorized_openids && authorized_openids.detect { |p| openid==p })
   end
 
   def consumer
@@ -117,5 +119,5 @@ def consumer
                                          OpenID::Store::Filesystem.new(Chef::Config[:openid_cstore_path])
                                        end)
   end
-                                       
+
 end

chef-server-slice/app/controllers/search_entries.rb

@@ -26,7 +26,7 @@ class ChefServerSlice::SearchEntries < ChefServerSlice::Application
 
   def index
     @s = Chef::Search.new
-    @entries = @s.search(params[:search_id], "?*")
+    @entries = @s.search(params[:search_id])
     display @entries
   end
 
@@ -57,7 +57,7 @@ def update
 
   def destroy
     @s = Chef::Search.new
-    @entries = @s.search(params[:id], "?*")
+    @entries = @s.search(params[:id])
     @entries.each do |entry|
       Chef::Queue.send_msg(:queue, :remove, entry)
     end

chef-server-slice/app/views/nodes/_node.html.haml

@@ -10,6 +10,16 @@
       - @node.recipes.each_with_index do |recipe, index|
         %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
           %td{:colspan => 2}= recipe
+  %table.table
+    %tr
+      %th.first Tags
+      %th.last &nbsp
+    - if @node[:tags].empty?
+      %tr
+        %td{:colspan => 2} This node has no tags applied, double click to add one.
+    - else
+      %tr
+        %td{:colspan => 2}= @node[:tags].join(", ")
   %table.table
     %tr
       %th.first Attributes
@@ -19,4 +29,5 @@
         %td{:colspan => 2} This node has no attributes, double click to add one.
     - else
       %tr
-        %td{:colspan => 2}= build_tree(@node)
+        %td{:colspan => 2}= build_tree(@node)
+

chef-server-slice/app/views/openid_consumer/index.html.haml

@@ -2,7 +2,7 @@
   .content
     %h2.title Login
     .inner
-      %form.form{ :method => "get", "accept-charset" => "UTF-8", :action => slice_url(:openid_consumer_start) }
+      %form.form{ :method => "get", "accept-charset" => "UTF-8", :action => slice_url(:openid_consumer_login) }
         .group
           .text_field= text_field :openid_identifier
         .group

chef-server-slice/lib/chef-server-slice.rb

@@ -94,12 +94,12 @@ def self.setup_router(scope)
       scope.match("/cookbooks/_definition_files").to(:controller => "cookbooks", :action => "definition_files")
       scope.match("/cookbooks/_library_files").to(:controller => "cookbooks", :action => "library_files")
 
-      scope.match("/cookbooks/:cookbook_id/templates").to(:controller => "cookbook_templates", :action => "index")
-      scope.match("/cookbooks/:cookbook_id/libraries").to(:controller => "cookbook_libraries", :action => "index")
-      scope.match("/cookbooks/:cookbook_id/definitions").to(:controller => "cookbook_definitions", :action => "index")
-      scope.match("/cookbooks/:cookbook_id/recipes").to(:controller => "cookbook_recipes", :action => "index")
-      scope.match("/cookbooks/:cookbook_id/attributes").to(:controller => "cookbook_attributes", :action => "index")
-      scope.match("/cookbooks/:cookbook_id/files").to(:controller => "cookbook_files", :action => "index")
+      scope.match("/cookbooks/:cookbook_id/templates", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_templates", :action => "index")
+      scope.match("/cookbooks/:cookbook_id/libraries", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_libraries", :action => "index")
+      scope.match("/cookbooks/:cookbook_id/definitions", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_definitions", :action => "index")
+      scope.match("/cookbooks/:cookbook_id/recipes", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_recipes", :action => "index")
+      scope.match("/cookbooks/:cookbook_id/attributes", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_attributes", :action => "index")
+      scope.match("/cookbooks/:cookbook_id/files", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_files", :action => "index")
 
       scope.resources :cookbooks
       scope.resources :registrations, :controller => "openid_register"

chef-server/bin/chef-indexer

@@ -31,7 +31,7 @@ config = {
   :config_file => "/etc/chef/server.rb",
 }
 opts = OptionParser.new do |opts|
-  opts.banner = "Usage: #{$0} [-d DIR|-r FILE] (options)"
+  opts.banner = "Usage: #{$0} (options)"
   opts.on("-c CONFIG", "--config CONFIG", "The Chef Config file to use") do |c|
     config[:config_file] = c
   end
@@ -64,6 +64,8 @@ end
 Chef::Config.from_file(config[:config_file])
 Chef::Config.configure { |c| c.merge!(config) }
 
+Chef::Daemon.change_privilege
+
 if Chef::Config[:daemonize]
   unless Chef::Config[:log_location].is_a? IO
     Chef::Log.init(Chef::Config[:log_location])

chef-server/contrib/el/chef-indexer.config

@@ -0,0 +1,10 @@
+#
+# Chef Server Config File
+#
+
+log_level          :info
+search_index_path  "/var/lib/chef/search_index"
+
+Chef::Log::Formatter.show_time = false
+
+pid_file           "/var/run/chef/chef-indexer.pid"

chef-server/contrib/el/chef-indexer.init

@@ -0,0 +1,76 @@
+#!/bin/bash
+# Startup script for chef-indexer 
+#
+# chkconfig: - 75 25
+# description: Server component of the Chef systems integration framework.
+# processname: chef-indexer
+#
+# config: /etc/sysconfig/chef-indexer
+# pidfile: /var/run/chef/chef-indexer.pid
+
+# Source function library
+. /etc/init.d/functions
+
+[ -f /etc/sysconfig/chef-indexer ] && . /etc/sysconfig/chef-indexer
+
+prog="chef-indexer"
+PIDFILE=/var/run/chef/chef-indexer.pid
+LOCKFILE=/var/lock/subsys/$prog
+CONFIG=/etc/chef/indexer.rb
+USER="chef"
+GROUP="chef"
+LOGFILE=/var/log/chef/chef-indexer.log
+OPTIONS=
+
+start() {
+    echo -n "Starting $prog:"
+    daemon chef-indexer -d -c "$CONFIG" -u "$USER" -g "$GROUP" -L "$LOGFILE" "$OPTIONS" ">/dev/null"
+    RETVAL=$?
+    echo
+    [ $RETVAL -eq 0 ] && touch ${LOCKFILE}
+    return $RETVAL
+}
+
+stop() {
+    echo -n "Stopping $prog: "
+    if [ -f $PIDFILE ]; then
+        killproc chef-indexer
+        RETVAL=$?
+        if [ $RETVAL -ne 0 ]; then
+            failure;
+        fi;
+    else
+        RETVAL=1
+        failure;
+    fi
+    rm -f $LOCKFILE
+    echo
+    return $RETVAL
+}
+
+case "$1" in
+  start)
+        start
+        ;;
+  stop)
+        stop
+        ;;
+  restart)
+        stop
+        start
+        ;;
+  condrestart)
+        if [ -f $LOCKFILE ]; then
+            stop
+            start
+        fi
+        ;;
+  status)
+        status chef-indexer
+        ;;
+  *)
+    echo "Usage: $0 {start|stop|restart|condrestart|status}"
+    exit 1
+esac
+
+exit $RETVAL