Merge branch 'feature-http-auth-improvements' of https://github.com/davidwindell/zf2 into feature/http-auth-resolover

Author: weierophinney

src/Adapter/Http.php

@@ -496,14 +496,19 @@ protected function _basicAuth($header)
             return $this->_challengeClient();
         }
 
-        $password = $this->_basicResolver->resolve($creds[0], $this->_realm);
-        if ($password && 
-            $this->_secureStringCompare($password, $creds[1])) {
+        $result = $this->_basicResolver->resolve($creds[0], $this->_realm, $creds[1]);
+        
+        if ($result
+            && !is_array($result)
+            && $this->_secureStringCompare($result, $creds[1])
+        ) {
             $identity = array('username'=>$creds[0], 'realm'=>$this->_realm);
             return new Authentication\Result(Authentication\Result::SUCCESS, $identity);
-        } else {
-            return $this->_challengeClient();
+        } elseif (is_array($result)) {
+            return new Authentication\Result(Authentication\Result::SUCCESS, $result);
         }
+
+        return $this->_challengeClient();
     }
 
     /**

src/Adapter/Http/FileResolver.php

@@ -99,7 +99,7 @@ public function getFile()
      *         realm, false otherwise.
      * @throws Exception\ExceptionInterface
      */
-    public function resolve($username, $realm)
+    public function resolve($username, $realm, $password = null)
     {
         if (empty($username)) {
             throw new Exception\InvalidArgumentException('Username is required');

src/Adapter/Http/ResolverInterface.php

@@ -40,8 +40,9 @@ interface ResolverInterface
      *
      * @param  string $username Username
      * @param  string $realm    Authentication Realm
-     * @return string|false User's shared secret, if the user is found in the
-     *         realm, false otherwise.
+     * @param  string $password Password (optional)
+     * @return string|array|false User's shared secret as string if found in realm, or User's identity as array
+     *         if resolved, false otherwise.
      */
-    public function resolve($username, $realm);
+    public function resolve($username, $realm, $password = null);
 }