AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-08 22:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

support old marshalled cookies

Browse Source
This commit is contained in:
Greg Ose
2014-06-17 23:40:45 -05:00
committed by Charlie Somerville
parent d106a28675
commit d12475ba60
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_dispatch/middleware/flash.rb
View File

@@ -79,6 +79,8 @@ module ActionDispatch
def self.from_session_value(value)
flash = case value
when FlashHash # Rails 3
value
when Hash # Rails 4.0
flashes = value['flashes'] || {}
flashes.stringify_keys!

7
actionpack/test/controller/flash_hash_test.rb
View File

@@ -62,10 +62,9 @@ module ActionDispatch
end
def test_from_session_value
skip "Rails 3.2 cookie is invalid for 3.0 backport and we do not support old session cookies for 3.0"
rails_3_2_cookie = 'BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWY4ZTFiODE1MmJhNzYwOWMyOGJiYjE3ZWM5MjYzYmE3BjsAVEkiCmZsYXNoBjsARm86JUFjdGlvbkRpc3BhdGNoOjpGbGFzaDo6Rmxhc2hIYXNoCToKQHVzZWRvOghTZXQGOgpAaGFzaHsAOgxAY2xvc2VkRjoNQGZsYXNoZXN7BkkiDG1lc3NhZ2UGOwBGSSIKSGVsbG8GOwBGOglAbm93MA=='
session = Marshal.load(Base64.decode64(rails_3_2_cookie))
hash = Flash::FlashHash.from_session_value(session['flash'])
rails_3_0_marshaled_flash = 'BAhJQzolQWN0aW9uRGlzcGF0Y2g6OkZsYXNoOjpGbGFzaEhhc2h7BkkiDG1lc3NhZ2UGOgZFVEkiCkhlbGxvBjsGVAY6CkB1c2VkbzoIU2V0BjoKQGhhc2h7AA=='
flash = Marshal.load(Base64.decode64(rails_3_0_marshaled_flash))
hash = Flash::FlashHash.from_session_value(flash)
assert_equal({'flashes' => {'message' => 'Hello'}, 'discard' => %w[message]}, hash.to_session_value)
end