Merge pull request #57 from bradstinson/master

nategood · nategood · commit 6db93c157d65 · 2012-10-06T07:39:02.000-07:00
Added support for digest authentication
diff --git a/src/Httpful/Request.php b/src/Httpful/Request.php
@@ -133,6 +133,14 @@ public function hasBasicAuth()
         return isset($this->password) && isset($this->username);
     }
 
+    /**
+     * @return bool Is this request setup for digest auth?
+     */
+    public function hasDigestAuth()
+    {
+        return isset($this->password) && isset($this->username) && $this->additional_curl_opts['CURLOPT_HTTPAUTH'] = CURLAUTH_DIGEST;
+    }    
+
     /**
      * If the response is a 301 or 302 redirect, automatically
      * send off another request to that location
@@ -221,6 +229,24 @@ public function authenticateWithBasic($username, $password)
         return $this->basicAuth($username, $password);
     }
 
+    /**
+     * User Digest Auth.
+     * @return Request this
+     * @param string $username
+     * @param string $password
+     */
+    public function digestAuth($username, $password)
+    {
+        $this->addOnCurlOption(CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+        return $this->basicAuth($username, $password);
+    }
+
+    // @alias of digestAuth
+    public function authenticateWithDigest($username, $password)
+    {
+        return $this->digestAuth($username, $password);
+    } 
+
     /**
      * @return is this request setup for client side cert?
      */
diff --git a/tests/Httpful/HttpfulTest.php b/tests/Httpful/HttpfulTest.php
@@ -216,6 +216,19 @@ function testAuthSetup()
         $this->assertTrue($r->hasBasicAuth());
     }
 
+    function testDigestAuthSetup()
+    {
+        $username = 'nathan';
+        $password = 'opensesame';
+
+        $r = Request::get('http://example.com/')
+            ->authenticateWithDigest($username, $password);
+
+        $this->assertEquals($username, $r->username);
+        $this->assertEquals($password, $r->password);
+        $this->assertTrue($r->hasDigestAuth());
+    } 
+
     function testJsonResponseParse()
     {
         $req = Request::init()->sendsAndExpects(Mime::JSON);
