diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-18 19:37:24 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-18 19:37:24 -0200 |
| commit | fb876b8a2c9445dc989742a8ea64f8fdcbc7705e (patch) | |
| tree | 039d86b6d23cdec5feefc532c23b4b9cbf798a92 /actionpack/lib/action_controller | |
| parent | 4ffe46f5fe957cb39eb93fc9120fab2dc951b384 (diff) | |
| parent | bf067b41e58409240a0370993069eb8820ca12a6 (diff) | |
| download | rails-fb876b8a2c9445dc989742a8ea64f8fdcbc7705e.tar.gz rails-fb876b8a2c9445dc989742a8ea64f8fdcbc7705e.tar.bz2 rails-fb876b8a2c9445dc989742a8ea64f8fdcbc7705e.zip | |
Merge pull request #18917 from lautis/non-string-csrf-token
Handle non-string authenticity tokens
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/request_forgery_protection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb index 7facbe79aa..7a7e2431b2 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -279,7 +279,7 @@ module ActionController #:nodoc: begin masked_token = Base64.strict_decode64(encoded_masked_token) - rescue ArgumentError # encoded_masked_token is invalid Base64 + rescue ArgumentError, NoMethodError # encoded_masked_token is invalid Base64 return false end |