Skip to content

Firefly III: a personal finances manager

Clean up middleware and kernel files.

James Cole22b97ce8efbd
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 11c4b66cb7..a39ee2ef05 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -23,153 +23,45 @@ declare(strict_types=1);
namespace FireflyIII\Http;
-use FireflyIII\Http\Middleware\AcceptHeaders;
use FireflyIII\Http\Middleware\Authenticate;
use FireflyIII\Http\Middleware\Binder;
-use FireflyIII\Http\Middleware\EncryptCookies;
use FireflyIII\Http\Middleware\InstallationId;
-use FireflyIII\Http\Middleware\Installer;
-use FireflyIII\Http\Middleware\InterestingMessage;
-use FireflyIII\Http\Middleware\IsAdmin;
-use FireflyIII\Http\Middleware\Range;
use FireflyIII\Http\Middleware\RedirectIfAuthenticated;
-use FireflyIII\Http\Middleware\SecureHeaders;
use FireflyIII\Http\Middleware\StartFireflySession;
use FireflyIII\Http\Middleware\TrimStrings;
use FireflyIII\Http\Middleware\TrustProxies;
-use FireflyIII\Http\Middleware\VerifyCsrfToken;
use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
use Illuminate\Auth\Middleware\Authorize;
-use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
use Illuminate\Foundation\Http\Kernel as HttpKernel;
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
use Illuminate\Routing\Middleware\ThrottleRequests;
-use Illuminate\Session\Middleware\AuthenticateSession;
use Illuminate\View\Middleware\ShareErrorsFromSession;
-use Laravel\Passport\Http\Middleware\CreateFreshApiToken;
-use Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful;
-use PragmaRX\Google2FALaravel\Middleware as MFAMiddleware;
/**
* Class Kernel
*/
class Kernel extends HttpKernel
{
- protected $middleware = [
- SecureHeaders::class,
- CheckForMaintenanceMode::class,
- ValidatePostSize::class,
- TrimStrings::class,
- ConvertEmptyStringsToNull::class,
- TrustProxies::class,
- InstallationId::class,
- ];
- protected $middlewareAliases = [
- 'auth' => Authenticate::class,
- 'auth.basic' => AuthenticateWithBasicAuth::class,
- 'bindings' => Binder::class,
- 'can' => Authorize::class,
- 'guest' => RedirectIfAuthenticated::class,
- 'throttle' => ThrottleRequests::class,
- ];
- protected $middlewareGroups = [
- // does not check login
- // does not check 2fa
- // does not check activation
- 'web' => [
- EncryptCookies::class,
- AddQueuedCookiesToResponse::class,
- StartFireflySession::class,
- ShareErrorsFromSession::class,
- VerifyCsrfToken::class,
- AuthenticateSession::class,
- CreateFreshApiToken::class,
- ],
-
- // only the basic variable binders.
- 'binders-only' => [Installer::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, Binder::class],
-
- // MUST NOT be logged in. Does not care about 2FA or confirmation.
- 'user-not-logged-in' => [
- Installer::class,
- EncryptCookies::class,
- AddQueuedCookiesToResponse::class,
- StartFireflySession::class,
- ShareErrorsFromSession::class,
- VerifyCsrfToken::class,
- Binder::class,
- RedirectIfAuthenticated::class,
- ],
- // MUST be logged in.
- // MUST NOT have 2FA
- // don't care about confirmation:
- 'user-logged-in-no-2fa' => [
- Installer::class,
- EncryptCookies::class,
- AddQueuedCookiesToResponse::class,
- StartFireflySession::class,
- ShareErrorsFromSession::class,
- VerifyCsrfToken::class,
- Binder::class,
- Authenticate::class,
- // RedirectIfTwoFactorAuthenticated::class,
- ],
-
- // MUST be logged in
- // don't care about 2fa
- // don't care about confirmation.
- 'user-simple-auth' => [
- EncryptCookies::class,
- AddQueuedCookiesToResponse::class,
- StartFireflySession::class,
- ShareErrorsFromSession::class,
- VerifyCsrfToken::class,
- Binder::class,
- Authenticate::class,
- ],
-
- // MUST be logged in
- // MUST have 2fa
- // MUST be confirmed.
- // (this group includes the other Firefly III middleware)
- 'user-full-auth' => [
- EncryptCookies::class,
- AddQueuedCookiesToResponse::class,
- StartFireflySession::class,
- ShareErrorsFromSession::class,
- VerifyCsrfToken::class,
- Authenticate::class,
- MFAMiddleware::class,
- Range::class,
- Binder::class,
- InterestingMessage::class,
- CreateFreshApiToken::class,
- ],
- // MUST be logged in
- // MUST have 2fa
- // MUST be confirmed.
- // MUST have owner role
- // (this group includes the other Firefly III middleware)
- 'admin' => [
- EncryptCookies::class,
- AddQueuedCookiesToResponse::class,
- StartFireflySession::class,
- ShareErrorsFromSession::class,
- VerifyCsrfToken::class,
- Authenticate::class,
- // AuthenticateTwoFactor::class,
- IsAdmin::class,
- Range::class,
- Binder::class,
- CreateFreshApiToken::class,
- ],
-
- // full API authentication
- 'api' => [AcceptHeaders::class, EnsureFrontendRequestsAreStateful::class, 'auth:api,sanctum', 'bindings'],
- // do only bindings, no auth
- 'api_basic' => [AcceptHeaders::class, 'bindings'],
- ];
+ protected $middleware
+ = [
+ // SecureHeaders::class,
+ CheckForMaintenanceMode::class,
+ ValidatePostSize::class,
+ TrimStrings::class,
+ ConvertEmptyStringsToNull::class,
+ TrustProxies::class,
+ InstallationId::class,
+ ];
+ protected $middlewareAliases
+ = [
+ 'auth' => Authenticate::class,
+ 'auth.basic' => AuthenticateWithBasicAuth::class,
+ 'bindings' => Binder::class,
+ 'can' => Authorize::class,
+ 'guest' => RedirectIfAuthenticated::class,
+ 'throttle' => ThrottleRequests::class,
+ ];
protected $middlewarePriority = [StartFireflySession::class, ShareErrorsFromSession::class, Authenticate::class, Binder::class, Authorize::class];
}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 0fe1df6603..48631b21d3 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -44,19 +44,19 @@ class EventServiceProvider extends ServiceProvider
= [
// is a Transaction Journal related event.
// StoredTransactionGroup::class => ['FireflyIII\Handlers\Events\StoredGroupEventHandler@runAllHandlers'],
- TriggeredStoredTransactionGroup::class => ['FireflyIII\Handlers\Events\StoredGroupEventHandler@triggerRulesManually'],
+ // TriggeredStoredTransactionGroup::class => ['FireflyIII\Handlers\Events\StoredGroupEventHandler@triggerRulesManually'],
// is a Transaction Journal related event.
- UpdatedTransactionGroup::class => ['FireflyIII\Handlers\Events\UpdatedGroupEventHandler@runAllHandlers'],
- DestroyedTransactionGroup::class => ['FireflyIII\Handlers\Events\DestroyedGroupEventHandler@runAllHandlers'],
+// UpdatedTransactionGroup::class => ['FireflyIII\Handlers\Events\UpdatedGroupEventHandler@runAllHandlers'],
+// DestroyedTransactionGroup::class => ['FireflyIII\Handlers\Events\DestroyedGroupEventHandler@runAllHandlers'],
// API related events:
- AccessTokenCreated::class => ['FireflyIII\Handlers\Events\APIEventHandler@accessTokenCreated'],
+// AccessTokenCreated::class => ['FireflyIII\Handlers\Events\APIEventHandler@accessTokenCreated'],
// account related events:
- StoredAccount::class => ['FireflyIII\Handlers\Events\StoredAccountEventHandler@recalculateCredit'],
- UpdatedAccount::class => ['FireflyIII\Handlers\Events\UpdatedAccountEventHandler@recalculateCredit'],
+// StoredAccount::class => ['FireflyIII\Handlers\Events\StoredAccountEventHandler@recalculateCredit'],
+// UpdatedAccount::class => ['FireflyIII\Handlers\Events\UpdatedAccountEventHandler@recalculateCredit'],
// preferences
- UserGroupChangedPrimaryCurrency::class => ['FireflyIII\Handlers\Events\PreferencesEventHandler@resetPrimaryCurrencyAmounts'],
+// UserGroupChangedPrimaryCurrency::class => ['FireflyIII\Handlers\Events\PreferencesEventHandler@resetPrimaryCurrencyAmounts'],
];
/**
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 63d02d4f5b..e4b25b5ada 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -21,11 +21,28 @@
declare(strict_types=1);
-use Illuminate\Foundation\Application;
-use Illuminate\Contracts\Http\Kernel;
-use Illuminate\Contracts\Debug\ExceptionHandler;
use FireflyIII\Exceptions\Handler;
-use function Safe\realpath;
+use FireflyIII\Http\Middleware\AcceptHeaders;
+use FireflyIII\Http\Middleware\Authenticate;
+use FireflyIII\Http\Middleware\Binder;
+use FireflyIII\Http\Middleware\EncryptCookies;
+use FireflyIII\Http\Middleware\Installer;
+use FireflyIII\Http\Middleware\InterestingMessage;
+use FireflyIII\Http\Middleware\IsAdmin;
+use FireflyIII\Http\Middleware\Range;
+use FireflyIII\Http\Middleware\RedirectIfAuthenticated;
+use FireflyIII\Http\Middleware\StartFireflySession;
+use FireflyIII\Http\Middleware\VerifyCsrfToken;
+use Illuminate\Contracts\Debug\ExceptionHandler;
+use Illuminate\Contracts\Http\Kernel;
+use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
+use Illuminate\Foundation\Application;
+use Illuminate\Foundation\Configuration\Exceptions;
+use Illuminate\Foundation\Configuration\Middleware;
+use Illuminate\View\Middleware\ShareErrorsFromSession;
+use Laravel\Passport\Http\Middleware\CreateFreshApiToken;
+use Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful;
+use PragmaRX\Google2FALaravel\Middleware as MFAMiddleware;
/*
|--------------------------------------------------------------------------
@@ -63,9 +80,112 @@ if (!function_exists('stringIsEqual')) {
}
}
-$app = new Application(
- realpath(__DIR__ . '/../')
-);
+//$app = new Application(
+// realpath(__DIR__ . '/../')
+//);
+
+
+$app = Application::configure(basePath: dirname(__DIR__))
+ ->withRouting(
+ web : __DIR__ . '/../routes/web.php',
+ commands: __DIR__ . '/../routes/console.php',
+ health : '/up',
+ )
+ ->withMiddleware(function (Middleware $middleware): void {
+ // always append secure header thing.
+ $middleware->append(\FireflyIII\Http\Middleware\SecureHeaders::class);
+
+ // add stuff to the web group
+ $middleware->appendToGroup('web', [
+ StartFireflySession::class,
+ VerifyCsrfToken::class,
+ CreateFreshApiToken::class,
+ ]);
+ // new group?
+ $middleware->appendToGroup('binders-only', [Installer::class, EncryptCookies::class, AddQueuedCookiesToResponse::class, Binder::class]);
+
+ //
+ $middleware->appendToGroup('user-not-logged-in', [
+ Installer::class,
+ EncryptCookies::class,
+ AddQueuedCookiesToResponse::class,
+ StartFireflySession::class,
+ ShareErrorsFromSession::class,
+ VerifyCsrfToken::class,
+ Binder::class,
+ RedirectIfAuthenticated::class,
+ ]);
+
+ // more
+ $middleware->appendToGroup('user-logged-in-no-2fa', [
+ Installer::class,
+ EncryptCookies::class,
+ AddQueuedCookiesToResponse::class,
+ StartFireflySession::class,
+ ShareErrorsFromSession::class,
+ VerifyCsrfToken::class,
+ Binder::class,
+ Authenticate::class,
+ ]);
+
+ // simple auth
+ $middleware->appendToGroup('user-simple-auth', [
+ EncryptCookies::class,
+ AddQueuedCookiesToResponse::class,
+ StartFireflySession::class,
+ ShareErrorsFromSession::class,
+ VerifyCsrfToken::class,
+ Binder::class,
+ Authenticate::class,
+ ]);
+
+ // user full auth
+ $middleware->appendToGroup('user-full-auth', [
+ EncryptCookies::class,
+ AddQueuedCookiesToResponse::class,
+ StartFireflySession::class,
+ ShareErrorsFromSession::class,
+ VerifyCsrfToken::class,
+ Authenticate::class,
+ MFAMiddleware::class,
+ Range::class,
+ Binder::class,
+ InterestingMessage::class,
+ CreateFreshApiToken::class,
+ ]);
+
+ // admin
+ $middleware->appendToGroup('admin', [
+ EncryptCookies::class,
+ AddQueuedCookiesToResponse::class,
+ StartFireflySession::class,
+ ShareErrorsFromSession::class,
+ VerifyCsrfToken::class,
+ Authenticate::class,
+ // AuthenticateTwoFactor::class,
+ IsAdmin::class,
+ Range::class,
+ Binder::class,
+ CreateFreshApiToken::class,
+ ]);
+
+ // api
+ $middleware->appendToGroup('api', [AcceptHeaders::class, EnsureFrontendRequestsAreStateful::class, 'auth:api,sanctum', Binder::class]);
+ // api basic,
+ $middleware->appendToGroup('api_basic', [AcceptHeaders::class, Binder::class]);
+
+ })
+ ->withEvents(discover: [
+ __DIR__ . '/../app/Listeners',
+ ])
+ ->withExceptions(function (Exceptions $exceptions): void {
+ //
+ })->create();
+
+
+//$app->withEvents(discover: [
+// __DIR__.'/../app/Domain/Orders/Listeners',
+// ]);
/*
|--------------------------------------------------------------------------
diff --git a/config/app.php b/config/app.php
index 2dad30bc1e..b1c1e82172 100644
--- a/config/app.php
+++ b/config/app.php
@@ -117,7 +117,7 @@ return [
AppServiceProvider::class,
FireflyIII\Providers\AuthServiceProvider::class,
// FireflyIII\Providers\BroadcastServiceProvider::class,
- EventServiceProvider::class,
+ // EventServiceProvider::class,
RouteServiceProvider::class,
// own stuff: