[Security] added userChecker to SimpleAuthenticationProvider

i3or1s · i3or1s · commit 3cc426e51102 · 2018-03-04T09:40:39.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,14 +39,15 @@ 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) {
-            return $authToken;
+        if (!($authToken instanceof TokenInterface)) {
+            throw new AuthenticationException('Simple authenticator failed to return an authenticated token.');
         }
 
-        throw new AuthenticationException('Simple authenticator failed to return an authenticated token.');
+        $this->userChecker->checkPreAuth($authToken->getUser());
+        $this->userChecker->checkPostAuth($authToken->getUser());
+
+        return $authToken;
     }
 
     public function supports(TokenInterface $token)

Original file line number	Diff line number	Diff line change
`@@ -39,14 +39,15 @@ 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`		`- if ($authToken instanceof TokenInterface) {`
`46`		`- return $authToken;`
	`43`	`+ if (!($authToken instanceof TokenInterface)) {`
	`44`	`+ throw new AuthenticationException('Simple authenticator failed to return an authenticated token.');`
`47`	`45`	`}`
`48`	`46`
`49`		`- throw new AuthenticationException('Simple authenticator failed to return an authenticated token.');`
	`47`	`+ $this->userChecker->checkPreAuth($authToken->getUser());`
	`48`	`+ $this->userChecker->checkPostAuth($authToken->getUser());`
	`49`	`+`
	`50`	`+ return $authToken;`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`public function supports(TokenInterface $token)`