Merge branch 'CHEF-677' of git://github.com/nuoyan/chef into nuoyan/CHEF-677

Author: adamhjk

chef-server-api/Rakefile

@@ -36,7 +36,7 @@ spec = Gem::Specification.new do |s|
   "haml",
   "ruby-openid",
   "json",
-  "syntax",].each { |g| s.add_dependency g}
+  "coderay",].each { |g| s.add_dependency g}
 
   s.require_path = 'lib'
   s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{config,lib,spec,app,public,stubs}/**/*")

chef-server-api/app/controllers/users.rb

@@ -0,0 +1,77 @@
+#
+# Author:: Nuo Yan (<nuo@opscode.com>)
+# Copyright:: Copyright (c) 2009 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.
+
+
+require File.join("chef", "webui_user")
+
+class ChefServerApi::Users < ChefServerApi::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 
+  
+  # GET to /users/:id
+  def show
+    begin
+      @user = Chef::WebUIUser.cdb_load(params[:id])
+    rescue Chef::Exceptions::CouchDBNotFound => e
+      raise NotFound, "Cannot load user #{params[:id]}"
+    end
+    display @user
+  end
+  
+  # PUT to /users/:id
+  def update
+    begin
+      Chef::WebUIUser.cdb_load(params[:id])
+    rescue Chef::Exceptions::CouchDBNotFound => e
+      raise NotFound, "Cannot load user #{params[:id]}"
+    end
+    @user = params['inflated_object']
+    @user.cdb_save
+    display(@user)
+  end
+  
+  # POST to /users
+  def create
+    @user = params["inflated_object"]
+    begin
+      Chef::WebUIUser.cdb_load(@user.name)
+    rescue Chef::Exceptions::CouchDBNotFound
+      @user.cdb_save
+      self.status = 201
+    else
+      raise Forbidden, "User already exists" 
+    end
+    display({ :uri => absolute_slice_url(:user, @user.name) })
+  end 
+  
+  def destroy
+    begin
+      @user = Chef::WebUIUser.cdb_load(params[:id])
+    rescue Chef::Exceptions::CouchDBNotFound => e 
+      raise NotFound, "Cannot load user #{params[:id]}"
+    end
+    @user.cdb_destroy
+    display @user
+  end 
+end

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

@@ -77,17 +77,6 @@ def self.activate
 
           Chef::Log.info('Loading roles')
           Chef::Role.sync_from_disk_to_couchdb
-          
-          # Create the default WebUI admin user "admin" if not already exists
-          begin
-            user = Chef::WebUIUser.load(Chef::Config[:web_ui_admin_user_name])
-          rescue Chef::Exceptions::CouchDBNotFound => e
-            user = Chef::WebUIUser.new
-            user.name = Chef::Config[:web_ui_admin_user_name]
-            user.set_password(Chef::Config[:web_ui_admin_default_password])
-            user.admin = true
-            user.save
-          end
 
           # Create the signing key and certificate 
           Chef::Certificate.generate_signing_ca
@@ -115,6 +104,9 @@ def self.deactivate
     # @note prefix your named routes with :chefserverslice_
     #   to avoid potential conflicts with global named routes.
     def self.setup_router(scope)
+      # Users
+      scope.resources :users
+      
       # Nodes
       scope.match('/nodes/:id/cookbooks', :method => 'get').to(:controller => "nodes", :action => "cookbooks")
       scope.resources :nodes

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

@@ -89,6 +89,31 @@ def logout_and_redirect_to_login
     redirect(slice_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
+    users = Chef::WebUIUser.list
+    users.each do |u, url|
+      user = Chef::WebUIUser.load(u)
+      if user.admin
+        count = count + 1
+        return false if count == 2
+      end
+    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")

chef-server-webui/app/controllers/databag_items.rb

@@ -78,17 +78,25 @@ def index
   end
 
   def show
-    @databag_name = params[:databag_id]
-    @databag_item_name = params[:id]
-    r = Chef::REST.new(Chef::Config[:chef_server_url])
-    @databag_item = r.get_rest("data/#{params[:databag_id]}/#{params[:id]}")
-    display @databag_item
+    begin
+      @databag_name = params[:databag_id]
+      @databag_item_name = params[:id]
+      r = Chef::REST.new(Chef::Config[:chef_server_url])
+      @databag_item = r.get_rest("data/#{params[:databag_id]}/#{params[:id]}")
+      display @databag_item
+    rescue
+      redirect(slice_url(:databag_databag_items), {:message => { :error => $! }, :permanent => true})
+    end 
   end
 
   def destroy(databag_id=params[:databag_id], item_id=params[:id])
-    @databag_item = Chef::DataBagItem.new
-    @databag_item.destroy(databag_id, item_id)
-    redirect(slice_url(:databag_databag_items), {:message => { :notice => "Databag Item #{params[:id]} deleted successfully" }, :permanent => true})
+    begin
+      @databag_item = Chef::DataBagItem.new
+      @databag_item.destroy(databag_id, item_id)
+      redirect(slice_url(:databag_databag_items), {:message => { :notice => "Databag Item #{params[:id]} deleted successfully" }, :permanent => true})
+    rescue
+      redirect(slice_url(:databag_databag_items), {:message => { :error => $! }, :permanent => true})
+    end 
   end 
 
 end

chef-server-webui/app/controllers/databags.rb

@@ -41,17 +41,41 @@ def create
   end
 
   def index
-    r = Chef::REST.new(Chef::Config[:chef_server_url])
-    @databags = r.get_rest("data")
-    render
+    begin
+      r = Chef::REST.new(Chef::Config[:chef_server_url])
+      @databags = r.get_rest("data")
+      render
+    rescue
+      @_message = { :error => $! } 
+      @databags = {}
+      render
+    end
   end
 
   def show
-    @databag_name = params[:id]
-    r = Chef::REST.new(Chef::Config[:chef_server_url])
-    @databag = r.get_rest("data/#{params[:id]}")
-    raise NotFound unless @databag
-    display @databag
+    begin
+      @databag_name = params[:id]
+      r = Chef::REST.new(Chef::Config[:chef_server_url])
+      @databag = r.get_rest("data/#{params[:id]}")
+      raise NotFound unless @databag
+      display @databag
+    rescue
+      @databags = Chef::DataBag.list
+      @_message =  { :error => $!}    
+      render :index
+    end 
+  end
+  
+  def destroy
+    begin
+      r = Chef::REST.new(Chef::Config[:chef_server_url])
+      r.delete_rest("data/#{params[:id]}")
+      redirect(absolute_slice_url(:databags), {:message => { :notice => "Data bag #{params[:id]} deleted successfully" }, :permanent => true})
+    rescue
+      @databags = Chef::DataBag.list
+      @_message =  { :error => $!}
+      render :index
+    end 
   end
 
 end

chef-server-webui/app/controllers/nodes.rb

@@ -67,7 +67,7 @@ def create
       @node = Chef::Node.new
       @node.name params[:name]
       @node.attribute = JSON.parse(params[:attributes])
-      @node.run_list params[:for_node]
+      @node.run_list.reset(params[:for_node] ? params[:for_node] : [])
       begin
         @node.create
       rescue Net::HTTPServerException => e

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

@@ -86,7 +86,7 @@ def complete
         users = Chef::WebUIUser.list
         #TODO: This is expensive. Should think of a better way [nuo]
         # Go through each user object and check if the current OpenID associates with the user
-        users.each do |u|
+        users.each do |u, url|
           user = Chef::WebUIUser.load(u)
           if user.openid == oidresp.identity_url
             session[:user] = user.name

chef-server-webui/app/controllers/users.rb

@@ -52,8 +52,8 @@ def show
       raise Forbidden, "The current user is not an Administrator, you can only Show and Edit the user itself. To control other users, login as an Administrator." unless params[:user_id] == session[:user] unless session[:level] == :admin
       begin
         @user = Chef::WebUIUser.load(params[:user_id])
-      rescue Chef::Exceptions::CouchDBNotFound => e
-        raise NotFound, "Cannot found user #{params[:user_id]}"
+      rescue Net::HTTPServerException => e
+        raise NotFound, "Cannot find user #{params[:user_id]}"
       end
       render
     rescue 
@@ -66,12 +66,12 @@ def update
     begin
       begin
         @user = Chef::WebUIUser.load(params[:user_id])
-      rescue Chef::Exceptions::CouchDBNotFound => e
-        raise NotFound, "Cannot found user #{params[:user_id]}"
+      rescue Net::HTTPServerException => e
+        raise NotFound, "Cannot find user #{params[:user_id]}"
       end
-      @user.admin = str_to_bool(params[:admin]) unless params[:user_id] == Chef::Config[:web_ui_admin_user_name]  
-      raise Forbidden, "Passwords do not match." unless params[:new_password] == params[:confirm_new_password]
-      @user.set_password(params[:new_password]) unless (params[:new_password].nil? || params[:new_password].length == 0)      
+      @user.admin = str_to_bool(params[:admin]) if ['true','false'].include?params[:admin]
+      session[:level] = :user if params[:user_id] == session[:user] && params[:admin] == 'false'
+      @user.set_password(params[:new_password], params[:confirm_new_password]) unless (params[:new_password].nil? || params[:new_password].length == 0)      
       (params[:openid].length == 0 || params[:openid].nil?) ? @user.set_openid(nil) : @user.set_openid(URI.parse(params[:openid]).normalize.to_s)
       @user.save
       @_message = { :notice => "Updated User #{@user.name}" }       
@@ -95,22 +95,21 @@ def new
   def create
     begin
       authorized_user
-      begin
-        @user = Chef::WebUIUser.load(params[:name])
-      rescue Chef::Exceptions::CouchDBNotFound
-        raise ArgumentError, "Password cannot be blank" if (params[:password].nil? || params[:password].length==0)
-        raise ArgumentError, "Passwords do not match" unless params[:password] == params[:password2]
-        @user = Chef::WebUIUser.new
-      else 
-        raise StandardError, "User #{params[:username]} already exists"
-      end       
-
+      @user = Chef::WebUIUser.new
       @user.name = params[:name]
-      @user.set_password(params[:password])
+      @user.set_password(params[:password], params[:password2])
       @user.admin = true if params[:admin]
       (params[:openid].length == 0 || params[:openid].nil?) ? @user.set_openid(nil) : @user.set_openid(URI.parse(params[:openid]).normalize.to_s)
-      @user.save
-      redirect(slice_url(:users), :message => { :notice => "Created User #{@user.name}" })
+      begin
+        @user.create
+      rescue Net::HTTPServerException => e
+        if e.message =~ /403/ 
+          raise ArgumentError, "User already exists" 
+        else 
+          raise e
+        end 
+      end
+      redirect(slice_url(:users), :message => { :notice => "Created User #{params[:name]}" })
     rescue
       @_message = { :error => $! }
       session[:level] != :admin ? set_user_and_redirect : (render :new)
@@ -126,7 +125,7 @@ def login_exec
     begin
       begin
         @user = Chef::WebUIUser.load(params[:name])
-      rescue Chef::Exceptions::CouchDBNotFound 
+      rescue Net::HTTPServerException => e
         raise NotFound, "Cannot find user #{params[:name]}"
       end 
       raise(Unauthorized, "Wrong username or password.") unless @user.verify_password(params[:password])
@@ -141,7 +140,7 @@ def login_exec
   def complete    
     session[:user] = params[:name]
     session[:level] = (@user.admin == true ? :admin : :user)
-    @user.verify_password(Chef::Config[:web_ui_admin_default_password]) ? redirect(slice_url(:users_edit, :user_id => @user.name), :message => { :warning => "Please change default password!!!" }) : redirect_back_or_default(absolute_slice_url(:nodes))
+    (@user.name == Chef::Config[:web_ui_admin_user_name] && @user.verify_password(Chef::Config[:web_ui_admin_default_password])) ? redirect(slice_url(:users_edit, :user_id => @user.name), :message => { :warning => "Please change default password!!!" }) : redirect_back_or_default(absolute_slice_url(:nodes))
   end
 
   def logout
@@ -151,7 +150,7 @@ def logout
 
   def destroy
     begin
-      raise Forbidden, "The default admin user cannot be deleted" if params[:user_id] == Chef::Config[:web_ui_admin_user_name]
+      raise Forbidden, "The last admin user cannot be deleted" if (is_admin(params[:user_id]) && is_last_admin)
       raise Forbidden, "A non-admin user can only delete itself" if (params[:user_id] != session[:user] && session[:level] != :admin)
       @user = Chef::WebUIUser.load(params[:user_id])
       @user.destroy

chef-server-webui/app/helpers/application_helper.rb

@@ -115,12 +115,8 @@ def append_tree(name, html, node, count, parent, override)
       end
 
       def syntax_highlight(code)
-        converter = Syntax::Convertors::HTML.for_syntax "ruby"
-        if File.exists?(code)
-          converter.convert(File.read(code), false)
-        else
-          converter.convert(code, false)
-        end
+        tokens = File.exists?(code) ? CodeRay.scan_file(code, :ruby) : CodeRay.scan(code, :ruby)
+        CodeRay.encode_tokens(tokens, :span)
       end
 
       def get_file(uri)