kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Pull up parse to the legacy upgrading module

Browse source 
It was the same in both legacy versions of the signed and encrypted cookie jars.
This commit is contained in:
Kasper Timm Hansen 2015-09-06 18:01:53 +02:00
parent c9efdb582a
commit e05136ab41
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
actionpack/lib/action_dispatch/middleware/cookies.rb
View file

@ -253,6 +253,11 @@ module ActionDispatch
rescue ActiveSupport::MessageVerifier::InvalidSignature
nil
end
private
def parse(name, signed_message)
super || verify_and_upgrade_legacy_signed_message(name, signed_message)
end
end
class CookieJar #:nodoc:
@ -526,11 +531,6 @@ module ActionDispatch
# re-saves them using the new key generator to provide a smooth upgrade path.
class UpgradeLegacySignedCookieJar < SignedCookieJar #:nodoc:
include VerifyAndUpgradeLegacySignedMessage
private
def parse(name, signed_message)
super || verify_and_upgrade_legacy_signed_message(name, signed_message)
end
end
class EncryptedCookieJar < AbstractCookieJar # :nodoc:
@ -569,11 +569,6 @@ module ActionDispatch
# encrypts and re-saves them using the new key generator to provide a smooth upgrade path.
class UpgradeLegacyEncryptedCookieJar < EncryptedCookieJar #:nodoc:
include VerifyAndUpgradeLegacySignedMessage
private
def parse(name, encrypted_or_signed_message)
super || verify_and_upgrade_legacy_signed_message(name, encrypted_or_signed_message)
end
end
def initialize(app)