diff options
author | Michael Koziarski <michael@koziarski.com> | 2012-10-02 14:26:16 -0700 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2012-10-02 14:26:16 -0700 |
commit | 0a507925cfc54246dc7d329936f60f8f410c38b6 (patch) | |
tree | f97e4a6a7c36cdd5af7b82330b9414bd94cb6991 /railties/lib | |
parent | df08271f9c044b7614d70baf4b818f1a79f4a6e1 (diff) | |
parent | 0479bff32dfb26a420b9ab4e2c2e6c2ed17550a3 (diff) | |
download | rails-0a507925cfc54246dc7d329936f60f8f410c38b6.tar.gz rails-0a507925cfc54246dc7d329936f60f8f410c38b6.tar.bz2 rails-0a507925cfc54246dc7d329936f60f8f410c38b6.zip |
Merge pull request #6952 from NZKoz/key_generator
Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/application.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 0b9ed025db..c8a6600da9 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -101,6 +101,14 @@ module Rails routes_reloader.reload! end + + # Return the application's KeyGenerator + def key_generator + # number of iterations selected based on consultation with the google security + # team. Details at https://github.com/rails/rails/pull/6952#issuecomment-7661220 + @key_generator ||= ActiveSupport::KeyGenerator.new(config.secret_token, :iterations=>1000) + end + # Stores some of the Rails initial environment parameters which # will be used by middlewares and engines to configure themselves. # Currently stores: @@ -121,7 +129,8 @@ module Rails "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions, "action_dispatch.show_detailed_exceptions" => config.consider_all_requests_local, "action_dispatch.logger" => Rails.logger, - "action_dispatch.backtrace_cleaner" => Rails.backtrace_cleaner + "action_dispatch.backtrace_cleaner" => Rails.backtrace_cleaner, + "action_dispatch.key_generator" => key_generator }) end |