From b294215381cda87324c56be81fae0cecd3b899e5 Mon Sep 17 00:00:00 2001 From: Apfelwurm Date: Sun, 13 Oct 2024 19:46:45 +0200 Subject: [PATCH 1/4] implemented middleware --- src/app/Http/Kernel.php | 1 + src/app/Http/Middleware/Legacywarning.php | 28 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 src/app/Http/Middleware/Legacywarning.php diff --git a/src/app/Http/Kernel.php b/src/app/Http/Kernel.php index fc81db02..4eb56e0f 100644 --- a/src/app/Http/Kernel.php +++ b/src/app/Http/Kernel.php @@ -29,6 +29,7 @@ class Kernel extends HttpKernel \App\Http\Middleware\EncryptCookies::class, \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, \Illuminate\Session\Middleware\StartSession::class, + \App\Http\Middleware\Legacywarning::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class, \App\Http\Middleware\VerifyCsrfToken::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, diff --git a/src/app/Http/Middleware/Legacywarning.php b/src/app/Http/Middleware/Legacywarning.php new file mode 100644 index 00000000..be5a5e04 --- /dev/null +++ b/src/app/Http/Middleware/Legacywarning.php @@ -0,0 +1,28 @@ +getAdmin())) { + Auth::getSession()->flash('alert-warning', __('legacywarning.infotext')); + } + + + return $next($request); + } +} From 6ce8149576f8e55636bb8d9abf94210c9848668b Mon Sep 17 00:00:00 2001 From: Apfelwurm Date: Sun, 13 Oct 2024 22:40:51 +0200 Subject: [PATCH 2/4] add legacywarning texts --- src/lang/de/legacywarning.php | 15 +++++++++++++++ src/lang/en/legacywarning.php | 15 +++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/lang/de/legacywarning.php create mode 100644 src/lang/en/legacywarning.php diff --git a/src/lang/de/legacywarning.php b/src/lang/de/legacywarning.php new file mode 100644 index 00000000..72b6b0ad --- /dev/null +++ b/src/lang/de/legacywarning.php @@ -0,0 +1,15 @@ + 'Diese Version von Eventula wird im Dezember in einen legacy branch verschoben und danach, auch im Falle von Sicherheitslücken, nicht mehr aktualisiert. Für alle Handlungsmöglichkeiten und Informationen zu den anstehenden Veränderungen, bitte unseren zugehörigen Github Issue https://github.com/Lan2Play/eventula-manager/issues/842 lesen. Dort ist auch beschrieben wie sich diese Meldung deaktivieren lässt. Sollte diese Instanz mit unserem lan2play/eventula-manager:latest oder lan2play/eventula-manager:dev Docker Image betrieben werden, ist keine Aktion erforderlich um zukünftig weiterhin Funktions und Sicherheitsupdates zu erhalten, die jedoch auch die bisherige Kernfunktionalität verändern werden.', + +]; diff --git a/src/lang/en/legacywarning.php b/src/lang/en/legacywarning.php new file mode 100644 index 00000000..13fd7a6e --- /dev/null +++ b/src/lang/en/legacywarning.php @@ -0,0 +1,15 @@ + 'This version of Eventula will be moved to a legacy branch in December and will no longer be updated, even in the case of security vulnerabilities. For all available actions and information about the upcoming changes, please read our corresponding Github issue at https://github.com/Lan2Play/eventula-manager/issues/842 . It also describes how to disable this message. If this instance is running with our lan2play/eventula-manager:latest or lan2play/eventula-manager:dev Docker image, no action is required to continue receiving future functional and security updates, although these updates may change the previous core functionality.', + +]; From ee0f358928a1c41321a4f96855e53d7cff817417 Mon Sep 17 00:00:00 2001 From: Apfelwurm Date: Sun, 13 Oct 2024 22:40:57 +0200 Subject: [PATCH 3/4] update readme --- README.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2e4460cf..ce08ba10 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ ![Eventula Logo](resources/images/eventula_sample_logo.png) -The Eventula Event Manager / ECO System is a fully featured White labeled Event Management system. The only prerequisite is `docker and/or docker-compose`. Everything is self contained. The purpose of this application is to unify Event Management (Venue, attendees, seating), Ticket Sales, Tournament Management, Shop Management and Credit Management. +> **Announcement** +> The development on Eventula will follow new paths in the future, since we forked off. This also means current users maybe have to take action. Read everything about it in our [related Issue](https://github.com/Lan2Play/eventula-manager/issues/842) + + +The Eventula Event Manager / ECO System is a fully featured White labeled Event Management system. The only prerequisite is `docker and/or docker-compose`. Everything is self contained. The purpose of this application is to unify Event Management (Venue, attendees, seating), Ticket Sales, Tournament Management, Shop Management and Credit Management. It was initially forked off of [th0rn0`s](https://github.com/th0rn0) [lanops-manager](https://github.com/th0rn0/lanops-manager). @@ -16,7 +20,7 @@ If you need help with setting up or using eventula or you want to help developin > **Warning** -> This fork of eventula manager is not 100% update compatible to the current upstream. We have intended to merge it someday, but currently there are to many changes and there is not enough time to do so. If you migrate from the upstream to our fork, please backup youre database and storage before doing so and please report any issues you encounter with the upgrade. +> This fork of eventula manager is not 100% update compatible from [th0rn0`s](https://github.com/th0rn0) [lanops-manager](https://github.com/th0rn0/lanops-manager) or old versions of eventula-manager. If you migrate from one of those to our fork, please backup youre database and storage before doing so and please report any issues you encounter with the upgrade. We don't fully support this path nowadays, so expect problems to arise. ## Usage @@ -131,4 +135,7 @@ Hop over to our [admin documentation](https://eventula.lan2play.de/admin/getting - Lan2Play - https://lan2play.de - Sund-Xplosion - https://sxlan.de -- West Coast Gaming - https://lan.westcoastgaming.se \ No newline at end of file +- West Coast Gaming - https://lan.westcoastgaming.se + +## Credits +- [th0rn0](https://github.com/th0rn0) for the nice work on our Projects base [lanops-manager](https://github.com/th0rn0/lanops-manager) \ No newline at end of file From fd1b3b809b0f2b43547254047701da0be8aae102 Mon Sep 17 00:00:00 2001 From: Apfelwurm Date: Thu, 31 Oct 2024 19:14:16 +0100 Subject: [PATCH 4/4] add env to disable legacywarning --- resources/docker/root/run/docker-entrypoint.sh | 6 ++++++ src/app/Http/Middleware/Legacywarning.php | 2 +- src/config/admin.php | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/resources/docker/root/run/docker-entrypoint.sh b/resources/docker/root/run/docker-entrypoint.sh index 9e139f46..bd9d065e 100755 --- a/resources/docker/root/run/docker-entrypoint.sh +++ b/resources/docker/root/run/docker-entrypoint.sh @@ -22,6 +22,12 @@ file_env() { unset "$fileVar" } +if [ "$DISABLE_LEGACY_WARNING" = 'true' ]; +then + echo 'THIS VERSION OF EVENTULA IS DEPRECATED SOON, WHICH INCLUDES SECURITY UPDATES! YOU HAVE SURPRESSED THE WARNING ON THE PAGE THAT NOTIFIES ALL ADMINS ABOUT THIS FACT !!! PLEASE UPDATE OR FORK EVENTULA LEGACY ! ' +fi + + # Check Variables Exist & Translate from file # Required Env Variables echo 'Required Env Variable Check:' diff --git a/src/app/Http/Middleware/Legacywarning.php b/src/app/Http/Middleware/Legacywarning.php index be5a5e04..23696538 100644 --- a/src/app/Http/Middleware/Legacywarning.php +++ b/src/app/Http/Middleware/Legacywarning.php @@ -18,7 +18,7 @@ class Legacywarning public function handle(Request $request, Closure $next): Response { - if ((Auth::check() && Auth::user()->getAdmin())) { + if ((Auth::check() && Auth::user()->getAdmin()) && ! config('admin.disable_legacy_warning')) { Auth::getSession()->flash('alert-warning', __('legacywarning.infotext')); } diff --git a/src/config/admin.php b/src/config/admin.php index 868b61f1..6819c8f5 100644 --- a/src/config/admin.php +++ b/src/config/admin.php @@ -1,4 +1,6 @@ env('I_KNOW_WHAT_I_AM_DOING_ENABLE_SUPER_DANGER_ZONE', false) + 'super_danger_zone' => env('I_KNOW_WHAT_I_AM_DOING_ENABLE_SUPER_DANGER_ZONE', false), + 'disable_legacy_warning' => env('DISABLE_LEGACY_WARNING', false) + ]; \ No newline at end of file