mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
45448a5788
Summary of the changes: * Add thread_safe gem. * Use thread safe cache for digestor caching. * Replace manual synchronization with ThreadSafe::Cache in Relation::Delegation. * Replace @attribute_method_matchers_cache Hash with ThreadSafe::Cache. * Use TS::Cache to avoid the synchronisation overhead on listener retrieval. * Replace synchronisation with TS::Cache usage. * Use a preallocated array for performance/memory reasons. * Update the controllers cache to the new AS::Dependencies::ClassCache API. The original @controllers cache no longer makes much sense after @tenderlove's changes in7b6bfe84f3andf345e2380c. * Use TS::Cache in the connection pool to avoid locking overhead. * Use TS::Cache in ConnectionHandler.
75 lines
2.7 KiB
Ruby
75 lines
2.7 KiB
Ruby
require 'thread_safe'
|
|
require 'openssl'
|
|
|
|
module ActiveSupport
|
|
# KeyGenerator is a simple wrapper around OpenSSL's implementation of PBKDF2
|
|
# It can be used to derive a number of keys for various purposes from a given secret.
|
|
# This lets rails applications have a single secure secret, but avoid reusing that
|
|
# key in multiple incompatible contexts.
|
|
class KeyGenerator
|
|
def initialize(secret, options = {})
|
|
@secret = secret
|
|
# The default iterations are higher than required for our key derivation uses
|
|
# on the off chance someone uses this for password storage
|
|
@iterations = options[:iterations] || 2**16
|
|
end
|
|
|
|
# Returns a derived key suitable for use. The default key_size is chosen
|
|
# to be compatible with the default settings of ActiveSupport::MessageVerifier.
|
|
# i.e. OpenSSL::Digest::SHA1#block_length
|
|
def generate_key(salt, key_size=64)
|
|
OpenSSL::PKCS5.pbkdf2_hmac_sha1(@secret, salt, @iterations, key_size)
|
|
end
|
|
end
|
|
|
|
# CachingKeyGenerator is a wrapper around KeyGenerator which allows users to avoid
|
|
# re-executing the key generation process when it's called using the same salt and
|
|
# key_size
|
|
class CachingKeyGenerator
|
|
def initialize(key_generator)
|
|
@key_generator = key_generator
|
|
@cache_keys = ThreadSafe::Cache.new
|
|
end
|
|
|
|
# Returns a derived key suitable for use. The default key_size is chosen
|
|
# to be compatible with the default settings of ActiveSupport::MessageVerifier.
|
|
# i.e. OpenSSL::Digest::SHA1#block_length
|
|
def generate_key(salt, key_size=64)
|
|
@cache_keys["#{salt}#{key_size}"] ||= @key_generator.generate_key(salt, key_size)
|
|
end
|
|
end
|
|
|
|
class DummyKeyGenerator # :nodoc:
|
|
SECRET_MIN_LENGTH = 30 # Characters
|
|
|
|
def initialize(secret)
|
|
ensure_secret_secure(secret)
|
|
@secret = secret
|
|
end
|
|
|
|
def generate_key(salt)
|
|
@secret
|
|
end
|
|
|
|
private
|
|
|
|
# To prevent users from using something insecure like "Password" we make sure that the
|
|
# secret they've provided is at least 30 characters in length.
|
|
def ensure_secret_secure(secret)
|
|
if secret.blank?
|
|
raise ArgumentError, "A secret is required to generate an " +
|
|
"integrity hash for cookie session data. Use " +
|
|
"config.secret_key_base = \"some secret phrase of at " +
|
|
"least #{SECRET_MIN_LENGTH} characters\"" +
|
|
"in config/initializers/secret_token.rb"
|
|
end
|
|
|
|
if secret.length < SECRET_MIN_LENGTH
|
|
raise ArgumentError, "Secret should be something secure, " +
|
|
"like \"#{SecureRandom.hex(16)}\". The value you " +
|
|
"provided, \"#{secret}\", is shorter than the minimum length " +
|
|
"of #{SECRET_MIN_LENGTH} characters"
|
|
end
|
|
end
|
|
end
|
|
end
|