A free open source IT asset/license management system
EULAS+Users: Tighten gates around EULA downloads
snipef15d78621b00
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.phpindex 49c3960055..1fb15285b2 100644--- a/app/Http/Controllers/Api/UsersController.php+++ b/app/Http/Controllers/Api/UsersController.php@@ -893,7 +893,7 @@ class UsersController extends Controller*/public function eulas(User $user, ActionlogsTransformer $transformer){- $this->authorize('view', User::class);+ $this->authorize('view', $user);$eulas = $user->eulas;diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.phpindex 746c59eaac..b1fbf16f1f 100755--- a/app/Http/Controllers/ProfileController.php+++ b/app/Http/Controllers/ProfileController.php@@ -265,16 +265,15 @@ class ProfileController extends Controller{$filename = basename((string) $filename);- $logentry = Actionlog::where('filename', $filename)->first();+ $logentry = Actionlog::where('filename', $filename)->with('user', 'target')->first();- // Make sure the user has permission to view this file- // Also allow if the user (manager) able to view both users and assets- $allowed_to_view_users_assets = Gate::allows('view', User::class) && Gate::allows('view', Asset::class);-- if (auth()->id() != $logentry->target_id && ! $allowed_to_view_users_assets) {- return redirect()->route('account')->with('error', trans('general.generic_model_not_found', ['model' => 'file']));+ if (! $logentry) {+ return redirect()->back()->with('error', trans('general.record_not_found'));}+ $this->authorize('view', $logentry->target);+ $this->authorize('view', $logentry->user);+if (config('filesystems.default') == 's3_private') {return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/eula-pdfs/'.$filename, now()->addMinutes(5)));}