-
Notifications
You must be signed in to change notification settings - Fork 17
IBX-8323: Reworked RepositoryAuthenticationProvider and moved its logic to a dedicated subscriber #396
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.
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
IBX-8323: Reworked RepositoryAuthenticationProvider and moved its logic to a dedicated subscriber #396
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
112 changes: 112 additions & 0 deletions
112
...ymfony/Security/Authentication/EventSubscriber/RepositoryUserAuthenticationSubscriber.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * @copyright Copyright (C) Ibexa AS. All rights reserved. | ||
| * @license For full copyright and license information view LICENSE file distributed with this source code. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Ibexa\Core\MVC\Symfony\Security\Authentication\EventSubscriber; | ||
|
|
||
| use Exception; | ||
| use Ibexa\Contracts\Core\Repository\Exceptions\PasswordInUnsupportedFormatException; | ||
| use Ibexa\Contracts\Core\Repository\UserService; | ||
| use Ibexa\Core\MVC\Symfony\Security\UserInterface as IbexaUserInterface; | ||
| use Ibexa\Core\Repository\User\Exception\UnsupportedPasswordHashType; | ||
| use Psr\Log\LoggerAwareTrait; | ||
| use Psr\Log\LoggerInterface; | ||
| use Psr\Log\NullLogger; | ||
| use Symfony\Component\EventDispatcher\EventSubscriberInterface; | ||
| use Symfony\Component\HttpFoundation\RequestStack; | ||
| use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge; | ||
| use Symfony\Component\Security\Http\Event\CheckPassportEvent; | ||
|
|
||
| final class RepositoryUserAuthenticationSubscriber implements EventSubscriberInterface | ||
| { | ||
| use LoggerAwareTrait; | ||
|
|
||
| public const string CONSTANT_AUTH_TIME_SETTING = 'ibexa.security.authentication.constant_auth_time'; | ||
|
|
||
| private const int USLEEP_MULTIPLIER = 1000000; | ||
|
|
||
| public function __construct( | ||
| private readonly RequestStack $requestStack, | ||
| private readonly UserService $userService, | ||
| private readonly float $constantAuthTime, | ||
| ?LoggerInterface $logger = null | ||
| ) { | ||
| $this->logger = $logger ?? new NullLogger(); | ||
| } | ||
|
|
||
| public static function getSubscribedEvents(): array | ||
| { | ||
| return [ | ||
| CheckPassportEvent::class => ['validateRepositoryUser'], | ||
| ]; | ||
| } | ||
|
|
||
| public function validateRepositoryUser(CheckPassportEvent $event): void | ||
| { | ||
| $request = $this->requestStack->getCurrentRequest(); | ||
Steveb-p marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if ($request === null) { | ||
| return; | ||
| } | ||
|
|
||
| $badge = $event->getPassport()->getBadge(UserBadge::class); | ||
| if (!$badge instanceof UserBadge) { | ||
| return; | ||
| } | ||
|
|
||
| $user = $badge->getUser(); | ||
| if (!$user instanceof IbexaUserInterface) { | ||
| return; | ||
| } | ||
|
|
||
| $startTime = $this->startConstantTimer(); | ||
| try { | ||
| $this->userService->checkUserCredentials( | ||
| $user->getAPIUser(), | ||
| $user->getPassword() ?? '' | ||
| ); | ||
|
|
||
| $event->getAuthenticator()->authenticate($request); | ||
| } catch (UnsupportedPasswordHashType $exception) { | ||
| $this->sleepUsingConstantTimer($startTime); | ||
|
|
||
| throw new PasswordInUnsupportedFormatException($exception); | ||
| } catch (Exception $e) { | ||
| $this->sleepUsingConstantTimer($startTime); | ||
|
|
||
| throw $e; | ||
| } | ||
|
|
||
| $this->sleepUsingConstantTimer($startTime); | ||
| } | ||
|
|
||
| private function startConstantTimer(): float | ||
| { | ||
| return microtime(true); | ||
| } | ||
|
|
||
| private function sleepUsingConstantTimer(float $startTime): void | ||
| { | ||
| if ($this->constantAuthTime <= 0.0) { | ||
| return; | ||
| } | ||
|
|
||
| $remainingTime = $this->constantAuthTime - (microtime(true) - $startTime); | ||
| if ($remainingTime > 0) { | ||
| $microseconds = $remainingTime * self::USLEEP_MULTIPLIER; | ||
|
|
||
| usleep((int)$microseconds); | ||
| } elseif ($this->logger) { | ||
| $this->logger->warning( | ||
| sprintf( | ||
| 'Authentication took longer than the configured constant time. Consider increasing the value of %s', | ||
| self::CONSTANT_AUTH_TIME_SETTING | ||
| ), | ||
| [__CLASS__] | ||
| ); | ||
| } | ||
| } | ||
| } | ||
44 changes: 0 additions & 44 deletions
44
src/lib/MVC/Symfony/Security/Authentication/RememberMeRepositoryAuthenticationProvider.php
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.