A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: secure env based demo account for logs
aminnausinf31333f34cf8
diff --git a/app/Console/Commands/ResetDemo.php b/app/Console/Commands/ResetDemo.phpindex daf1dfbc..4dfaa9d8 100644--- a/app/Console/Commands/ResetDemo.php+++ b/app/Console/Commands/ResetDemo.php@@ -4,9 +4,11 @@ namespace App\Console\Commands;use App\Models\Metadata;use App\Models\Series;+use App\Models\User;use Illuminate\Console\Command;use Illuminate\Support\Facades\Artisan;use Illuminate\Support\Facades\DB;+use Illuminate\Support\Facades\Hash;use Illuminate\Support\Facades\Storage;class ResetDemo extends Command {@@ -35,6 +37,11 @@ class ResetDemo extends Command {* Execute the console command.*/public function handle() {+ if (!app()->environment('demo')) {+ $this->error('Not running a demo environment');+ return;+ }+if (! str_contains(strtolower(config('database.connections.pgsql.database', 'mediaServer')), 'demo')) {$this->error('Not using a demo database');@@ -75,6 +82,17 @@ class ResetDemo extends Command {'--force' => true,]);+ if (config('demo.auth_email') && config('demo.auth_password')) {+ User::updateOrCreate(+ ['email' => config('demo.auth_email')],+ [+ 'name' => 'Demo Admin',+ 'email_verified_at' => now(),+ 'password' => Hash::make(config('demo.auth_password')),+ ]+ );+ }+$this->info('✅ Demo DB reset complete.');}diff --git a/app/Http/Controllers/Api/V1/UserController.php b/app/Http/Controllers/Api/V1/UserController.phpindex 7f4c8df1..09b7e07b 100644--- a/app/Http/Controllers/Api/V1/UserController.php+++ b/app/Http/Controllers/Api/V1/UserController.php@@ -18,7 +18,7 @@ class UserController extends Controller {*/public function index() {try {- $users = Auth::id() === 1+ $users = Auth::id() === 1 || (app()->environment('demo') && Auth::user()->email === config('demo.auth_email'))? User::all()->sortBy('name'): User::where('id', Auth::id())->get();@@ -35,7 +35,7 @@ class UserController extends Controller {* @return \Illuminate\Http\Response*/public function destroy(User $user) {- if (Auth::id() !== 1 || Auth::id() === $user->id) {+ if (Auth::id() !== 1 || Auth::id() === $user->id || (app()->environment('demo') && $user->email === config('demo.auth_email'))) {return $this->forbidden();}@@ -73,8 +73,8 @@ class UserController extends Controller {try {returnDB::table('sessions')- ->whereNotNull('user_id')- ->count();+ ->whereNotNull('user_id')+ ->count();} catch (\Throwable $th) {return $this->error(0, 'Unable to get count of logged in users. Error: ' . $th->getMessage(), 500);}diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.phpindex 6a92adf4..d94f6aee 100755--- a/app/Providers/AppServiceProvider.php+++ b/app/Providers/AppServiceProvider.php@@ -31,20 +31,27 @@ class AppServiceProvider extends ServiceProvider {*/public function boot(): void {//- Pulse::user(fn ($user) => [+ Pulse::user(fn($user) => ['name' => $user->name,'extra' => $user->email,]);Gate::define('viewPulse', function (?User $user) {- return $user?->id == 1;+ return $user?->id === 1;});LogViewer::auth(function ($request) {- return $request->user()- && in_array($request->user()->id, [- 1,- ]);+ $user = $request->user();++ if (! $user) return false;++ if (app()->environment('demo')) {+ return $user->email === config('demo.auth_email');+ }++ return in_array($user->id, [+ 1,+ ]);});ResetPassword::createUrlUsing(function (User $user, string $token) {diff --git a/app/Providers/HorizonServiceProvider.php b/app/Providers/HorizonServiceProvider.phpindex 7a7cf56c..4a3c30d6 100644--- a/app/Providers/HorizonServiceProvider.php+++ b/app/Providers/HorizonServiceProvider.php@@ -13,7 +13,7 @@ class HorizonServiceProvider extends HorizonApplicationServiceProvider {*/protected function gate(): void {Gate::define('viewHorizon', function ($user = null) {- return $user?->id == 1;+ return $user?->id === 1;});}}diff --git a/config/demo.php b/config/demo.phpnew file mode 100644index 00000000..c31157a4--- /dev/null+++ b/config/demo.php@@ -0,0 +1,6 @@+<?php++return [+ 'auth_email' => env('DEMO_ADMIN_EMAIL', null),+ 'auth_password' => env('DEMO_ADMIN_PASSWORD', null),+];