From 9ffe46fb65dcde8670484403c827182621ac2901 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 29 Oct 2015 10:42:44 -0700 Subject: [PATCH] use secure string comparisons for basic auth username / password this will avoid timing attacks against applications that use basic auth. Conflicts: activesupport/lib/active_support/security_utils.rb Conflicts: actionpack/lib/action_controller/metal/http_authentication.rb CVE-2015-7576 --- .../action_controller/metal/http_authentication.rb | 7 +++++- 1 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 activesupport/lib/active_support/security_utils.rb diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb index fe4ab65..2ae5160 100644 --- a/actionpack/lib/action_controller/metal/http_authentication.rb +++ b/actionpack/lib/action_controller/metal/http_authentication.rb @@ -1,5 +1,6 @@ require 'active_support/base64' require 'active_support/core_ext/object/blank' +require 'active_support/security_utils' module ActionController module HttpAuthentication @@ -111,7 +112,11 @@ module ActionController def http_basic_authenticate_with(options = {}) before_filter(options.except(:name, :password, :realm)) do authenticate_or_request_with_http_basic(options[:realm] || "Application") do |name, password| - name == options[:name] && password == options[:password] + # This comparison uses & so that it doesn't short circuit and + # uses `variable_size_secure_compare` so that length information + # isn't leaked. + ActiveSupport::SecurityUtils.variable_size_secure_compare(name, options[:name]) & + ActiveSupport::SecurityUtils.variable_size_secure_compare(password, options[:password]) end end end -- 2.2.1