aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2014-08-08 18:20:17 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2014-08-08 18:20:33 -0300
commitd70ba48c4dd6b57d8f38612ea95a3842337c1419 (patch)
tree7dd4e40be314eab0e55072714c3454a88110b7ca /actionpack/lib/action_dispatch/middleware
parent705977620539e2be6548027042f33175ebdc2505 (diff)
downloadrails-d70ba48c4dd6b57d8f38612ea95a3842337c1419.tar.gz
rails-d70ba48c4dd6b57d8f38612ea95a3842337c1419.tar.bz2
rails-d70ba48c4dd6b57d8f38612ea95a3842337c1419.zip
Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option"
This reverts commit 705977620539e2be6548027042f33175ebdc2505, reversing changes made to dde91e9bf5ab246f0f684b40288b272f4ba9a699. IT BROKE THE BUILD!!!
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
-rw-r--r--actionpack/lib/action_dispatch/middleware/cookies.rb10
1 files changed, 2 insertions, 8 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 55bb9de173..ac9e5effe2 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -90,7 +90,6 @@ module ActionDispatch
SECRET_TOKEN = "action_dispatch.secret_token".freeze
SECRET_KEY_BASE = "action_dispatch.secret_key_base".freeze
COOKIES_SERIALIZER = "action_dispatch.cookies_serializer".freeze
- COOKIES_DIGEST = "action_dispatch.cookies_digest".freeze
# Cookies can typically store 4096 bytes.
MAX_COOKIE_SIZE = 4096
@@ -213,8 +212,7 @@ module ActionDispatch
secret_token: env[SECRET_TOKEN],
secret_key_base: env[SECRET_KEY_BASE],
upgrade_legacy_signed_cookies: env[SECRET_TOKEN].present? && env[SECRET_KEY_BASE].present?,
- serializer: env[COOKIES_SERIALIZER],
- digest: env[COOKIES_DIGEST]
+ serializer: env[COOKIES_SERIALIZER]
}
end
@@ -443,10 +441,6 @@ module ActionDispatch
serializer
end
end
-
- def digest
- @options[:digest] || 'SHA1'
- end
end
class SignedCookieJar #:nodoc:
@@ -457,7 +451,7 @@ module ActionDispatch
@parent_jar = parent_jar
@options = options
secret = key_generator.generate_key(@options[:signed_cookie_salt])
- @verifier = ActiveSupport::MessageVerifier.new(secret, digest: digest, serializer: NullSerializer)
+ @verifier = ActiveSupport::MessageVerifier.new(secret, serializer: NullSerializer)
end
def [](name)