diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2013-12-08 00:26:09 +0530 |
|---|---|---|
| committer | Vipul A M <vipulnsward@gmail.com> | 2013-12-12 22:15:42 +0530 |
| commit | 1f80e8d6856837dd78a4af756e1b26cf06b17fc2 (patch) | |
| tree | b069d53715c8950ab9ff965f099ea2682136726c /activesupport/lib | |
| parent | 76dae289edf33d4b3fc937ecd9d2c77b294d8074 (diff) | |
| download | rails-1f80e8d6856837dd78a4af756e1b26cf06b17fc2.tar.gz rails-1f80e8d6856837dd78a4af756e1b26cf06b17fc2.tar.bz2 rails-1f80e8d6856837dd78a4af756e1b26cf06b17fc2.zip | |
PR #10635 introduces rescue from ArgumentError thrown by `Base64.strict_decode64`.
This broke natural order of things for `StaleSessionCheck#stale_session_check!` which tried auto_loading a class based on `ArgumentError` message , and later retrying the `Marshal#load` of class, successfully allowing auto_loading.
This PR tries to fix this behavior by forwarding `ArgumentError` 's not raised by `Base64.strict_decode64` , as is, ahead to `StaleSessionCheck#stale_session_check!`
Diffstat (limited to 'activesupport/lib')
| -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 |