fixes retrieving multiple values for extra fields

mvhirsch · mvhirsch · commit e51b502d7468 · 2023-02-01T14:36:40.000+01:00
diff --git a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php
@@ -187,6 +187,9 @@ private function getAttributeValue(Entry $entry, string $attribute)
         }
 
         $values = $entry->getAttribute($attribute);
+        if (!\in_array($attribute, [$this->uidKey, $this->passwordAttribute])) {
+            return $values;
+        }
 
         if (1 !== \count($values)) {
             throw new InvalidArgumentException(sprintf('Attribute "%s" has multiple values.', $attribute));
diff --git a/src/Symfony/Component/Ldap/Tests/Security/LdapUserProviderTest.php b/src/Symfony/Component/Ldap/Tests/Security/LdapUserProviderTest.php
@@ -333,6 +333,52 @@ public function testLoadUserByUsernameIsSuccessfulWithPasswordAttribute()
         $this->assertInstanceOf(LdapUser::class, $provider->loadUserByIdentifier('foo'));
     }
 
+    public function testLoadUserByIdentifierIsSuccessfulWithMultipleExtraAttributes()
+    {
+        $result = $this->createMock(CollectionInterface::class);
+        $query = $this->createMock(QueryInterface::class);
+        $query
+            ->expects($this->once())
+            ->method('execute')
+            ->willReturn($result)
+        ;
+        $ldap = $this->createMock(LdapInterface::class);
+        $memberOf = [
+            'cn=foo,ou=MyBusiness,dc=symfony,dc=com',
+            'cn=bar,ou=MyBusiness,dc=symfony,dc=com',
+        ];
+        $result
+            ->expects($this->once())
+            ->method('offsetGet')
+            ->with(0)
+            ->willReturn(new Entry('foo', [
+                'sAMAccountName' => ['foo'],
+                'userpassword' => ['bar'],
+                'memberOf' => $memberOf,
+            ]))
+        ;
+        $result
+            ->expects($this->once())
+            ->method('count')
+            ->willReturn(1)
+        ;
+        $ldap
+            ->expects($this->once())
+            ->method('escape')
+            ->willReturn('foo')
+        ;
+        $ldap
+            ->expects($this->once())
+            ->method('query')
+            ->willReturn($query)
+        ;
+
+        $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, [], 'sAMAccountName', '({uid_key}={user_identifier})', 'userpassword', ['memberOf']);
+        $user = $provider->loadUserByIdentifier('foo');
+        $this->assertInstanceOf(LdapUser::class, $user);
+        $this->assertSame(['memberOf' => $memberOf], $user->getExtraFields());
+    }
+
     public function testRefreshUserShouldReturnUserWithSameProperties()
     {
         $ldap = $this->createMock(LdapInterface::class);

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,9 @@ private function getAttributeValue(Entry $entry, string $attribute)`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`$values = $entry->getAttribute($attribute);`
	`190`	`+ if (!\in_array($attribute, [$this->uidKey, $this->passwordAttribute])) {`
	`191`	`+ return $values;`
	`192`	`+ }`
`190`	`193`
`191`	`194`	`if (1 !== \count($values)) {`
`192`	`195`	`throw new InvalidArgumentException(sprintf('Attribute "%s" has multiple values.', $attribute));`