diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-10-23 22:57:26 -0300 |
---|---|---|
committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-10-23 22:57:26 -0300 |
commit | 1d9ebec0a9e84aa680313b17ceb800f1b10df3b9 (patch) | |
tree | 530d4abf3fe7573c29815615c90946391cbfb02e /activesupport/lib/active_support/message_verifier.rb | |
parent | be49ec4b1f4256146b963a781a02748a342c6b6e (diff) | |
parent | 0073d274de5bf3894f6da27f798238908eed43b5 (diff) | |
download | rails-1d9ebec0a9e84aa680313b17ceb800f1b10df3b9.tar.gz rails-1d9ebec0a9e84aa680313b17ceb800f1b10df3b9.tar.bz2 rails-1d9ebec0a9e84aa680313b17ceb800f1b10df3b9.zip |
Merge pull request #17369 from rails/secure_compare
Secure compare
Diffstat (limited to 'activesupport/lib/active_support/message_verifier.rb')
-rw-r--r-- | activesupport/lib/active_support/message_verifier.rb | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb index 6cb2884fb7..4e0796f4f8 100644 --- a/activesupport/lib/active_support/message_verifier.rb +++ b/activesupport/lib/active_support/message_verifier.rb @@ -1,5 +1,6 @@ require 'base64' require 'active_support/core_ext/object/blank' +require 'active_support/security_utils' module ActiveSupport # +MessageVerifier+ makes it easy to generate and verify messages which are @@ -37,7 +38,7 @@ module ActiveSupport raise InvalidSignature if signed_message.blank? data, digest = signed_message.split("--") - if data.present? && digest.present? && secure_compare(digest, generate_digest(data)) + if data.present? && digest.present? && ActiveSupport::SecurityUtils.secure_compare(digest, generate_digest(data)) begin @serializer.load(::Base64.strict_decode64(data)) rescue ArgumentError => argument_error @@ -55,17 +56,6 @@ module ActiveSupport end private - # constant-time comparison algorithm to prevent timing attacks - def secure_compare(a, b) - return false unless a.bytesize == b.bytesize - - l = a.unpack "C#{a.bytesize}" - - res = 0 - b.each_byte { |byte| res |= byte ^ l.shift } - res == 0 - end - def generate_digest(data) require 'openssl' unless defined?(OpenSSL) OpenSSL::HMAC.hexdigest(OpenSSL::Digest.const_get(@digest).new, @secret, data) |