Add a #dbman attr_reader for CGI::Session and make CGI::Session::CookieStore#generate_digest public so it's easy to generate digests

using the cookie store's secret. [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6342 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 7 insertions, 6 deletions

diff --git a/actionpack/lib/action_controller/cgi_ext/session_performance_fix.rb b/actionpack/lib/action_controller/cgi_ext/session_performance_fix.rb
index 6f9a09da6d..d3dc643d3f 100644
--- a/actionpack/lib/action_controller/cgi_ext/session_performance_fix.rb
+++ b/actionpack/lib/action_controller/cgi_ext/session_performance_fix.rb
@@ -26,6 +26,7 @@ class CGI
 
     # Make the CGI instance available to session stores.
     attr_reader :cgi
+    attr_reader :dbman
     alias_method :initialize_without_cgi_reader, :initialize
     def initialize(cgi, options = {})
       @cgi = cgi
diff --git a/actionpack/lib/action_controller/session/cookie_store.rb b/actionpack/lib/action_controller/session/cookie_store.rb
index d232dd448c..fe2d96e17d 100644
--- a/actionpack/lib/action_controller/session/cookie_store.rb
+++ b/actionpack/lib/action_controller/session/cookie_store.rb
@@ -94,6 +94,12 @@ class CGI::Session::CookieStore
     write_cookie('value' => '', 'expires' => 1.year.ago)
   end
 
+  # Generate the HMAC keyed message digest. Uses SHA1 by default.
+  def generate_digest(data)
+    key = @secret.respond_to?(:call) ? @secret.call(@session) : @secret
+    OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new(@digest), key, data)
+  end
+
   private
     # Marshal a session hash into safe cookie data. Include an integrity hash.
     def marshal(session)
@@ -113,12 +119,6 @@ class CGI::Session::CookieStore
       end
     end
 
-    # Generate the HMAC keyed message digest. Uses SHA1 by default.
-    def generate_digest(data)
-      key = @secret.respond_to?(:call) ? @secret.call(@session) : @secret
-      OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new(@digest), key, data)
-    end
-
     # Read the session data cookie.
     def read_cookie
       @session.cgi.cookies[@cookie_options['name']].first