chef-server-webui 0.8.16 → 0.9.0.a3

data/Rakefile

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + '/lib/chef-server-webui/version'
+
 require 'rubygems'
 require 'rake/gempackagetask'
 
@@ -5,7 +7,6 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "chef-server-webui"
-CHEF_SERVER_VERSION="0.8.16"
 AUTHOR = "Opscode"
 EMAIL = "chef@opscode.com"
 HOMEPAGE = "http://wiki.opscode.com/display/chef"
@@ -13,7 +14,7 @@ SUMMARY = "A systems integration framework, built to bring the benefits of confi
 
 spec = Gem::Specification.new do |s|
   s.name = GEM_NAME
-  s.version = CHEF_SERVER_VERSION
+  s.version = ChefServerWebui::VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
   s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
@@ -23,17 +24,20 @@ spec = Gem::Specification.new do |s|
   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"
-  s.add_dependency "merb-haml", "~> 1.0.0"
-  s.add_dependency "merb-param-protection", "~> 1.0.0"
+  s.add_dependency "merb-core", "~> 1.0"
+  s.add_dependency "merb-slices", "~> 1.0"
+  s.add_dependency "merb-assets", "~> 1.0"
+  s.add_dependency "merb-helpers", "~> 1.0"
+  s.add_dependency "merb-haml", "~> 1.0"
+  s.add_dependency "merb-param-protection", "~> 1.0"
 
   s.add_dependency "json", "<= 1.4.2"
 
   %w{thin haml ruby-openid coderay}.each { |g| s.add_dependency g}
 
+  s.bindir       = "bin"
+  s.executables  = %w( chef-server-webui )
+  
   s.require_path = 'lib'
   s.files = %w(LICENSE README.rdoc Rakefile config.ru) + Dir.glob("{bin,config,lib,spec,app,public,stubs}/**/*")
 end
@@ -44,12 +48,12 @@ end
 
 desc "Install the gem"
 task :install => :package do
-  sh %{gem install pkg/#{GEM_NAME}-#{CHEF_SERVER_VERSION} --no-rdoc --no-ri}
+  sh %{gem install pkg/#{GEM_NAME}-#{ChefServerWebui::VERSION} --no-rdoc --no-ri}
 end
 
 desc "Uninstall the gem"
 task :uninstall do
-  sh %{gem uninstall #{GEM_NAME} -x -v #{CHEF_SERVER_VERSION} }
+  sh %{gem uninstall #{GEM_NAME} -x -v #{ChefServerWebui::VERSION} }
 end
 
 desc "Create a gemspec file"

data/app/controllers/application.rb

@@ -8,9 +8,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.
@@ -21,67 +21,42 @@
 require "chef" / "mixin" / "checksum"
 require "chef" / "cookbook_loader"
 
-class ChefServerWebui::Application < Merb::Controller
+class 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.
-  #
-  # @param slice_name<Symbol> 
-  #   The name of the slice - in identifier_sym format (underscored).
-  # @param *args<Array[Symbol,Hash]> 
-  #   There are several possibilities regarding arguments:
-  #   - when passing a Hash only, the :default route of the current 
-  #     slice will be used
-  #   - when a Symbol is passed, it's used as the route name
-  #   - a Hash with additional params can optionally be passed
-  # 
-  # @return <String> A uri based on the requested slice.
-  #
-  # @example absolute_slice_url(:awesome, :format => 'html')
-  # @example absolute_slice_url(:forum, :posts, :format => 'xml')          
-  def absolute_slice_url(slice_name, *args)
-    options  = extract_options_from_args!(args) || {}
-    protocol = options.delete(:protocol) || request.protocol
-    host     = options.delete(:host) || request.host
-    
-    protocol + "://" + host + slice_url(slice_name,*args)
-  end
-  
   # Check if the user is logged in and if the user still exists
   def login_required
    if session[:user]
      begin
        Chef::WebUIUser.load(session[:user]) rescue (raise NotFound, "Cannot find User #{session[:user]}, maybe it got deleted by an Administrator.")
-     rescue   
+     rescue
        logout_and_redirect_to_login
-     else 
+     else
        return session[:user]
-     end 
-   else  
+     end
+   else
      self.store_location
      throw(:halt, :access_denied)
    end
   end
-  
+
   def cleanup_session
     [:user,:level].each { |n| session.delete(n) }
-  end 
-  
+  end
+
   def logout_and_redirect_to_login
     cleanup_session
     @user = Chef::WebUIUser.new
-    redirect(slice_url(:users_login), {:message => { :error => $! }, :permanent => true})
-  end 
-  
-  
+    redirect(url(:users_login), {:message => { :error => $! }, :permanent => true})
+  end
+
+
   def is_admin(name)
     user = Chef::WebUIUser.load(name)
     return user.admin
   end
-  
+
   #return true if there is only one admin left, false otehrwise
   def is_last_admin
     count = 0
@@ -95,32 +70,12 @@ class ChefServerWebui::Application < Merb::Controller
     end
     true
   end
-  
+
   #whether or not the user should be able to edit a user's admin status
   def edit_admin
     is_admin(params[:user_id]) ? (!is_last_admin) : true
-  end 
-  
-  def authorized_node
-  #  if session[:level] == :admin
-  #    Chef::Log.debug("Authorized as Administrator")
-  #    true
-  #  elsif session[:level] == :node
-  #    Chef::Log.debug("Authorized as node")
-  #    if session[:node_name] == params[:id].gsub(/\./, '_')
-  #      true
-  #    else
-  #      raise(
-  #        Unauthorized,
-  #        "You are not the correct node for this action: #{session[:node_name]} instead of #{params[:id]}"
-  #      )
-  #    end
-  #  else
-  #    Chef::Log.debug("Unauthorized")
-  #    raise Unauthorized, "You are not allowed to take this action."
-  #  end
   end
-  
+
   def authorized_user
     if session[:level] == :admin
       Chef::Log.debug("Authorized as Administrator")
@@ -128,9 +83,9 @@ class ChefServerWebui::Application < Merb::Controller
     else
       Chef::Log.debug("Unauthorized")
       raise Unauthorized, "The current user is not an Administrator, you can only Show and Edit the user itself. To control other users, login as an Administrator."
-    end 
-  end 
-  
+    end
+  end
+
   # Store the URI of the current request in the session.
   #
   # We can return to this location by calling #redirect_back_or_default.
@@ -145,18 +100,18 @@ class ChefServerWebui::Application < Merb::Controller
     session[:return_to] = nil
     redirect loc
   end
-  
+
   def access_denied
     case content_type
     when :html
       store_location
-      redirect slice_url(:users_login), :message => { :error => "You don't have access to that, please login."}
+      redirect url(:users_login), :message => { :error => "You don't have access to that, please login."}
     else
       raise Unauthorized, "You must authenticate first!"
     end
   end
-  
-  # Load a cookbook and return a hash with a list of all the files of a 
+
+  # Load a cookbook and return a hash with a list of all the files of a
   # given segment (attributes, recipes, definitions, libraries)
   #
   # === Parameters
@@ -166,14 +121,14 @@ class ChefServerWebui::Application < Merb::Controller
   # === Returns
   # <Hash>:: A hash consisting of the short name of the file in :name, and the full path
   #   to the file in :file.
-  def load_cookbook_segment(cookbook_id, segment)    
+  def load_cookbook_segment(cookbook_id, segment)
     r = Chef::REST.new(Chef::Config[:chef_server_url])
     cookbook = r.get_rest("cookbooks/#{cookbook_id}")
 
     raise NotFound unless cookbook
-    
+
     files_list = segment_files(segment, cookbook)
-    
+
     files = Hash.new
     files_list.each do |f|
       files[f['name']] = {
@@ -183,7 +138,7 @@ class ChefServerWebui::Application < Merb::Controller
     end
     files
   end
-  
+
   def segment_files(segment, cookbook)
     files_list = nil
     case segment
@@ -201,59 +156,87 @@ class ChefServerWebui::Application < Merb::Controller
     files_list
   end
 
-  #
-  # The following should no longer be necessary for the re-factored cookbooks replated webui controllers (which talks to the API) 
-  # But I want to wait until further verified before removing the code. [nuo]
-  #
-  # def specific_cookbooks(node_name, cl)
-  #   valid_cookbooks = Hash.new
-  #   begin
-  #     node = Chef::Node.load(node_name)
-  #     recipes, default_attrs, override_attrs = node.run_list.expand
-  #   rescue Net::HTTPServerException
-  #     recipes = []
-  #   end
-  #   recipes.each do |recipe|
-  #     valid_cookbooks = expand_cookbook_deps(valid_cookbooks, cl, recipe)
-  #   end
-  #   valid_cookbooks
-  # end
-  # 
-  # def expand_cookbook_deps(valid_cookbooks, cl, recipe)
-  #   cookbook = recipe
-  #   if recipe =~ /^(.+)::/
-  #     cookbook = $1
-  #   end
-  #   Chef::Log.debug("Node requires #{cookbook}")
-  #   valid_cookbooks[cookbook] = true 
-  #   cl.metadata[cookbook.to_sym].dependencies.each do |dep, versions|
-  #     expand_cookbook_deps(valid_cookbooks, cl, dep) unless valid_cookbooks[dep]
-  #   end
-  #   valid_cookbooks
-  # end
-  # 
-  # def load_all_files(segment, node_name=nil)
-  #   r = Chef::REST.new(Chef::Config[:chef_server_url])
-  #   cookbooks = r.get_rest("cookbooks")
-  #   
-  #   files = Array.new
-  #   valid_cookbooks = node_name ? specific_cookbooks(node_name, cookbooks) : {} 
-  #   cl.each do |cookbook|
-  #     if node_name
-  #       next unless valid_cookbooks[cookbook.name.to_s]
-  #     end
-  #     segment_files(segment, cookbook).each do |sf|
-  #       mo = sf.match("cookbooks/#{cookbook.name}/#{segment}/(.+)")
-  #       file_name = mo[1]
-  #       files << { 
-  #         :cookbook => cookbook.name, 
-  #         :name => file_name,
-  #         :checksum => checksum(sf)
-  #       }
-  #     end
-  #   end
-  #   files
-  # end
+  def build_tree(name, node)
+    html = "<table id='#{name}' class='tree table'>"
+    html << "<tr><th class='first'>Attribute</th><th class='last'>Value</th></tr>"
+    count = 0
+    parent = 0
+    append_tree(name, html, node, count, parent)
+    html << "</table>"
+    html
+  end
+
+  def append_tree(name, html, node, count, parent)
+    to_do = node
+    #to_do = node.kind_of?(Chef::Node) ? node.attribute : node
+    Chef::Log.error("I have #{to_do.inspect}")
+    to_do.sort{ |a,b| a[0] <=> b[0] }.each do |key, value|
+      Chef::Log.error("I am #{key.inspect} #{value.inspect}")
+      to_send = Array.new
+      count += 1
+      is_parent = false
+      local_html = ""
+      local_html << "<tr id='#{name}-#{count}' class='collapsed #{name}"
+      if parent != 0
+        local_html << " child-of-#{name}-#{parent}' style='display: none;'>"
+      else
+        local_html << "'>"
+      end
+      local_html << "<td class='table-key'><span toggle='#{name}-#{count}'/>#{key}</td>"
+      case value
+      when Hash
+        is_parent = true
+        local_html << "<td></td>"
+        p = count
+        to_send << Proc.new { append_tree(name, html, value, count, p) }
+      when Array
+        is_parent = true
+        local_html << "<td></td>"
+        as_hash = {}
+        value.each_index { |i| as_hash[i] = value[i] }
+        p = count
+        to_send << Proc.new { append_tree(name, html, as_hash, count, p) }
+      else
+        local_html << "<td><div class='json-attr'>#{value}</div></td>"
+      end
+      local_html << "</tr>"
+      local_html.sub!(/class='collapsed/, 'class=\'collapsed parent') if is_parent
+      local_html.sub!(/<span/, "<span class='expander'") if is_parent
+      html << local_html
+      to_send.each { |s| count = s.call }
+      count += to_send.length
+    end
+    count
+  end
+
+  def syntax_highlight(code)
+    tokens = File.exists?(code) ? CodeRay.scan_file(code, :ruby) : CodeRay.scan(code, :ruby)
+    CodeRay.encode_tokens(tokens, :span)
+  end
+
+  def get_file(uri)
+    r = Chef::REST.new(Chef::Config[:chef_server_url])
+    content = r.get_rest(uri)
+    a = Tempfile.new("cookbook_temp_file")
+    File.open(a.path, 'w'){|f| f.write(content)}
+    path = a.path
+    a.close
+    path
+  end
+
+  def str_to_bool(str)
+    str =~ /true/ ? true : false
+  end
+
+  #for showing search result
+  def determine_name(type, object)
+    case type
+    when :node, :role, :client
+      object.name
+    else
+      params[:id]
+    end
+  end
 
   def get_available_recipes
     r = Chef::REST.new(Chef::Config[:chef_server_url])
@@ -264,7 +247,7 @@ class ChefServerWebui::Application < Merb::Controller
       cb["recipes"].each do |recipe|
         recipe["name"] =~ /(.+)\.rb/
         r_name = $1;
-        if r_name == "default" 
+        if r_name == "default"
           result << key
         else
           result << "#{key}::#{r_name}"
@@ -273,7 +256,7 @@ class ChefServerWebui::Application < Merb::Controller
     end
     result
   end
-  
+
   def convert_newline_to_br(string)
     string.to_s.gsub(/\n/, '<br />') unless string.nil?
   end

data/app/controllers/clients.rb

@@ -18,21 +18,21 @@
 
 require 'chef/api_client'
 
-class ChefServerWebui::Clients < ChefServerWebui::Application
+class Clients < Application
   provides :json
   provides :html
   before :login_required
   
   # GET /clients
   def index
-     @clients_list =  begin
-                        Chef::ApiClient.list()
-                      rescue => e
-                        Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-                        @_message = {:error => "Could not list clients"}
-                        {}
-                      end 
-     render
+    begin
+      @clients_list = Chef::ApiClient.list().keys.sort
+    rescue => e
+      Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
+      @_message = {:error => "Could not list clients"}
+      @clients_list = []
+    end
+    render
   end
 
   # GET /clients/:id
@@ -107,7 +107,7 @@ class ChefServerWebui::Clients < ChefServerWebui::Application
     begin
       @client = Chef::ApiClient.load(params[:id])
       @client.destroy
-      redirect(absolute_slice_url(:clients), {:message => { :notice => "Client #{params[:id]} deleted successfully" }, :permanent => true})
+      redirect(absolute_url(:clients), {:message => { :notice => "Client #{params[:id]} deleted successfully" }, :permanent => true})
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @_message = {:error => "Could not delete client #{params[:id]}" }

data/app/controllers/cookbook_attributes.rb

@@ -19,7 +19,7 @@
 
 require 'chef' / 'mixin' / 'checksum'
 
-class ChefServerWebui::CookbookAttributes < ChefServerWebui::Application
+class CookbookAttributes < Application
   
   provides :html