WebUI Users work

Author: Nuo Yan

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

@@ -77,6 +77,17 @@ 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
+            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
@@ -141,9 +152,9 @@ def self.setup_router(scope)
 
       scope.match('/').to(:controller => 'main', :action =>'index').name(:top)
     end
-
   end
 
+
   # Setup the slice layout for ChefServerApi
   #
   # Use ChefServerApi.push_path and ChefServerApi.push_app_path

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

@@ -63,15 +63,32 @@ def escape_node_id(arg=nil)
     arg.gsub(/\./, '_')
   end
 
+  # Check if the user is logged in and if the user still exists
   def login_required
    if session[:user]
-     return session[:user]
+     begin
+       Chef::WebUIUser.load(session[:user]) rescue (raise NotFound, "Cannot find User #{session[:user]}, maybe it got deleted by an Administrator.")
+     rescue   
+       logout_and_redirect_to_login
+     else 
+       return session[:user]
+     end 
    else  
      self.store_location
      throw(:halt, :access_denied)
    end
   end
 
+  def cleanup_session
+    [:user,:level].each { |n| session.delete(n) }
+  end 
+  
+  def logout_and_redirect_to_login
+    cleanup_session
+    @user = Chef::WebUIUser.new
+    redirect(slice_url(:users_login), {:message => { :error => $! }, :permanent => true})
+  end 
+  
   def authorized_node
   #  if session[:level] == :admin
   #    Chef::Log.debug("Authorized as Administrator")

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

@@ -111,7 +111,7 @@ def complete
   end
 
   def logout
-    [:user,:level].each { |n| session.delete(n) }
+    cleanup_session
     redirect slice_url(:top)
   end
 

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

@@ -145,7 +145,7 @@ def complete
   end
 
   def logout
-    [:user,:level].each { |n| session.delete(n) }
+    cleanup_session
     redirect slice_url(:top)
   end
 
@@ -165,8 +165,13 @@ def destroy
   private
 
     def set_user_and_redirect
-      @user = Chef::WebUIUser.load(session[:user])
-      redirect(slice_url(:users_show, :user_id => session[:user]), {:message => { :error => $! }, :permanent => true})
+      begin
+        @user = Chef::WebUIUser.load(session[:user]) rescue (raise NotFound, "Cannot find User #{session[:user]}, maybe it got deleted by an Administrator.")
+      rescue
+        logout_and_redirect_to_login
+      else  
+        redirect(slice_url(:users_show, :user_id => session[:user]), {:message => { :error => $! }, :permanent => true})
+      end 
     end 
 
     def redirect_to_list_users(message)

chef-server-webui/lib/chef-server-webui.rb

@@ -128,7 +128,7 @@ def self.setup_router(scope)
       # scope.default_routes
     end
 
-    # Create the default admin user "admin" if not already exists
+    # Create the default admin user "admin" if not already exists, this code is also in chef-server-api/lib/chef-server-api.rb
     begin
       user = Chef::WebUIUser.load(Chef::Config[:web_ui_admin_user_name])
     rescue Chef::Exceptions::CouchDBNotFound => e