[Security] LdapUserProvider should not throw an exception if the UID …

…key does not exist in an LDAP entry
symfony · Feb 11, 2017 · 46f1fd9 · 46f1fd9
1 parent fa0e27a
commit 46f1fd9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Tests/User/LdapUserProviderTest.php b/Tests/User/LdapUserProviderTest.php
@@ -151,10 +151,7 @@ public function testLoadUserByUsernameFailsIfMoreThanOneLdapPasswordsInEntry()
         );
     }
 
-    /**
-     * @expectedException \Symfony\Component\Security\Core\Exception\InvalidArgumentException
-     */
-    public function testLoadUserByUsernameFailsIfEntryHasNoUidKeyAttribute()
+    public function testLoadUserByUsernameShouldNotFailIfEntryHasNoUidKeyAttribute()
     {
         $result = $this->getMockBuilder(CollectionInterface::class)->getMock();
         $query = $this->getMockBuilder(QueryInterface::class)->getMock();

diff --git a/User/LdapUserProvider.php b/User/LdapUserProvider.php
@@ -48,7 +48,7 @@ class LdapUserProvider implements UserProviderInterface
     public function __construct(LdapInterface $ldap, $baseDn, $searchDn = null, $searchPassword = null, array $defaultRoles = array(), $uidKey = 'sAMAccountName', $filter = '({uid_key}={username})', $passwordAttribute = null)
     {
         if (null === $uidKey) {
-            $uidKey = 'uid';
+            $uidKey = 'sAMAccountName';
         }
 
         $this->ldap = $ldap;
@@ -87,7 +87,13 @@ public function loadUserByUsername($username)
         }
 
         $entry = $entries[0];
-        $username = $this->getAttributeValue($entry, $this->uidKey);
+
+        try {
+            if (null !== $this->uidKey) {
+                $username = $this->getAttributeValue($entry, $this->uidKey);
+            }
+        } catch (InvalidArgumentException $e) {
+        }
 
         return $this->loadUser($username, $entry);
     }
@@ -123,6 +129,7 @@ public function supportsClass($class)
     protected function loadUser($username, Entry $entry)
     {
         $password = null;
+
         if (null !== $this->passwordAttribute) {
             $password = $this->getAttributeValue($entry, $this->passwordAttribute);
         }