From 434068a2ed8cbceef43746a551230a259c3479ef Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 17 Jan 2025 17:49:19 +0000 Subject: [PATCH] Fixes #16000 - add S3 support for eula PDF downloads Signed-off-by: snipe --- app/Http/Controllers/ActionlogController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ActionlogController.php b/app/Http/Controllers/ActionlogController.php index f2580c96fc6f..057ca465bc5a 100644 --- a/app/Http/Controllers/ActionlogController.php +++ b/app/Http/Controllers/ActionlogController.php @@ -40,10 +40,13 @@ public function displaySig($filename) : RedirectResponse | Response | bool public function getStoredEula($filename) : Response | BinaryFileResponse | RedirectResponse { $this->authorize('view', \App\Models\Asset::class); - $file = config('app.private_uploads').'/eula-pdfs/'.$filename; + + if (config('filesystems.default') == 's3_private') { + return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/eula-pdfs/'.$filename, now()->addMinutes(5))); + } if (Storage::exists('private_uploads/eula-pdfs/'.$filename)) { - return response()->download($file); + return response()->download(config('app.private_uploads').'/eula-pdfs/'.$filename); } return redirect()->back()->with('error', trans('general.file_does_not_exist'));