bis

Author: chalasr

.github/workflows/unit-tests.yml

@@ -65,7 +65,7 @@ jobs:
           ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
 
           echo COLUMNS=120 >> $GITHUB_ENV
-          echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data,integration" >> $GITHUB_ENV
+          echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data,integration --debug" >> $GITHUB_ENV
           echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV
 
           SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V)

src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php

@@ -132,10 +132,6 @@ private function getCredentials(Request $request): array
 
         $credentials['username'] = trim($credentials['username']);
 
-        if (\strlen($credentials['username']) > self::MAX_USERNAME_LENGTH) {
-            throw new BadCredentialsException('Invalid username.');
-        }
-
         $request->getSession()->set(SecurityRequestAttributes::LAST_USERNAME, $credentials['username']);
 
         return $credentials;

src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php

@@ -85,8 +85,10 @@ public function authenticate(Request $request): Passport
             throw $e;
         }
 
+        $userBadge = new UserBadge($credentials['username'], [$this->userProvider, 'loadUserByIdentifier']);
+
         $passport = new Passport(
-            new UserBadge($credentials['username'], $this->userProvider->loadUserByIdentifier(...)),
+            $userBadge,
             new PasswordCredentials($credentials['password'])
         );
         if ($this->userProvider instanceof PasswordUpgraderInterface) {
@@ -149,10 +151,6 @@ private function getCredentials(Request $request)
             if (!\is_string($credentials['username'])) {
                 throw new BadRequestHttpException(sprintf('The key "%s" must be a string.', $this->options['username_path']));
             }
-
-            if (\strlen($credentials['username']) > self::MAX_USERNAME_LENGTH) {
-                throw new BadCredentialsException('Invalid username.');
-            }
         } catch (AccessException $e) {
             throw new BadRequestHttpException(sprintf('The key "%s" must be provided.', $this->options['username_path']), $e);
         }

src/Symfony/Component/Security/Http/Tests/Authenticator/FormLoginAuthenticatorTest.php

@@ -50,7 +50,7 @@ public function testHandleWhenUsernameLength($username, $ok)
             $this->expectNotToPerformAssertions();
         } else {
             $this->expectException(BadCredentialsException::class);
-            $this->expectExceptionMessage('Invalid username.');
+            $this->expectExceptionMessage('Username too long.');
         }
 
         $request = Request::create('/login_check', 'POST', ['_username' => $username, '_password' => 's$cr$t']);

src/Symfony/Component/Security/Http/Tests/Authenticator/JsonLoginAuthenticatorTest.php

@@ -17,6 +17,8 @@
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 use Symfony\Component\Security\Core\User\InMemoryUserProvider;
+use Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface;
+use Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface;
 use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
 use Symfony\Component\Security\Http\Authenticator\JsonLoginAuthenticator;
 use Symfony\Component\Security\Http\Authenticator\Passport\Credentials\PasswordCredentials;
@@ -91,17 +93,19 @@ public function testAuthenticateWithCustomPath()
         $this->assertEquals('foo', $passport->getBadge(PasswordCredentials::class)->getPassword());
     }
 
-    /**
-     * @dataProvider provideInvalidAuthenticateData
-     */
-    public function testAuthenticateInvalid($request, $errorMessage, $exceptionType = BadRequestHttpException::class)
+
+    public function testAuthenticateUsernameTooLong()
     {
-        $this->expectException($exceptionType);
-        $this->expectExceptionMessage($errorMessage);
+        $this->expectException(BadCredentialsException::class);
+        $this->expectExceptionMessage('Username too long.');
 
         $this->setUpAuthenticator();
 
+        $username = str_repeat('x', 4097);
+        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], sprintf('{"username": "%s", "password": "foo"}', $username));
+
         $this->authenticator->authenticate($request);
+        $this->setUpAuthenticator();
     }
 
     public function provideInvalidAuthenticateData()
@@ -120,10 +124,6 @@ public function provideInvalidAuthenticateData()
 
         $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": "dunglas", "password": 1}');
         yield [$request, 'The key "password" must be a string.'];
-
-        $username = str_repeat('x', AuthenticatorInterface::MAX_USERNAME_LENGTH + 1);
-        $request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], sprintf('{"username": "%s", "password": 1}', $username));
-        yield [$request, 'Invalid username.', BadCredentialsException::class];
     }
 
     public function testAuthenticationFailureWithoutTranslator()