aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-05-18 16:59:37 +0200
committerPratik Naik <pratiknaik@gmail.com>2009-05-18 16:59:37 +0200
commit195fadbfd31294d43634afb7bbf4f0ffc86b470a (patch)
treeb3cb14a77ca1c4496559cac1fcc8eef1a2cbbfbe /actionpack/lib/action_controller/base
parent28f5cfe066dfa901d71c02987e390937a74517c8 (diff)
downloadrails-195fadbfd31294d43634afb7bbf4f0ffc86b470a.tar.gz
rails-195fadbfd31294d43634afb7bbf4f0ffc86b470a.tar.bz2
rails-195fadbfd31294d43634afb7bbf4f0ffc86b470a.zip
Ensure HTTP Digest auth uses appropriate HTTP method [#2490 state:resolved] [Steve Madsen]
Diffstat (limited to 'actionpack/lib/action_controller/base')
-rw-r--r--actionpack/lib/action_controller/base/http_authentication.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base/http_authentication.rb b/actionpack/lib/action_controller/base/http_authentication.rb
index fa8ecea408..2893290efb 100644
--- a/actionpack/lib/action_controller/base/http_authentication.rb
+++ b/actionpack/lib/action_controller/base/http_authentication.rb
@@ -194,9 +194,10 @@ module ActionController
if valid_nonce && realm == credentials[:realm] && opaque == credentials[:opaque]
password = password_procedure.call(credentials[:username])
+ method = request.env['rack.methodoverride.original_method'] || request.env['REQUEST_METHOD']
[true, false].any? do |password_is_ha1|
- expected = expected_response(request.env['REQUEST_METHOD'], request.env['REQUEST_URI'], credentials, password, password_is_ha1)
+ expected = expected_response(method, request.env['REQUEST_URI'], credentials, password, password_is_ha1)
expected == credentials[:response]
end
end