diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes after testing in Demo application

Browse Source
This commit is contained in:
Wouter de Jong 2020-01-26 15:33:15 +01:00
parent fa4b3ec213
commit 4c06236933
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Symfony/Bundle/SecurityBundle/Resources/config/authenticators.xml
View File

@ -42,6 +42,7 @@
class="Symfony\Component\Security\Core\Authentication\Authenticator\AnonymousAuthenticator" class="Symfony\Component\Security\Core\Authentication\Authenticator\AnonymousAuthenticator"
abstract="true"> abstract="true">
<argument /> <!-- secret --> <argument /> <!-- secret -->
<argument type="service" id="security.token_storage" />
</service> </service>
</services> </services>
</container> </container>

8
src/Symfony/Component/Security/Core/Authentication/Authenticator/AnonymousAuthenticator.php
View File

@ -14,6 +14,7 @@ namespace Symfony\Component\Security\Core\Authentication\Authenticator;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\Exception\AuthenticationException;
use Symfony\Component\Security\Core\User\User; use Symfony\Component\Security\Core\User\User;
@ -25,15 +26,18 @@ use Symfony\Component\Security\Core\User\UserInterface;
class AnonymousAuthenticator implements AuthenticatorInterface class AnonymousAuthenticator implements AuthenticatorInterface
{ {
private $secret; private $secret;
private $tokenStorage;
public function __construct(string $secret) public function __construct(string $secret, TokenStorageInterface $tokenStorage)
{ {
$this->secret = $secret; $this->secret = $secret;
$this->tokenStorage = $tokenStorage;
} }
public function supports(Request $request): ?bool public function supports(Request $request): ?bool
{ {
return true; // do not overwrite already stored tokens (i.e. from the session)
return null === $this->tokenStorage->getToken();
} }
public function getCredentials(Request $request) public function getCredentials(Request $request)

12
src/Symfony/Component/Security/Core/Authentication/GuardAuthenticationManager.php
View File

@ -86,12 +86,14 @@ class GuardAuthenticationManager implements AuthenticationManagerInterface
$this->handleFailure($exception, $token); $this->handleFailure($exception, $token);
} }
if (true === $this->eraseCredentials) { if (null !== $result) {
$result->eraseCredentials(); if (true === $this->eraseCredentials) {
} $result->eraseCredentials();
}
if (null !== $this->eventDispatcher) { if (null !== $this->eventDispatcher) {
$this->eventDispatcher->dispatch(new AuthenticationSuccessEvent($result), AuthenticationEvents::AUTHENTICATION_SUCCESS); $this->eventDispatcher->dispatch(new AuthenticationSuccessEvent($result), AuthenticationEvents::AUTHENTICATION_SUCCESS);
}
} }
return $result; return $result;

5
src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticatorListenerTrait.php
View File

@ -150,6 +150,11 @@ trait GuardAuthenticatorListenerTrait
throw new \UnexpectedValueException('Invalid guard authenticator passed to '.__METHOD__.'. Expected AuthenticatorInterface of either Security Core or Security Guard.'); throw new \UnexpectedValueException('Invalid guard authenticator passed to '.__METHOD__.'. Expected AuthenticatorInterface of either Security Core or Security Guard.');
} }
// @todo implement remember me functionality
if (!isset($this->rememberMeServices)) {
return;
}
if (null === $this->rememberMeServices) { if (null === $this->rememberMeServices) {
if (null !== $this->logger) { if (null !== $this->logger) {
$this->logger->debug('Remember me skipped: it is not configured for the firewall.', ['authenticator' => \get_class($guardAuthenticator)]); $this->logger->debug('Remember me skipped: it is not configured for the firewall.', ['authenticator' => \get_class($guardAuthenticator)]);