diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-12 08:52:40 -0800 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-12 08:52:40 -0800 |
commit | 6e2b734f56e4c789763b9a8e3922272a004a325f (patch) | |
tree | 03fb8733f0b40cb5587d49438229841b0ba97bf5 /activesupport/lib/active_support/message_verifier.rb | |
parent | 07fd25c759b079a12dcd087aeacf39deb3e549d0 (diff) | |
parent | 1f80e8d6856837dd78a4af756e1b26cf06b17fc2 (diff) | |
download | rails-6e2b734f56e4c789763b9a8e3922272a004a325f.tar.gz rails-6e2b734f56e4c789763b9a8e3922272a004a325f.tar.bz2 rails-6e2b734f56e4c789763b9a8e3922272a004a325f.zip |
Merge pull request #13229 from vipulnsward/fix-10635-tests
Fix test-error introduced by #10635.
Diffstat (limited to 'activesupport/lib/active_support/message_verifier.rb')
-rw-r--r-- | activesupport/lib/active_support/message_verifier.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb index a35d5980fe..8e6e1dcfeb 100644 --- a/activesupport/lib/active_support/message_verifier.rb +++ b/activesupport/lib/active_support/message_verifier.rb @@ -39,8 +39,9 @@ module ActiveSupport if data.present? && digest.present? && secure_compare(digest, generate_digest(data)) begin @serializer.load(::Base64.strict_decode64(data)) - rescue ArgumentError - raise InvalidSignature + rescue ArgumentError => argument_error + raise InvalidSignature if argument_error.message =~ %r{invalid base64} + raise end else raise InvalidSignature |