Skip to content
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

Jump to bottom

[Security] Added condition to always return the real Authenticator from security events #49015

Merged
merged 1 commit into from
Feb 26, 2023
Merged

[Security] Added condition to always return the real Authenticator from security events #49015

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Symfony/Component/Security/Http/Event/CheckPassportEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Http\Event;

use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticator;
use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
use Symfony\Contracts\EventDispatcher\Event;

Expand All @@ -37,7 +38,7 @@ public function __construct(AuthenticatorInterface $authenticator, Passport $pas

public function getAuthenticator(): AuthenticatorInterface
{
return $this->authenticator;
return $this->authenticator instanceof TraceableAuthenticator ? $this->authenticator->getAuthenticator() : $this->authenticator;
}

public function getPassport(): Passport
Expand Down
3 changes: 2 additions & 1 deletion src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Exception\AuthenticationException;
use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticator;
use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
use Symfony\Contracts\EventDispatcher\Event;

Expand Down Expand Up @@ -52,7 +53,7 @@ public function getException(): AuthenticationException

public function getAuthenticator(): AuthenticatorInterface
{
return $this->authenticator;
return $this->authenticator instanceof TraceableAuthenticator ? $this->authenticator->getAuthenticator() : $this->authenticator;
}

public function getFirewallName(): string
Expand Down
3 changes: 2 additions & 1 deletion src/Symfony/Component/Security/Http/Event/LoginSuccessEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticator;
use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
use Symfony\Contracts\EventDispatcher\Event;

Expand Down Expand Up @@ -50,7 +51,7 @@ public function __construct(AuthenticatorInterface $authenticator, Passport $pas

public function getAuthenticator(): AuthenticatorInterface
{
return $this->authenticator;
return $this->authenticator instanceof TraceableAuthenticator ? $this->authenticator->getAuthenticator() : $this->authenticator;
}

public function getPassport(): Passport
Expand Down