diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-05-28 17:02:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-28 17:02:14 +0200 |
| commit | b88200f10376a3d73c34a7db0347acc7b06bad39 (patch) | |
| tree | 4cca6ebc0d4f010a025b954ef75ac5733222dcff /actionpack/lib/action_dispatch/railtie.rb | |
| parent | 919bc57747924d77700db656ab7be34f4ff3a61f (diff) | |
| parent | 5a3ba63d9abad86b7f6dd36a92cfaf722e52760b (diff) | |
| download | rails-b88200f10376a3d73c34a7db0347acc7b06bad39.tar.gz rails-b88200f10376a3d73c34a7db0347acc7b06bad39.tar.bz2 rails-b88200f10376a3d73c34a7db0347acc7b06bad39.zip | |
Merge pull request #28132 from mikeycgto/aead-encrypted-cookies
AEAD encrypted cookies and sessions
Diffstat (limited to 'actionpack/lib/action_dispatch/railtie.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/railtie.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb index 16a18a7f25..7662e164b8 100644 --- a/actionpack/lib/action_dispatch/railtie.rb +++ b/actionpack/lib/action_dispatch/railtie.rb @@ -16,6 +16,7 @@ module ActionDispatch config.action_dispatch.signed_cookie_salt = "signed cookie" config.action_dispatch.encrypted_cookie_salt = "encrypted cookie" config.action_dispatch.encrypted_signed_cookie_salt = "signed encrypted cookie" + config.action_dispatch.use_authenticated_cookie_encryption = false config.action_dispatch.perform_deep_munge = true config.action_dispatch.default_headers = { @@ -36,6 +37,8 @@ module ActionDispatch ActionDispatch::ExceptionWrapper.rescue_responses.merge!(config.action_dispatch.rescue_responses) ActionDispatch::ExceptionWrapper.rescue_templates.merge!(config.action_dispatch.rescue_templates) + config.action_dispatch.authenticated_encrypted_cookie_salt = "authenticated encrypted cookie" if config.action_dispatch.use_authenticated_cookie_encryption + config.action_dispatch.always_write_cookie = Rails.env.development? if config.action_dispatch.always_write_cookie.nil? ActionDispatch::Cookies::CookieJar.always_write_cookie = config.action_dispatch.always_write_cookie |