Split Basic and Digest authorization tests

1 files changed, 79 insertions, 82 deletions

diff --git a/activeresource/test/cases/authorization_test.rb b/activeresource/test/cases/authorization_test.rb
index 0185e5432d..fbfe086599 100644
--- a/activeresource/test/cases/authorization_test.rb
+++ b/activeresource/test/cases/authorization_test.rb
@@ -9,8 +9,18 @@ class AuthorizationTest < ActiveSupport::TestCase
     @david = { :person => { :id => 2, :name => 'David' } }.to_json
     @authenticated_conn = ActiveResource::Connection.new("http://david:test123@localhost")
     @basic_authorization_request_header = { 'Authorization' => 'Basic ZGF2aWQ6dGVzdDEyMw==' }
+  end
 
-    @nonce = "MTI0OTUxMzc4NzpjYWI3NDM3NDNmY2JmODU4ZjQ2ZjcwNGZkMTJiMjE0NA=="
+  private
+    def decode(response)
+      @authenticated_conn.format.decode(response.body)
+    end
+end
+
+class BasicAuthorizationTest < AuthorizationTest
+  def setup
+    super
+    @authenticated_conn.auth_type = :basic
 
     ActiveResource::HttpMock.respond_to do |mock|
       mock.get    "/people/2.json",           @basic_authorization_request_header, @david
@@ -19,34 +29,48 @@ class AuthorizationTest < ActiveSupport::TestCase
       mock.delete "/people/2.json",           @basic_authorization_request_header, nil, 200
       mock.post   "/people/2/addresses.json", @basic_authorization_request_header, nil, 201, 'Location' => '/people/1/addresses/5'
       mock.head   "/people/2.json",           @basic_authorization_request_header, nil, 200
+    end
+  end
 
-      mock.get    "/people/2.json",           { 'Authorization' => blank_digest_auth_header("/people/2.json", "fad396f6a34aeba28e28b9b96ddbb671") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
-      mock.get    "/people/2.json",           { 'Authorization' => request_digest_auth_header("/people/2.json", "c064d5ba8891a25290c76c8c7d31fb7b") }, @david, 200
-      mock.get    "/people/1.json",           { 'Authorization' => request_digest_auth_header("/people/1.json", "f9c0b594257bb8422af4abd429c5bb70") }, @matz, 200
+  def test_get
+    david = decode(@authenticated_conn.get("/people/2.json"))
+    assert_equal "David", david["name"]
+  end
 
-      mock.put    "/people/2.json",           { 'Authorization' => blank_digest_auth_header("/people/2.json", "50a685d814f94665b9d160fbbaa3958a") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
-      mock.put    "/people/2.json",           { 'Authorization' => request_digest_auth_header("/people/2.json", "5a75cde841122d8e0f20f8fd1f98a743") }, nil, 204
+  def test_post
+    response = @authenticated_conn.post("/people/2/addresses.json")
+    assert_equal "/people/1/addresses/5", response["Location"]
+  end
 
-      mock.delete "/people/2.json",           { 'Authorization' => blank_digest_auth_header("/people/2.json", "846f799107eab5ca4285b909ee299a33") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
-      mock.delete "/people/2.json",           { 'Authorization' => request_digest_auth_header("/people/2.json", "9f5b155224edbbb69fd99d8ce094681e") }, nil, 200
+  def test_put
+    response = @authenticated_conn.put("/people/2.json")
+    assert_equal 204, response.code
+  end
 
-      mock.post   "/people/2/addresses.json", { 'Authorization' => blank_digest_auth_header("/people/2/addresses.json", "6984d405ff3d9ed07bbf747dcf16afb0") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
-      mock.post   "/people/2/addresses.json", { 'Authorization' => request_digest_auth_header("/people/2/addresses.json", "4bda6a28dbf930b5af9244073623bd04") }, nil, 201, 'Location' => '/people/1/addresses/5'
+  def test_delete
+    response = @authenticated_conn.delete("/people/2.json")
+    assert_equal 200, response.code
+  end
 
-      mock.head   "/people/2.json",           { 'Authorization' => blank_digest_auth_header("/people/2.json", "15e5ed84ba5c4cfcd5c98a36c2e4f421") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
-      mock.head   "/people/2.json",           { 'Authorization' => request_digest_auth_header("/people/2.json", "d4c6d2bcc8717abb2e2ccb8c49ee6a91") }, nil, 200
-    end
+  def test_head
+    response = @authenticated_conn.head("/people/2.json")
+    assert_equal 200, response.code
+  end
 
-    # Make client nonce deterministic
-    class << @authenticated_conn
-      private
+  def test_retry_on_401_doesnt_happen_with_basic_auth
+    assert_raise(ActiveResource::UnauthorizedAccess) { @authenticated_conn.get("/people/1.json") }
+    assert_equal "", @authenticated_conn.send(:response_auth_header)
+  end
 
-      def client_nonce
-        'i-am-a-client-nonce'
-      end
-    end
+  def test_raises_invalid_request_on_unauthorized_requests
+    assert_raise(ActiveResource::InvalidRequestError) { @conn.get("/people/2.json") }
+    assert_raise(ActiveResource::InvalidRequestError) { @conn.post("/people/2/addresses.json") }
+    assert_raise(ActiveResource::InvalidRequestError) { @conn.put("/people/2.json") }
+    assert_raise(ActiveResource::InvalidRequestError) { @conn.delete("/people/2.json") }
+    assert_raise(ActiveResource::InvalidRequestError) { @conn.head("/people/2.json") }
   end
 
+
   def test_authorization_header
     authorization_header = @authenticated_conn.__send__(:authorization_header, :get, URI.parse('/people/2.json'))
     assert_equal @basic_authorization_request_header['Authorization'], authorization_header['Authorization']
@@ -116,7 +140,6 @@ class AuthorizationTest < ActiveSupport::TestCase
   end
 
   def test_authorization_header_if_credentials_supplied_and_auth_type_is_basic
-    @authenticated_conn.auth_type = :basic
     authorization_header = @authenticated_conn.__send__(:authorization_header, :get, URI.parse('/people/2.json'))
     assert_equal @basic_authorization_request_header['Authorization'], authorization_header['Authorization']
     authorization = authorization_header["Authorization"].to_s.split
@@ -125,76 +148,77 @@ class AuthorizationTest < ActiveSupport::TestCase
     assert_equal ["david", "test123"], ::Base64.decode64(authorization[1]).split(":")[0..1]
   end
 
-  def test_authorization_header_if_credentials_supplied_and_auth_type_is_digest
-    @authenticated_conn.auth_type = :digest
-    authorization_header = @authenticated_conn.__send__(:authorization_header, :get, URI.parse('/people/2.json'))
-    assert_equal blank_digest_auth_header("/people/2.json", "fad396f6a34aeba28e28b9b96ddbb671"), authorization_header['Authorization']
+  def test_client_nonce_is_not_nil
+    assert_not_nil ActiveResource::Connection.new("http://david:test123@localhost").send(:client_nonce)
   end
+end
 
-  def test_authorization_header_with_query_string_if_auth_type_is_digest
+class DigestAuthorizationTest < AuthorizationTest
+  def setup
+    super
     @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"]
-  end
+    # Make client nonce deterministic
+    def @authenticated_conn.client_nonce; 'i-am-a-client-nonce' end
 
-  def test_post
-    response = @authenticated_conn.post("/people/2/addresses.json")
-    assert_equal "/people/1/addresses/5", response["Location"]
-  end
+    @nonce = "MTI0OTUxMzc4NzpjYWI3NDM3NDNmY2JmODU4ZjQ2ZjcwNGZkMTJiMjE0NA=="
 
-  def test_put
-    response = @authenticated_conn.put("/people/2.json")
-    assert_equal 204, response.code
+    ActiveResource::HttpMock.respond_to do |mock|
+      mock.get    "/people/2.json",           { 'Authorization' => blank_digest_auth_header("/people/2.json", "fad396f6a34aeba28e28b9b96ddbb671") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
+      mock.get    "/people/2.json",           { 'Authorization' => request_digest_auth_header("/people/2.json", "c064d5ba8891a25290c76c8c7d31fb7b") }, @david, 200
+      mock.get    "/people/1.json",           { 'Authorization' => request_digest_auth_header("/people/1.json", "f9c0b594257bb8422af4abd429c5bb70") }, @matz, 200
+
+      mock.put    "/people/2.json",           { 'Authorization' => blank_digest_auth_header("/people/2.json", "50a685d814f94665b9d160fbbaa3958a") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
+      mock.put    "/people/2.json",           { 'Authorization' => request_digest_auth_header("/people/2.json", "5a75cde841122d8e0f20f8fd1f98a743") }, nil, 204
+
+      mock.delete "/people/2.json",           { 'Authorization' => blank_digest_auth_header("/people/2.json", "846f799107eab5ca4285b909ee299a33") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
+      mock.delete "/people/2.json",           { 'Authorization' => request_digest_auth_header("/people/2.json", "9f5b155224edbbb69fd99d8ce094681e") }, nil, 200
+
+      mock.post   "/people/2/addresses.json", { 'Authorization' => blank_digest_auth_header("/people/2/addresses.json", "6984d405ff3d9ed07bbf747dcf16afb0") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
+      mock.post   "/people/2/addresses.json", { 'Authorization' => request_digest_auth_header("/people/2/addresses.json", "4bda6a28dbf930b5af9244073623bd04") }, nil, 201, 'Location' => '/people/1/addresses/5'
+
+      mock.head   "/people/2.json",           { 'Authorization' => blank_digest_auth_header("/people/2.json", "15e5ed84ba5c4cfcd5c98a36c2e4f421") }, nil, 401, { 'WWW-Authenticate' => response_digest_auth_header }
+      mock.head   "/people/2.json",           { 'Authorization' => request_digest_auth_header("/people/2.json", "d4c6d2bcc8717abb2e2ccb8c49ee6a91") }, nil, 200
+    end
   end
 
-  def test_delete
-    response = @authenticated_conn.delete("/people/2.json")
-    assert_equal 200, response.code
+  def test_authorization_header_if_credentials_supplied_and_auth_type_is_digest
+    authorization_header = @authenticated_conn.__send__(:authorization_header, :get, URI.parse('/people/2.json'))
+    assert_equal blank_digest_auth_header("/people/2.json", "fad396f6a34aeba28e28b9b96ddbb671"), authorization_header['Authorization']
   end
 
-  def test_head
-    response = @authenticated_conn.head("/people/2.json")
-    assert_equal 200, response.code
+  def test_authorization_header_with_query_string_if_auth_type_is_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_with_digest_auth_handles_initial_401_response_and_retries
-    @authenticated_conn.auth_type = :digest
     response = @authenticated_conn.get("/people/2.json")
     assert_equal "David", decode(response)["name"]
   end
 
   def test_post_with_digest_auth_handles_initial_401_response_and_retries
-    @authenticated_conn.auth_type = :digest
     response = @authenticated_conn.post("/people/2/addresses.json")
     assert_equal "/people/1/addresses/5", response["Location"]
     assert_equal 201, response.code
   end
 
   def test_put_with_digest_auth_handles_initial_401_response_and_retries
-     @authenticated_conn.auth_type = :digest
-     response = @authenticated_conn.put("/people/2.json")
-     assert_equal 204, response.code
+    response = @authenticated_conn.put("/people/2.json")
+    assert_equal 204, response.code
   end
 
   def test_delete_with_digest_auth_handles_initial_401_response_and_retries
-    @authenticated_conn.auth_type = :digest
     response = @authenticated_conn.delete("/people/2.json")
     assert_equal 200, response.code
   end
 
   def test_head_with_digest_auth_handles_initial_401_response_and_retries
-    @authenticated_conn.auth_type = :digest
     response = @authenticated_conn.head("/people/2.json")
     assert_equal 200, response.code
   end
 
   def test_get_with_digest_auth_caches_nonce
-    @authenticated_conn.auth_type = :digest
     response = @authenticated_conn.get("/people/2.json")
     assert_equal "David", decode(response)["name"]
 
@@ -203,19 +227,6 @@ class AuthorizationTest < ActiveSupport::TestCase
     assert_equal "Matz", decode(response)["name"]
   end
 
-  def test_retry_on_401_only_happens_with_digest_auth
-    assert_raise(ActiveResource::UnauthorizedAccess) { @authenticated_conn.get("/people/1.json") }
-    assert_equal "", @authenticated_conn.send(:response_auth_header)
-  end
-
-  def test_raises_invalid_request_on_unauthorized_requests
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.get("/people/2.json") }
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.post("/people/2/addresses.json") }
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.put("/people/2.json") }
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.delete("/people/2.json") }
-    assert_raise(ActiveResource::InvalidRequestError) { @conn.head("/people/2.json") }
-  end
-
   def test_raises_invalid_request_on_unauthorized_requests_with_digest_auth
     @conn.auth_type = :digest
     assert_raise(ActiveResource::InvalidRequestError) { @conn.get("/people/2.json") }
@@ -225,17 +236,7 @@ class AuthorizationTest < ActiveSupport::TestCase
     assert_raise(ActiveResource::InvalidRequestError) { @conn.head("/people/2.json") }
   end
 
-  def test_client_nonce_is_not_nil
-    assert_not_nil ActiveResource::Connection.new("http://david:test123@localhost").send(:client_nonce)
-  end
-
-  protected
-    def assert_response_raises(klass, code)
-      assert_raise(klass, "Expected response code #{code} to raise #{klass}") do
-        @conn.__send__(:handle_response, Response.new(code))
-      end
-    end
-
+  private
     def blank_digest_auth_header(uri, response)
       %Q(Digest username="david", realm="", qop="", uri="#{uri}", nonce="", nc="0", cnonce="i-am-a-client-nonce", opaque="", response="#{response}")
     end
@@ -247,8 +248,4 @@ class AuthorizationTest < ActiveSupport::TestCase
     def response_digest_auth_header
       %Q(Digest realm="RailsTestApp", qop="auth", algorithm=MD5, nonce="#{@nonce}", opaque="ef6dfb078ba22298d366f99567814ffb")
     end
-
-    def decode(response)
-      @authenticated_conn.format.decode(response.body)
-    end
 end