diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-09-24 18:57:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-24 18:57:52 +0200 |
| commit | 36888b9387731394f0079fc855ab9ad61ba8dfe5 (patch) | |
| tree | 62f522701da93bbc8ce8acfb07efccdaab593938 /railties/lib | |
| parent | abd4fd43692cd883068ad27f620fd4c00e546f91 (diff) | |
| parent | 8b0af54bbe5ab8b598e980013dd53a50d819b636 (diff) | |
| download | rails-36888b9387731394f0079fc855ab9ad61ba8dfe5.tar.gz rails-36888b9387731394f0079fc855ab9ad61ba8dfe5.tar.bz2 rails-36888b9387731394f0079fc855ab9ad61ba8dfe5.zip | |
Merge pull request #29716 from mikeycgto/active-support-key-rotator
Add Key Rotation to MessageEncryptor and MessageVerifier and simplify the Cookies middleware
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index abfec90b6d..24f5eeae87 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -259,8 +259,12 @@ module Rails "action_dispatch.encrypted_cookie_salt" => config.action_dispatch.encrypted_cookie_salt, "action_dispatch.encrypted_signed_cookie_salt" => config.action_dispatch.encrypted_signed_cookie_salt, "action_dispatch.authenticated_encrypted_cookie_salt" => config.action_dispatch.authenticated_encrypted_cookie_salt, + "action_dispatch.use_authenticated_cookie_encryption" => config.action_dispatch.use_authenticated_cookie_encryption, + "action_dispatch.encrypted_cookie_cipher" => config.action_dispatch.encrypted_cookie_cipher, + "action_dispatch.signed_cookie_digest" => config.action_dispatch.signed_cookie_digest, "action_dispatch.cookies_serializer" => config.action_dispatch.cookies_serializer, - "action_dispatch.cookies_digest" => config.action_dispatch.cookies_digest + "action_dispatch.cookies_digest" => config.action_dispatch.cookies_digest, + "action_dispatch.cookies_rotations" => config.action_dispatch.cookies_rotations ) end end |