[Security] added userChecker to SimpleAuthenticationProvider

i3or1s · i3or1s · commit 974acb9397ec · 2018-03-04T09:37:35.000+01:00
apply userChecker after authToken is authenticated
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/SimpleAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/SimpleAuthenticationProvider.php
@@ -39,13 +39,17 @@ public function __construct(SimpleAuthenticatorInterface $simpleAuthenticator, U
     public function authenticate(TokenInterface $token)
     {
         $authToken = $this->simpleAuthenticator->authenticateToken($token, $this->userProvider, $this->providerKey);
-        $this->userChecker->checkPreAuth($authToken->getUser());
-        $this->userChecker->checkPostAuth($authToken->getUser());
 
         if ($authToken instanceof TokenInterface) {
+            $this->userChecker->checkPreAuth($authToken->getUser());
+            $this->userChecker->checkPostAuth($authToken->getUser());
+
             return $authToken;
         }
 
+        $this->userChecker->checkPreAuth($authToken->getUser());
+        $this->userChecker->checkPostAuth($authToken->getUser());
+
         throw new AuthenticationException('Simple authenticator failed to return an authenticated token.');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,17 @@ public function __construct(SimpleAuthenticatorInterface $simpleAuthenticator, U`
`39`	`39`	`public function authenticate(TokenInterface $token)`
`40`	`40`	`{`
`41`	`41`	`$authToken = $this->simpleAuthenticator->authenticateToken($token, $this->userProvider, $this->providerKey);`
`42`		`- $this->userChecker->checkPreAuth($authToken->getUser());`
`43`		`- $this->userChecker->checkPostAuth($authToken->getUser());`
`44`	`42`
`45`	`43`	`if ($authToken instanceof TokenInterface) {`
	`44`	`+ $this->userChecker->checkPreAuth($authToken->getUser());`
	`45`	`+ $this->userChecker->checkPostAuth($authToken->getUser());`
	`46`	`+`
`46`	`47`	`return $authToken;`
`47`	`48`	`}`
`48`	`49`
	`50`	`+ $this->userChecker->checkPreAuth($authToken->getUser());`
	`51`	`+ $this->userChecker->checkPostAuth($authToken->getUser());`
	`52`	`+`
`49`	`53`	`throw new AuthenticationException('Simple authenticator failed to return an authenticated token.');`
`50`	`54`	`}`
`51`	`55`