Merge branch 'feature/7329' into develop

Close zendframework/zendframework#7329
zendframework · Mar 18, 2015 · 4e9e50f · 4e9e50f
19 parents b43fdbb + 305271e + 00635b5 + db2e66c + d538b76 + 196a8f4 + 999dcb4 + 48fdd88 + ffd4e9b + 2aef442 + b760b4d + 3ff9149 + 26bd10f + 1feb4cf + c7ed528 + a014f52 + 53882d7 + a840cae + b41cb87
commit 4e9e50f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -25,7 +25,7 @@ class Client implements Stdlib\DispatchableInterface
      * @const string Supported HTTP Authentication methods
      */
     const AUTH_BASIC  = 'basic';
-    const AUTH_DIGEST = 'digest';  // not implemented yet
+    const AUTH_DIGEST = 'digest';
 
     /**
      * @const string POST data encoding methods
@@ -1140,7 +1140,12 @@ protected function prepareHeaders($body, $uri)
                     }
                     break;
                 case self::AUTH_DIGEST :
-                    throw new Exception\RuntimeException("The digest authentication is not implemented yet");
+                    if (!$this->adapter instanceof Client\Adapter\Curl) {
+                        throw new Exception\RuntimeException("The digest authentication is only available for curl adapters (Zend\\Http\\Client\\Adapter\\Curl)");
+                    }
+
+                    $this->adapter->setCurlOption(CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+                    $this->adapter->setCurlOption(CURLOPT_USERPWD, $this->auth['user'] . ':' . $this->auth['password']);
             }
         }
 

diff --git a/test/ClientTest.php b/test/ClientTest.php
@@ -20,7 +20,6 @@
 use Zend\Http\Client\Adapter\Test;
 use ZendTest\Http\TestAsset\ExtendedClient;
 
-
 class ClientTest extends \PHPUnit_Framework_TestCase
 {
     public function testIfCookiesAreSticky()
@@ -376,6 +375,29 @@ public function testPrepareHeadersCreateRightHttpField()
         $this->assertArrayHasKey('Content-Length', $headers);
     }
 
+    public function testPrepareHeadersCurlDigestAuthentication()
+    {
+        $body = json_encode(array('foofoo'=>'barbar'));
+
+        $client = new Client();
+        $prepareHeadersReflection = new \ReflectionMethod($client, 'prepareHeaders');
+        $prepareHeadersReflection->setAccessible(true);
+
+        $request = new Request();
+        $request->getHeaders()->addHeaderLine('Authorization: Digest');
+        $request->getHeaders()->addHeaderLine('content-type', 'application/json');
+        $request->getHeaders()->addHeaderLine('content-length', strlen($body));
+        $client->setRequest($request);
+
+        $this->assertSame($client->getRequest(), $request);
+
+        $headers = $prepareHeadersReflection->invoke($client, $body, new Http('http://localhost:5984'));
+
+        $this->assertInternalType('array', $headers);
+        $this->assertArrayHasKey('Authorization', $headers);
+        $this->assertContains('Digest', $headers['Authorization']);
+    }
+
     /**
      * @group 6301
      */