added extra validation, verification and unit tests for issue ZF-7289

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22613 44c647ce-9c0f-0410-b52a-842ac1e357ba
zendframework · Jul 22, 2010 · 48f458a · 48f458a
1 parent c79afc4
commit 48f458a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/Adapter/DbTable.php b/src/Adapter/DbTable.php
@@ -369,6 +369,17 @@ public function authenticate()
             return $authResult;
         }
 
+        if (true === $this->getAmbiguityIdentity()) {
+            $validIdentities = array ();
+            $zendAuthCredentialMatchColumn = $this->_zendDb->foldCase('zend_auth_credential_match');
+            foreach ($resultIdentities as $identity) {
+                if (1 === (int) $identity[$zendAuthCredentialMatchColumn]) {
+                    $validIdentities[] = $identity;
+                }
+            }
+            $resultIdentities = $validIdentities;
+        }
+
         $authResult = $this->_authenticateValidateResult(array_shift($resultIdentities));
         return $authResult;
     }

diff --git a/test/Adapter/DbTableTest.php b/test/Adapter/DbTableTest.php
@@ -429,6 +429,9 @@ public function testEqualUsernamesDifferentPasswordShouldAuthenticateWhenFlagIsS
         $this->assertTrue($result->isValid());
         $this->assertEquals('my_username', $result->getIdentity());
 
+        $this->_adapter = null;
+        $this->_setupAuthAdapter();
+
         // test if user 2 can authenticate
         $this->_adapter->setIdentity('my_username')
                        ->setCredential('my_otherpass')