fix(auth): redirect authenticated stale-token login submissions to the dashboard

This commit is contained in:
peaklabs-dev 2026-09-08 12:14:29 +02:00
parent 0088b55f48
commit 37ddbdc37f
No known key found for this signature in database
2 changed files with 41 additions and 0 deletions

View file

@ -4,9 +4,11 @@
use App\Models\InstanceSettings;
use App\Models\User;
use App\Providers\RouteServiceProvider;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Auth\AuthenticationException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Illuminate\Session\TokenMismatchException;
use Psr\Log\LogLevel;
use RuntimeException;
use Sentry\Laravel\Integration;
@ -69,6 +71,11 @@ protected function unauthenticated($request, AuthenticationException $exception)
*/
public function render($request, Throwable $e)
{
// A duplicate login or 2FA submission carries a stale token on an already authenticated session, see https://github.com/coollabsio/coolify/issues/10670
if ($e instanceof TokenMismatchException && $request->routeIs('login.store', 'two-factor.login.store') && $request->user()) {
return redirect()->intended(RouteServiceProvider::HOME);
}
// Handle authorization exceptions for API routes. Exceptions carrying
// an explicit status (e.g. denyAsNotFound) keep it via parent::render.
if ($e instanceof AuthorizationException && ! $e->hasStatus()) {

View file

@ -3,7 +3,11 @@
use App\Models\InstanceSettings;
use App\Models\Team;
use App\Models\User;
use Illuminate\Contracts\Debug\ExceptionHandler;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Http\Request;
use Illuminate\Session\TokenMismatchException;
use Illuminate\Support\Facades\Route;
uses(RefreshDatabase::class);
@ -78,3 +82,33 @@
expect($view)->toContain('error-shell');
expect($view)->not->toContain('url()->previous()');
});
it('redirects an authenticated stale two-factor submission home instead of showing 419', function () {
$request = Request::create('/two-factor-challenge', 'POST');
$request->setRouteResolver(fn () => Route::getRoutes()->match($request));
$request->setUserResolver(fn () => $this->user);
$response = app(ExceptionHandler::class)->render($request, new TokenMismatchException('CSRF token mismatch.'));
expect($response->getStatusCode())->toBe(302)
->and($response->headers->get('Location'))->toBe(url('/'));
});
it('still returns 419 for a stale two-factor submission without an authenticated session', function () {
$request = Request::create('/two-factor-challenge', 'POST');
$request->setRouteResolver(fn () => Route::getRoutes()->match($request));
$response = app(ExceptionHandler::class)->render($request, new TokenMismatchException('CSRF token mismatch.'));
expect($response->getStatusCode())->toBe(419);
});
it('keeps the 419 for stale tokens on routes other than login and the two-factor challenge', function () {
$request = Request::create('/two-factor-challenge', 'GET');
$request->setRouteResolver(fn () => Route::getRoutes()->match($request));
$request->setUserResolver(fn () => $this->user);
$response = app(ExceptionHandler::class)->render($request, new TokenMismatchException('CSRF token mismatch.'));
expect($response->getStatusCode())->toBe(419);
});