[Ldap] load users with the good username case

Author: quentinus95

src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php

@@ -119,7 +119,7 @@ public function testLoadUserByUsernameFailsIfMoreThanOneLdapPasswordsInEntry()
         ;
         $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
         $result
-            ->expects($this->once())
+            ->expects($this->exactly(2))
             ->method('offsetGet')
             ->with(0)
             ->will($this->returnValue(new Entry('foo', array(
@@ -165,7 +165,7 @@ public function testLoadUserByUsernameFailsIfEntryHasNoPasswordAttribute()
         ;
         $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
         $result
-            ->expects($this->once())
+            ->expects($this->exactly(2))
             ->method('offsetGet')
             ->with(0)
             ->will($this->returnValue(new Entry('foo', array(
@@ -207,7 +207,7 @@ public function testLoadUserByUsernameIsSuccessfulWithoutPasswordAttribute()
         ;
         $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
         $result
-            ->expects($this->once())
+            ->expects($this->exactly(2))
             ->method('offsetGet')
             ->with(0)
             ->will($this->returnValue(new Entry('foo', array(
@@ -238,7 +238,7 @@ public function testLoadUserByUsernameIsSuccessfulWithoutPasswordAttribute()
         );
     }
 
-    public function testLoadUserByUsernameIsSuccessfulWithPasswordAttribute()
+    public function testLoadUserByUsernameIsSuccessfulWithoutPasswordAttributeAndWrongCase()
     {
         $result = $this->getMockBuilder(CollectionInterface::class)->getMock();
         $query = $this->getMockBuilder(QueryInterface::class)->getMock();
@@ -249,7 +249,46 @@ public function testLoadUserByUsernameIsSuccessfulWithPasswordAttribute()
         ;
         $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
         $result
+            ->expects($this->exactly(2))
+            ->method('offsetGet')
+            ->with(0)
+            ->will($this->returnValue(new Entry('foo', array(
+                    'sAMAccountName' => array('foo'),
+                )
+            )))
+        ;
+        $result
+            ->expects($this->once())
+            ->method('count')
+            ->will($this->returnValue(1))
+        ;
+        $ldap
+            ->expects($this->once())
+            ->method('escape')
+            ->will($this->returnValue('Foo'))
+        ;
+        $ldap
+            ->expects($this->once())
+            ->method('query')
+            ->will($this->returnValue($query))
+        ;
+
+        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com');
+        $this->assertSame('foo', $provider->loadUserByUsername('Foo')->getUsername());
+    }
+
+    public function testLoadUserByUsernameIsSuccessfulWithPasswordAttribute()
+    {
+        $result = $this->getMock(CollectionInterface::class);
+        $query = $this->getMock(QueryInterface::class);
+        $query
             ->expects($this->once())
+            ->method('execute')
+            ->will($this->returnValue($result))
+        ;
+        $ldap = $this->getMock(LdapInterface::class);
+        $result
+            ->expects($this->exactly(2))
             ->method('offsetGet')
             ->with(0)
             ->will($this->returnValue(new Entry('foo', array(

src/Symfony/Component/Security/Core/User/LdapUserProvider.php

@@ -31,6 +31,7 @@ class LdapUserProvider implements UserProviderInterface
     private $searchDn;
     private $searchPassword;
     private $defaultRoles;
+    private $uidKey;
     private $defaultSearch;
     private $passwordAttribute;
 
@@ -51,6 +52,7 @@ public function __construct(LdapInterface $ldap, $baseDn, $searchDn = null, $sea
         $this->searchDn = $searchDn;
         $this->searchPassword = $searchPassword;
         $this->defaultRoles = $defaultRoles;
+        $this->uidKey = $uidKey;
         $this->defaultSearch = str_replace('{uid_key}', $uidKey, $filter);
         $this->passwordAttribute = $passwordAttribute;
     }
@@ -80,7 +82,7 @@ public function loadUserByUsername($username)
             throw new UsernameNotFoundException('More than one user found');
         }
 
-        return $this->loadUser($username, $entries[0]);
+        return $this->loadUser($entries[0]->getAttribute($this->uidKey)[0], $entries[0]);
     }
 
     /**