Changeset 6342

Timestamp:

03/06/07 04:09:14 (2 years ago)

Author:

rick

Message:

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]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/cgi_ext/session_performance_fix.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/session/cookie_store.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+# 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]
-
-* Added Request#url that returns the complete URL used for the request [DHH]

trunk/actionpack/lib/action_controller/cgi_ext/session_performance_fix.rb

@@ -27 +27 @@
-    # 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 = {})

trunk/actionpack/lib/action_controller/session/cookie_store.rb

@@ -95 +95 @@
-  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.
@@ -114 +120 @@
-    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