aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/cookies.rb
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2014-04-23 12:48:02 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2014-04-23 12:48:02 -0500
commite20114006ac086241c886203fa0087567c8fef79 (patch)
tree2eb24bd456620652175c5512f7cc87462bf47160 /actionpack/lib/action_dispatch/middleware/cookies.rb
parent650585da8ac15742b64965c338110e8e859a3b5e (diff)
parent2a412b3d6f6eef23db5874c5e33d995858bfa1e5 (diff)
downloadrails-e20114006ac086241c886203fa0087567c8fef79.tar.gz
rails-e20114006ac086241c886203fa0087567c8fef79.tar.bz2
rails-e20114006ac086241c886203fa0087567c8fef79.zip
Merge pull request #14850 from chancancode/fix_json_cookie_jar
Fixed an issue with migrating legacy json cookies.
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/cookies.rb')
-rw-r--r--actionpack/lib/action_dispatch/middleware/cookies.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index c0039fa3f5..22b16b628d 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -176,11 +176,11 @@ module ActionDispatch
module VerifyAndUpgradeLegacySignedMessage
def initialize(*args)
super
- @legacy_verifier = ActiveSupport::MessageVerifier.new(@options[:secret_token])
+ @legacy_verifier = ActiveSupport::MessageVerifier.new(@options[:secret_token], serializer: NullSerializer)
end
def verify_and_upgrade_legacy_signed_message(name, signed_message)
- @legacy_verifier.verify(signed_message).tap do |value|
+ deserialize(name, @legacy_verifier.verify(signed_message)).tap do |value|
self[name] = { value: value }
end
rescue ActiveSupport::MessageVerifier::InvalidSignature