bug #61595 [Security] Pass attributes to nested ChainUserProviders (valtzu)

fabpot · fabpot · commit 2205b62431c4 · 2025-09-03T07:43:47.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [Security] Pass attributes to nested `ChainUserProvider`s | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT Fix a missed corner case of #61548 found by `@nicolas`-grekas in #61594 (comment) _(Not needed on 8.0)_ Commits ------- cb75dd2 [Security] Pass attributes to nested `ChainUserProviders`
diff --git a/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php b/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
@@ -49,6 +49,14 @@ public function testLoadUserByIdentifier()
 
     public function testLoadUserByIdentifierWithAttributes()
     {
+        $provider0 = $this->createMock(ChainUserProvider::class);
+        $provider0
+            ->expects($this->once())
+            ->method('loadUserByIdentifier')
+            ->with($this->equalTo('foo'), $this->equalTo(['attr' => 5]))
+            ->willThrowException(new UserNotFoundException('not found'))
+        ;
+
         $provider1 = $this->createMock(UserProviderInterface::class);
         $provider1
             ->expects($this->once())
@@ -65,7 +73,7 @@ public function testLoadUserByIdentifierWithAttributes()
             ->willReturn($account = $this->createMock(UserInterface::class))
         ;
 
-        $provider = new ChainUserProvider([$provider1, $provider2]);
+        $provider = new ChainUserProvider([$provider0, $provider1, $provider2]);
         $this->assertSame($account, $provider->loadUserByIdentifier('foo', ['attr' => 5]));
     }
 
diff --git a/src/Symfony/Component/Security/Core/User/ChainUserProvider.php b/src/Symfony/Component/Security/Core/User/ChainUserProvider.php
@@ -64,7 +64,7 @@ public function loadUserByIdentifier(string $identifier/* , array $attributes =
         $attributes = \func_num_args() > 1 ? func_get_arg(1) : [];
         foreach ($this->providers as $provider) {
             try {
-                if ($provider instanceof AttributesBasedUserProviderInterface) {
+                if ($provider instanceof AttributesBasedUserProviderInterface || $provider instanceof self) {
                     return $provider->loadUserByIdentifier($identifier, $attributes);
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function loadUserByIdentifier(string $identifier/* , array $attributes =`
`64`	`64`	`$attributes = \func_num_args() > 1 ? func_get_arg(1) : [];`
`65`	`65`	`foreach ($this->providers as $provider) {`
`66`	`66`	`try {`
`67`		`- if ($provider instanceof AttributesBasedUserProviderInterface) {`
	`67`	`+ if ($provider instanceof AttributesBasedUserProviderInterface \|\| $provider instanceof self) {`
`68`	`68`	`return $provider->loadUserByIdentifier($identifier, $attributes);`
`69`	`69`	`}`
`70`	`70`