Commitee4d9a7

authored and

committed

[Security] LdapUserProvider should not throw an exception if the UID key does not exist in an LDAP entry

1 parent81ad336 commitee4d9a7Copy full SHA for ee4d9a7

File tree

+10

-6

lines changed

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

+10

-6

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,10 +151,7 @@ public function testLoadUserByUsernameFailsIfMoreThanOneLdapPasswordsInEntry()`
`151`	`151`	`);`
`152`	`152`	`}`
`153`	`153`
`154`		`-/**`
`155`		`- * @expectedException \Symfony\Component\Security\Core\Exception\InvalidArgumentException`
`156`		`- */`
`157`		`-publicfunctiontestLoadUserByUsernameFailsIfEntryHasNoUidKeyAttribute()`
	`154`	`+publicfunctiontestLoadUserByUsernameShouldNotFailIfEntryHasNoUidKeyAttribute()`
`158`	`155`	`{`
`159`	`156`	`$result =$this->getMockBuilder(CollectionInterface::class)->getMock();`
`160`	`157`	`$query =$this->getMockBuilder(QueryInterface::class)->getMock();`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class LdapUserProvider implements UserProviderInterface`
`48`	`48`	`publicfunction__construct(LdapInterface$ldap,$baseDn,$searchDn =null,$searchPassword =null,array$defaultRoles =array(),$uidKey ='sAMAccountName',$filter ='({uid_key}={username})',$passwordAttribute =null)`
`49`	`49`	`{`
`50`	`50`	`if (null ===$uidKey) {`
`51`		`-$uidKey ='uid';`
	`51`	`+$uidKey ='sAMAccountName';`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`$this->ldap =$ldap;`
`@@ -87,7 +87,13 @@ public function loadUserByUsername($username)`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`$entry =$entries[0];`
`90`		`-$username =$this->getAttributeValue($entry,$this->uidKey);`
	`90`	`+`
	`91`	`+try {`
	`92`	`+if (null !==$this->uidKey) {`
	`93`	`+$username =$this->getAttributeValue($entry,$this->uidKey);`
	`94`	`+ }`
	`95`	`+ }catch (InvalidArgumentException$e) {`
	`96`	`+ }`
`91`	`97`
`92`	`98`	`return$this->loadUser($username,$entry);`
`93`	`99`	`}`
`@@ -123,6 +129,7 @@ public function supportsClass($class)`
`123`	`129`	`protectedfunctionloadUser($username,Entry$entry)`
`124`	`130`	`{`
`125`	`131`	`$password =null;`
	`132`	`+`
`126`	`133`	`if (null !==$this->passwordAttribute) {`
`127`	`134`	`$password =$this->getAttributeValue($entry,$this->passwordAttribute);`
`128`	`135`	`}`

Comments

(0)