[Security] added userChecker to SimpleAuthenticationProvider

Boris Vujicic · Boris Vujicic · commit 84b956cc7b0f · 2018-03-02T09:14:52.000+01:00
Added UserChecker to SimpleAuthenticationProvider and updated SimpleFormFactory
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SimpleFormFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SimpleFormFactory.php
@@ -55,6 +55,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,
             ->replaceArgument(0, new Reference($config['authenticator']))
             ->replaceArgument(1, new Reference($userProviderId))
             ->replaceArgument(2, $id)
+            ->replaceArgument(3, new Reference('security.user_checker.'.$id))
         ;
 
         return $provider;
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/SimpleAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/SimpleAuthenticationProvider.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Security\Core\Authentication\Provider;
 
+use Symfony\Component\Security\Core\User\UserCheckerInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface;
@@ -24,17 +25,22 @@ class SimpleAuthenticationProvider implements AuthenticationProviderInterface
     private $simpleAuthenticator;
     private $userProvider;
     private $providerKey;
+    private $userChecker;
 
-    public function __construct(SimpleAuthenticatorInterface $simpleAuthenticator, UserProviderInterface $userProvider, $providerKey)
+    public function __construct(SimpleAuthenticatorInterface $simpleAuthenticator, UserProviderInterface $userProvider, $providerKey, UserCheckerInterface $userChecker)
     {
         $this->simpleAuthenticator = $simpleAuthenticator;
         $this->userProvider = $userProvider;
         $this->providerKey = $providerKey;
+        $this->userChecker = $userChecker;
     }
 
     public function authenticate(TokenInterface $token)
     {
+        $user = $this->userProvider->loadUserByUsername($token->getUsername());
+        $this->userChecker->checkPreAuth($user);
         $authToken = $this->simpleAuthenticator->authenticateToken($token, $this->userProvider, $this->providerKey);
+        $this->userChecker->checkPostAuth($user);
 
         if ($authToken instanceof TokenInterface) {
             return $authToken;

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ protected function createAuthProvider(ContainerBuilder $container, $id, $config,`
`55`	`55`	`->replaceArgument(0, new Reference($config['authenticator']))`
`56`	`56`	`->replaceArgument(1, new Reference($userProviderId))`
`57`	`57`	`->replaceArgument(2, $id)`
	`58`	`+ ->replaceArgument(3, new Reference('security.user_checker.'.$id))`
`58`	`59`	`;`
`59`	`60`
`60`	`61`	`return $provider;`