diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-09-01 07:49:55 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-01 07:49:55 +0930 |
| commit | df63c0d8c94472e941ce515ea546f75f5047696b (patch) | |
| tree | d330726952e6e5a8175a0144cf7de4d272703aea /actionpack/lib/action_dispatch | |
| parent | fd2446cd8156f288598cdb47172cfe31ec24c1ee (diff) | |
| parent | 79c847892f5a08515769ad2598d4e6726dcd65e3 (diff) | |
| download | rails-df63c0d8c94472e941ce515ea546f75f5047696b.tar.gz rails-df63c0d8c94472e941ce515ea546f75f5047696b.tar.bz2 rails-df63c0d8c94472e941ce515ea546f75f5047696b.zip | |
Merge pull request #25758 from vipulnsward/fix-key-len-issue
Follow up of #25602
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 4 |
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 ff83c4beca..6f4fab396a 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -372,7 +372,7 @@ module ActionDispatch handle_options(options) - if @cookies[name.to_s] != value or options[:expires] + if @cookies[name.to_s] != value || options[:expires] @cookies[name.to_s] = value @set_cookies[name.to_s] = options @delete_cookies.delete(name.to_s) @@ -576,7 +576,7 @@ module ActionDispatch "Read the upgrade documentation to learn more about this new config option." end - secret = key_generator.generate_key(request.encrypted_cookie_salt || "") + secret = key_generator.generate_key(request.encrypted_cookie_salt || "")[0, ActiveSupport::MessageEncryptor.key_len] sign_secret = key_generator.generate_key(request.encrypted_signed_cookie_salt || "") @encryptor = ActiveSupport::MessageEncryptor.new(secret, sign_secret, digest: digest, serializer: ActiveSupport::MessageEncryptor::NullSerializer) end |