Skip to content

Firefly III: a personal finances manager

Fix #12908

James Coledfa657160c18
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 5616479cf2..606e9bfa57 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -86,7 +86,6 @@ class Authenticate
Log::debug('User is authenticated.');
$user = auth()->user();
$this->validateBlockedUser($user, $guards);
-
return;
}
// @noinspection PhpUndefinedMethodInspection
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 9187403fc9..64be6caca3 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -65,7 +65,6 @@ use PragmaRX\Google2FALaravel\Middleware as MFAMiddleware;
bcscale(12);
-
$app = Application::configure(basePath: dirname(__DIR__))
->withRouting(
web : __DIR__ . '/../routes/web.php',
@@ -114,7 +113,7 @@ $app = Application::configure(basePath: dirname(__DIR__))
'auth:api',
Binder::class,
CatchBlockedUsers::class,
- ]
+ ]
);
$middleware->appendToGroup('api_basic', [AcceptHeaders::class, Binder::class]);
@@ -135,6 +134,10 @@ $app = Application::configure(basePath: dirname(__DIR__))
Range::class,
InterestingMessage::class,
]);
+ $middleware->appendToGroup('2fa-check', [
+ Authenticate::class,
+ MFAMiddleware::class,
+ ]);
// This middleware is added to ensure that the user is not only logged in and
// authenticated (with MFA and everything), but also admin.
$middleware->appendToGroup('api-admin', [
@@ -143,7 +146,7 @@ $app = Application::configure(basePath: dirname(__DIR__))
$middleware->appendToGroup('admin', [
IsAdmin::class,
Range::class,
- InterestingMessage::class
+ InterestingMessage::class,
]);
// if the user is not logged in, this group applies.
diff --git a/changelog.md b/changelog.md
index 02dbfe8b91..29b91620a4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
+## v6.7.6 - 2026-09-28
+
+### Fixed
+
+- #12908
+
+
+
## v6.7.5 - 2026-09-28
<!-- summary: This release fixes various bugs in the new layout and picks up a security fix for possible MFA bypass -->
diff --git a/config/passport.php b/config/passport.php
index bf65b0a926..c3e9e53b74 100644
--- a/config/passport.php
+++ b/config/passport.php
@@ -58,7 +58,7 @@ return [
'secret' => env('PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET'),
],
- 'middleware' => ['web', 'user-full-auth'],
+ 'middleware' => [],
'connection' => env('PASSPORT_CONNECTION'),
];
diff --git a/routes/web.php b/routes/web.php
index 537a6616ad..e5d0932fe6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -30,6 +30,18 @@ if (!defined('DATEFORMAT')) {
}
// new Passport routes.
+Route::group(
+ [
+ 'as' => 'passport.',
+ 'prefix' => 'oauth',
+ 'middleware' => ['2fa-check'],
+ 'namespace' => 'Laravel\Passport\Http\Controllers',
+ ],
+ function (): void {
+ Route::get('/authorize', ['uses' => 'AuthorizationController@authorize', 'as' => 'authorizations.authorize']);
+ });
+
+
Route::group(
[
'as' => 'passport.',
@@ -39,8 +51,7 @@ Route::group(
],
function (): void {
// routes with no extra middleware
- // Route::post('/token', ['uses' => '\Laravel\Passport\Http\Controllers\AccessTokenController@issueToken', 'as' => 'token', 'middleware' => 'throttle']);
- // Route::get('/authorize', ['uses' => 'AuthorizationController@authorize', 'as' => 'authorizations.authorize', 'middleware' => 'user-full-auth']);
+// Route::post('/token', ['uses' => '\Laravel\Passport\Http\Controllers\AccessTokenController@issueToken', 'as' => 'token', 'middleware' => 'throttle']);
// personal access tokens:
Route::post('/personal-access-tokens', ['uses' => 'FireflyIII\Http\Controllers\Profile\OAuthController@storePersonalAccessToken', 'as' => 'personal.tokens.store']);