From 0de876c53fe9355f1e9a73e923519f2a2241f527 Mon Sep 17 00:00:00 2001

From: Aaron Patterson <aaron.patterson@gmail.com>

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

CVE-2015-7576

---

 .../action_controller/metal/http_authentication.rb |  7 +++++-

 activesupport/lib/active_support/security_utils.rb | 27 ++++++++++++++++++++++

 2 files changed, 33 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 167df2f..db93e20 100644

--- a/actionpack/lib/action_controller/metal/http_authentication.rb

+++ b/actionpack/lib/action_controller/metal/http_authentication.rb

@@ -1,4 +1,5 @@

 require 'base64'

+require 'active_support/security_utils'

 module ActionController

   # Makes it dead easy to do HTTP Basic, Digest and Token authentication.

@@ -70,7 +71,11 @@ module ActionController

           def http_basic_authenticate_with(options = {})

             before_action(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