Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed digest authentication for requests with a query string [#3158] #3159

Merged
merged 1 commit into from
Sep 28, 2011
+10 −1
Merged

Fixed digest authentication for requests with a query string [#3158] #3159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion activeresource/lib/active_resource/connection.rb
View file
Open in desktop
Expand Up @@ -238,8 +238,11 @@ def authorization_header(http_method, uri)
def digest_auth_header(http_method, uri)
params = extract_params_from_response

request_uri = uri.path
request_uri << "?#{uri.query}" if uri.query

ha1 = Digest::MD5.hexdigest("#{@user}:#{params['realm']}:#{@password}")
ha2 = Digest::MD5.hexdigest("#{http_method.to_s.upcase}:#{uri.path}")
ha2 = Digest::MD5.hexdigest("#{http_method.to_s.upcase}:#{request_uri}")

params.merge!('cnonce' => client_nonce)
request_digest = Digest::MD5.hexdigest([ha1, params['nonce'], "0", params['cnonce'], params['qop'], ha2].join(":"))
Expand Down
6 changes: 6 additions & 0 deletions activeresource/test/cases/authorization_test.rb
View file
Open in desktop
Expand Up @@ -131,6 +131,12 @@ def test_authorization_header_if_credentials_supplied_and_auth_type_is_digest
assert_equal blank_digest_auth_header("/people/2.json", "fad396f6a34aeba28e28b9b96ddbb671"), authorization_header['Authorization']
end

def test_authorization_header_with_query_string_if_auth_type_is_digest
@authenticated_conn.auth_type = :digest
authorization_header = @authenticated_conn.__send__(:authorization_header, :get, URI.parse('/people/2.json?only=name'))
assert_equal blank_digest_auth_header("/people/2.json?only=name", "f8457b0b5d21b6b80737a386217afb24"), authorization_header['Authorization']
end

def test_get
david = decode(@authenticated_conn.get("/people/2.json"))
assert_equal "David", david["name"]
Expand Down