aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2014-08-08 18:05:53 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2014-08-08 18:05:53 -0300
commit705977620539e2be6548027042f33175ebdc2505 (patch)
tree642b0153673f187bfd1ba20b230f913ad2adaec5 /railties/lib/rails
parentdde91e9bf5ab246f0f684b40288b272f4ba9a699 (diff)
parent629f4e007c1e80b931ed3d3a2553ad26997d8345 (diff)
downloadrails-705977620539e2be6548027042f33175ebdc2505.tar.gz
rails-705977620539e2be6548027042f33175ebdc2505.tar.bz2
rails-705977620539e2be6548027042f33175ebdc2505.zip
Merge pull request #16434 from strzalek/cookies-digest-config-option
Add digest config option for SignedCookiesJar
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/application.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 61639be7c6..16bea413b5 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -200,7 +200,7 @@ module Rails
def message_verifier(verifier_name)
@message_verifiers[verifier_name] ||= begin
secret = key_generator.generate_key(verifier_name.to_s)
- ActiveSupport::MessageVerifier.new(secret)
+ ActiveSupport::MessageVerifier.new(secret, digest: config.action_dispatch.cookies_digest, serializer: config.action_dispatch.cookies_serializer)
end
end
@@ -257,6 +257,7 @@ 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.cookies_serializer" => config.action_dispatch.cookies_serializer
+ "action_dispatch.cookies_digest" => config.action_dispatch.cookies_digest
})
end
end