Skip to content

[Security] fix(security): fix OIDC user identifier #60166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2025
Merged

[Security] fix(security): fix OIDC user identifier #60166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcTokenHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,11 @@ public function getUserBadgeFrom(string $accessToken): UserBadge
}

// UserLoader argument can be overridden by a UserProvider on AccessTokenAuthenticator::authenticate
return new UserBadge($claims[$this->claim], new FallbackUserLoader(fn () => $this->createUser($claims)), $claims);
return new UserBadge($claims[$this->claim], new FallbackUserLoader(function () use ($claims) {
$claims['user_identifier'] = $claims[$this->claim];

return $this->createUser($claims);
}), $claims);
} catch (\Exception $e) {
$this->logger?->error('An error occurred while decoding and validating the token.', [
'error' => $e->getMessage(),
Expand Down
6 changes: 5 additions & 1 deletion src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcUserInfoTokenHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ public function getUserBadgeFrom(string $accessToken): UserBadge
}

// UserLoader argument can be overridden by a UserProvider on AccessTokenAuthenticator::authenticate
return new UserBadge($claims[$this->claim], new FallbackUserLoader(fn () => $this->createUser($claims)), $claims);
return new UserBadge($claims[$this->claim], new FallbackUserLoader(function () use ($claims) {
$claims['user_identifier'] = $claims[$this->claim];

return $this->createUser($claims);
}), $claims);
} catch (\Exception $e) {
$this->logger?->error('An error occurred on OIDC server.', [
'error' => $e->getMessage(),
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcTokenHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function testGetsUserIdentifierFromSignedToken(string $claim, string $exp
'email' => 'foo@example.com',
];
$token = $this->buildJWS(json_encode($claims));
$expectedUser = new OidcUser(...$claims);
$expectedUser = new OidcUser(...$claims, userIdentifier: $claims[$claim]);

$loggerMock = $this->createMock(LoggerInterface::class);
$loggerMock->expects($this->never())->method('error');
Expand All @@ -66,7 +66,7 @@ public function testGetsUserIdentifierFromSignedToken(string $claim, string $exp
$this->assertInstanceOf(OidcUser::class, $actualUser);
$this->assertEquals($expectedUser, $actualUser);
$this->assertEquals($claims, $userBadge->getAttributes());
$this->assertEquals($claims['sub'], $actualUser->getUserIdentifier());
$this->assertEquals($claims[$claim], $actualUser->getUserIdentifier());
}

public static function getClaims(): iterable
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcUserInfoTokenHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function testGetsUserIdentifierFromOidcServerResponse(string $claim, stri
'sub' => 'e21bf182-1538-406e-8ccb-e25a17aba39f',
'email' => 'foo@example.com',
];
$expectedUser = new OidcUser(...$claims);
$expectedUser = new OidcUser(...$claims, userIdentifier: $claims[$claim]);

$responseMock = $this->createMock(ResponseInterface::class);
$responseMock->expects($this->once())
Expand All @@ -52,7 +52,7 @@ public function testGetsUserIdentifierFromOidcServerResponse(string $claim, stri
$this->assertInstanceOf(OidcUser::class, $actualUser);
$this->assertEquals($expectedUser, $actualUser);
$this->assertEquals($claims, $userBadge->getAttributes());
$this->assertEquals($claims['sub'], $actualUser->getUserIdentifier());
$this->assertEquals($claims[$claim], $actualUser->getUserIdentifier());
}

public static function getClaims(): iterable
Expand Down
Loading