Remove callExit() from AuthenticationPlugin::authenticate()

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · May 9, 2024 · aa70f48 · aa70f48
1 parent ad98ad2
commit aa70f48
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/Http/Middleware/Authentication.php b/src/Http/Middleware/Authentication.php
@@ -61,7 +61,10 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
         try {
             try {
-                $authPlugin->authenticate();
+                $response = $authPlugin->authenticate();
+                if ($response !== null) {
+                    return $response;
+                }
             } catch (AuthenticationFailure $exception) {
                 return $authPlugin->showFailure($exception);
             }

diff --git a/src/Plugins/AuthenticationPlugin.php b/src/Plugins/AuthenticationPlugin.php
@@ -229,7 +229,7 @@ public function setSessionAccessTime(): void
      *
      * @throws AuthenticationFailure
      */
-    public function authenticate(): void
+    public function authenticate(): Response|null
     {
         $success = $this->readCredentials();
 
@@ -246,7 +246,7 @@ public function authenticate(): void
                     'error_message' => $exception->getMessage(),
                 ]));
 
-                $responseRenderer->callExit();
+                return $responseRenderer->response();
             }
 
             $this->showLoginForm();
@@ -258,6 +258,8 @@ public function authenticate(): void
         $this->checkRules();
         /* clear user cache */
         Util::clearUserCache();
+
+        return null;
     }
 
     /**

diff --git a/tests/unit/Plugins/Auth/AuthenticationCookieTest.php b/tests/unit/Plugins/Auth/AuthenticationCookieTest.php
@@ -933,9 +933,10 @@ public function testAuthenticate(): void
         $_POST['pma_password'] = 'testPassword';
 
         ob_start();
-        $this->object->authenticate();
+        $response = $this->object->authenticate();
         $result = ob_get_clean();
 
+        self::assertNull($response);
         /* Nothing should be printed */
         self::assertSame('', $result);