[Security] Fix tests

chalasr · nicolas-grekas · commit c8843999a97b · 2022-06-10T14:24:56.000+02:00
diff --git a/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php
@@ -91,10 +91,9 @@ public function supports(Request $request): ?bool
 
     public function authenticate(Request $request): Passport
     {
-        return new SelfValidatingPassport(
-            new UserBadge($request->attributes->get('_pre_authenticated_username'), $this->userProvider->loadUserByIdentifier(...)),
-            [new PreAuthenticatedUserBadge()]
-        );
+        $userBadge = new UserBadge($request->attributes->get('_pre_authenticated_username'), $this->userProvider->loadUserByIdentifier(...));
+
+        return new SelfValidatingPassport($userBadge, [new PreAuthenticatedUserBadge()]);
     }
 
     public function createToken(Passport $passport, string $firewallName): TokenInterface
diff --git a/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php
@@ -82,11 +82,9 @@ public function authenticate(Request $request): Passport
     {
         $credentials = $this->getCredentials($request);
 
-        $passport = new Passport(
-            new UserBadge($credentials['username'], $this->userProvider->loadUserByIdentifier(...)),
-            new PasswordCredentials($credentials['password']),
-            [new RememberMeBadge()]
-        );
+        $userBadge = new UserBadge($credentials['username'], $this->userProvider->loadUserByIdentifier(...));
+        $passport = new Passport($userBadge, new PasswordCredentials($credentials['password']), [new RememberMeBadge()]);
+
         if ($this->options['enable_csrf']) {
             $passport->addBadge(new CsrfTokenBadge($this->options['csrf_token_id'], $credentials['csrf_token']));
         }
diff --git a/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php
@@ -63,10 +63,9 @@ public function authenticate(Request $request): Passport
         $username = $request->headers->get('PHP_AUTH_USER');
         $password = $request->headers->get('PHP_AUTH_PW', '');
 
-        $passport = new Passport(
-            new UserBadge($username, $this->userProvider->loadUserByIdentifier(...)),
-            new PasswordCredentials($password)
-        );
+        $userBadge = new UserBadge($username, $this->userProvider->loadUserByIdentifier(...));
+        $passport = new Passport($userBadge, new PasswordCredentials($password));
+
         if ($this->userProvider instanceof PasswordUpgraderInterface) {
             $passport->addBadge(new PasswordUpgradeBadge($password, $this->userProvider));
         }
diff --git a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
@@ -85,11 +85,8 @@ public function authenticate(Request $request): Passport
         }
 
         $userBadge = new UserBadge($credentials['username'], $this->userProvider->loadUserByIdentifier(...));
+        $passport = new Passport($userBadge, new PasswordCredentials($credentials['password']));
 
-        $passport = new Passport(
-            $userBadge,
-            new PasswordCredentials($credentials['password'])
-        );
         if ($this->userProvider instanceof PasswordUpgraderInterface) {
             $passport->addBadge(new PasswordUpgradeBadge($credentials['password'], $this->userProvider));
         }
diff --git a/src/Symfony/Component/Security/Http/Authenticator/LoginLinkAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/LoginLinkAuthenticator.php
@@ -54,23 +54,21 @@ public function supports(Request $request): ?bool
 
     public function authenticate(Request $request): Passport
     {
-        $username = $request->get('user');
-        if (!$username) {
+        if (!$username = $request->get('user')) {
             throw new InvalidLoginLinkAuthenticationException('Missing user from link.');
         }
 
-        return new SelfValidatingPassport(
-            new UserBadge($username, function () use ($request) {
-                try {
-                    $user = $this->loginLinkHandler->consumeLoginLink($request);
-                } catch (InvalidLoginLinkExceptionInterface $e) {
-                    throw new InvalidLoginLinkAuthenticationException('Login link could not be validated.', 0, $e);
-                }
+        $userBadge = new UserBadge($username, function () use ($request) {
+            try {
+                $user = $this->loginLinkHandler->consumeLoginLink($request);
+            } catch (InvalidLoginLinkExceptionInterface $e) {
+                throw new InvalidLoginLinkAuthenticationException('Login link could not be validated.', 0, $e);
+            }
 
-                return $user;
-            }),
-            [new RememberMeBadge()]
-        );
+            return $user;
+        });
+
+        return new SelfValidatingPassport($userBadge, [new RememberMeBadge()]);
     }
 
     public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $firewallName): ?Response
diff --git a/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php
@@ -81,16 +81,17 @@ public function supports(Request $request): ?bool
 
     public function authenticate(Request $request): Passport
     {
-        $rawCookie = $request->cookies->get($this->cookieName);
-        if (!$rawCookie) {
+        if (!$rawCookie = $request->cookies->get($this->cookieName)) {
             throw new \LogicException('No remember-me cookie is found.');
         }
 
         $rememberMeCookie = RememberMeDetails::fromRawCookie($rawCookie);
 
-        return new SelfValidatingPassport(new UserBadge($rememberMeCookie->getUserIdentifier(), function () use ($rememberMeCookie) {
+        $userBadge = new UserBadge($rememberMeCookie->getUserIdentifier(), function () use ($rememberMeCookie) {
             return $this->rememberMeHandler->consumeRememberMeCookie($rememberMeCookie);
-        }));
+        });
+
+        return new SelfValidatingPassport($userBadge);
     }
 
     public function createToken(Passport $passport, string $firewallName): TokenInterface

Original file line number	Diff line number	Diff line change
`@@ -91,10 +91,9 @@ public function supports(Request $request): ?bool`
`91`	`91`
`92`	`92`	`public function authenticate(Request $request): Passport`
`93`	`93`	`{`
`94`		`- return new SelfValidatingPassport(`
`95`		`- new UserBadge($request->attributes->get('_pre_authenticated_username'), $this->userProvider->loadUserByIdentifier(...)),`
`96`		`- [new PreAuthenticatedUserBadge()]`
`97`		`- );`
	`94`	`+ $userBadge = new UserBadge($request->attributes->get('_pre_authenticated_username'), $this->userProvider->loadUserByIdentifier(...));`
	`95`	`+`
	`96`	`+ return new SelfValidatingPassport($userBadge, [new PreAuthenticatedUserBadge()]);`
`98`	`97`	`}`
`99`	`98`
`100`	`99`	`public function createToken(Passport $passport, string $firewallName): TokenInterface`
Original file line number	Diff line number	Diff line change
`@@ -82,11 +82,9 @@ public function authenticate(Request $request): Passport`
`82`	`82`	`{`
`83`	`83`	`$credentials = $this->getCredentials($request);`
`84`	`84`
`85`		`- $passport = new Passport(`
`86`		`- new UserBadge($credentials['username'], $this->userProvider->loadUserByIdentifier(...)),`
`87`		`- new PasswordCredentials($credentials['password']),`
`88`		`- [new RememberMeBadge()]`
`89`		`- );`
	`85`	`+ $userBadge = new UserBadge($credentials['username'], $this->userProvider->loadUserByIdentifier(...));`
	`86`	`+ $passport = new Passport($userBadge, new PasswordCredentials($credentials['password']), [new RememberMeBadge()]);`
	`87`	`+`
`90`	`88`	`if ($this->options['enable_csrf']) {`
`91`	`89`	`$passport->addBadge(new CsrfTokenBadge($this->options['csrf_token_id'], $credentials['csrf_token']));`
`92`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,8 @@ public function authenticate(Request $request): Passport`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`$userBadge = new UserBadge($credentials['username'], $this->userProvider->loadUserByIdentifier(...));`
	`88`	`+ $passport = new Passport($userBadge, new PasswordCredentials($credentials['password']));`
`88`	`89`
`89`		`- $passport = new Passport(`
`90`		`- $userBadge,`
`91`		`- new PasswordCredentials($credentials['password'])`
`92`		`- );`
`93`	`90`	`if ($this->userProvider instanceof PasswordUpgraderInterface) {`
`94`	`91`	`$passport->addBadge(new PasswordUpgradeBadge($credentials['password'], $this->userProvider));`
`95`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,16 +81,17 @@ public function supports(Request $request): ?bool`
`81`	`81`
`82`	`82`	`public function authenticate(Request $request): Passport`
`83`	`83`	`{`
`84`		`- $rawCookie = $request->cookies->get($this->cookieName);`
`85`		`- if (!$rawCookie) {`
	`84`	`+ if (!$rawCookie = $request->cookies->get($this->cookieName)) {`
`86`	`85`	`throw new \LogicException('No remember-me cookie is found.');`
`87`	`86`	`}`
`88`	`87`
`89`	`88`	`$rememberMeCookie = RememberMeDetails::fromRawCookie($rawCookie);`
`90`	`89`
`91`		`- return new SelfValidatingPassport(new UserBadge($rememberMeCookie->getUserIdentifier(), function () use ($rememberMeCookie) {`
	`90`	`+ $userBadge = new UserBadge($rememberMeCookie->getUserIdentifier(), function () use ($rememberMeCookie) {`
`92`	`91`	`return $this->rememberMeHandler->consumeRememberMeCookie($rememberMeCookie);`
`93`		`- }));`
	`92`	`+ });`
	`93`	`+`
	`94`	`+ return new SelfValidatingPassport($userBadge);`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`public function createToken(Passport $passport, string $firewallName): TokenInterface`