moved session key management to Chef::Config

Author: Christopher Brown

chef-server/Rakefile

@@ -4,6 +4,8 @@ require 'rake/rdoctask'
 require 'merb-core'
 require 'merb-core/tasks/merb'
 
+require 'chef'
+
 include FileUtils
 
 GEM = "chef-server"

chef-server/config/init.rb

@@ -8,11 +8,13 @@
 
 Merb::Config.use do |c|
   c[:use_mutex] = false
-  c[:session_store] = 'cookie'  # can also be 'memory', 'memcache', 'container', 'datamapper
-  
-  # cookie session store configuration
-  c[:session_secret_key]  = '424458a3d40b41b5e6d4b19b9eaffb706e7eef42'  # required for cookie session store
-  c[:session_id_key] = '_chef-server_session_id' # cookie session id key, defaults to "_session_id"
+  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] = false
+  c[:log_level] = Chef::Config[:log_level]
+  c[:log_stream] = Chef::Config[:log_location]
 end
 
 Merb::BootLoader.before_app_loads do

chef/lib/chef/config.rb

@@ -93,6 +93,23 @@ def configure(&block)
         yield @configuration
       end
 
+      # Manages the chef secret session key
+      # === Returns
+      # <newkey>:: A new or retrieved session key
+      #
+      def manage_secret_key
+        newkey = nil
+        if Chef::FileCache.has_key?("chef_server_cookie_id")
+          newkey = Chef::FileCache.load("chef_server_cookie_id")
+        else
+          chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
+          newkey = ""
+          1.upto(40) { |i| newkey << chars[rand(chars.size-1)] }
+          Chef::FileCache.store("chef_server_cookie_id", newkey)
+        end
+        newkey
+      end
+
       # Get the value of a configuration option
       #
       # === Parameters