diff options
author | Michael Koziarski <michael@koziarski.com> | 2008-09-24 16:24:02 +0200 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2008-09-24 16:24:02 +0200 |
commit | 025736de8eb3a4be1514f10123ce1569fa2d5427 (patch) | |
tree | 955bbba3637d9a092029701b378a70e5e28bf7b2 | |
parent | 72b772ae9b692add0359574b0da7038bd1420a5a (diff) | |
download | rails-025736de8eb3a4be1514f10123ce1569fa2d5427.tar.gz rails-025736de8eb3a4be1514f10123ce1569fa2d5427.tar.bz2 rails-025736de8eb3a4be1514f10123ce1569fa2d5427.zip |
Use ActiveSupport::SecureRandom instead of the strange fallback code.
-rw-r--r-- | actionpack/lib/action_controller/cgi_ext/session.rb | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/actionpack/lib/action_controller/cgi_ext/session.rb b/actionpack/lib/action_controller/cgi_ext/session.rb index a01f17f9ce..d3f85e3705 100644 --- a/actionpack/lib/action_controller/cgi_ext/session.rb +++ b/actionpack/lib/action_controller/cgi_ext/session.rb @@ -6,28 +6,8 @@ class CGI #:nodoc: # * Expose the CGI instance to session stores. # * Don't require 'digest/md5' whenever a new session id is generated. class Session #:nodoc: - begin - require 'securerandom' - - # Generate a 32-character unique id using SecureRandom. - # This is used to generate session ids but may be reused elsewhere. - def self.generate_unique_id(constant = nil) - SecureRandom.hex(16) - end - rescue LoadError - # Generate an 32-character unique id based on a hash of the current time, - # a random number, the process id, and a constant string. This is used - # to generate session ids but may be reused elsewhere. - def self.generate_unique_id(constant = 'foobar') - md5 = Digest::MD5.new - now = Time.now - md5 << now.to_s - md5 << String(now.usec) - md5 << String(rand(0)) - md5 << String($$) - md5 << constant - md5.hexdigest - end + def self.generate_unique_id(constant = nil) + ActiveSupport::SecureRandom.hex(16) end # Make the CGI instance available to session stores. |