Skip to content

A free open source IT asset/license management system

Fixed FD-55751 - check for safe inline, force download otherwise

snipe53599544af85
diff --git a/app/Http/Controllers/UploadedFilesController.php b/app/Http/Controllers/UploadedFilesController.php
index 1b32d9aa99..eb3a082993 100644
--- a/app/Http/Controllers/UploadedFilesController.php
+++ b/app/Http/Controllers/UploadedFilesController.php
@@ -101,11 +101,13 @@ class UploadedFilesController extends Controller
}
if (request('inline') == 'true') {
- $headers = [
- 'Content-Disposition' => 'inline',
- ];
+ $path = self::$map_storage_path[$object_type];
- return Storage::download(self::$map_storage_path[$object_type].$log->filename, $log->filename, $headers);
+ if (! StorageHelper::allowSafeInline($path.$log->filename)) {
+ return StorageHelper::downloader($path.$log->filename);
+ }
+
+ return Storage::download($path.$log->filename, $log->filename, ['Content-Disposition' => 'inline']);
}
return StorageHelper::downloader(self::$map_storage_path[$object_type].$log->filename);