Browse files

Digest auth should not 500 when given a basic header.

  • Loading branch information...
1 parent bfdd3c2 commit 95332abe091d0fe8b6b108fffa8208af21a4cca0 @braddunbar braddunbar committed Jan 21, 2013
View
5 actionpack/CHANGELOG.md
@@ -1,5 +1,10 @@
## Rails 4.0.0 (unreleased) ##
+* Ensure that digest authentication responds with a 401 status when a basic
+ header is received.
+
+ *Brad Dunbar*
+
* Include I18n locale fallbacks in view lookup.
Fixes GH#3512.
View
1 actionpack/lib/action_controller/metal/http_authentication.rb
@@ -299,6 +299,7 @@ def nonce(secret_key, time = Time.now)
# allow a user to use new nonce without prompting user again for their
# username and password.
def validate_nonce(secret_key, request, value, seconds_to_timeout=5*60)
+ return false if value.nil?
t = ::Base64.decode64(value).split(":").first.to_i
nonce(secret_key, t) == value && (t - Time.now.to_i).abs <= seconds_to_timeout
end
View
8 actionpack/test/controller/http_digest_authentication_test.rb
@@ -249,6 +249,14 @@ def authenticate_with_request
assert_equal 'Definitely Maybe', @response.body
end
+ test "when sent a basic auth header, returns Unauthorized" do
+ @request.env['HTTP_AUTHORIZATION'] = 'Basic Gwf2aXq8ZLF3Hxq='
+
+ get :display
+
+ assert_response :unauthorized
+ end
+
private
def encode_credentials(options)

0 comments on commit 95332ab

Please sign in to comment.