diff --git a/app/Http/Controllers/Accessories/AccessoriesFilesController.php b/app/Http/Controllers/Accessories/AccessoriesFilesController.php new file mode 100644 index 0000000000..cc6dcfb97f --- /dev/null +++ b/app/Http/Controllers/Accessories/AccessoriesFilesController.php @@ -0,0 +1,177 @@ +] + * @since [v1.0] + * @param AssetFileRequest $request + * @param int $accessoryId + * @return \Illuminate\Http\RedirectResponse + * @throws \Illuminate\Auth\Access\AuthorizationException + */ + public function store(AssetFileRequest $request, $accessoryId = null) + { + $accessory = Accessory::find($accessoryId); + + if (isset($accessory->id)) { + $this->authorize('update', $accessory); + + if ($request->hasFile('file')) { + if (! Storage::exists('private_uploads/accessories')) { + Storage::makeDirectory('private_uploads/accessories', 775); + } + + foreach ($request->file('file') as $file) { + + $extension = $file->getClientOriginalExtension(); + $file_name = 'accessory-'.$accessory->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension; + + + // Check for SVG and sanitize it + if ($extension == 'svg') { + \Log::debug('This is an SVG'); + \Log::debug($file_name); + + $sanitizer = new Sanitizer(); + $dirtySVG = file_get_contents($file->getRealPath()); + $cleanSVG = $sanitizer->sanitize($dirtySVG); + + try { + Storage::put('private_uploads/accessories/'.$file_name, $cleanSVG); + } catch (\Exception $e) { + \Log::debug('Upload no workie :( '); + \Log::debug($e); + } + + } else { + Storage::put('private_uploads/accessories/'.$file_name, file_get_contents($file)); + } + + //Log the upload to the log + $accessory->logUpload($file_name, e($request->input('notes'))); + } + + + return redirect()->route('accessories.show', $accessory->id)->with('success', trans('general.file_upload_success')); + + } + + return redirect()->route('accessories.show', $accessory->id)->with('error', trans('general.no_files_uploaded')); + } + // Prepare the error message + return redirect()->route('accessories.index') + ->with('error', trans('general.file_does_not_exist')); + } + + /** + * Deletes the selected accessory file. + * + * @author [A. Gianotto] [] + * @since [v1.0] + * @param int $accessoryId + * @param int $fileId + * @return \Illuminate\Http\RedirectResponse + * @throws \Illuminate\Auth\Access\AuthorizationException + */ + public function destroy($accessoryId = null, $fileId = null) + { + $accessory = Accessory::find($accessoryId); + + // the asset is valid + if (isset($accessory->id)) { + $this->authorize('update', $accessory); + $log = Actionlog::find($fileId); + + // Remove the file if one exists + if (Storage::exists('accessories/'.$log->filename)) { + try { + Storage::delete('accessories/'.$log->filename); + } catch (\Exception $e) { + \Log::debug($e); + } + } + + $log->delete(); + + return redirect()->back() + ->with('success', trans('admin/hardware/message.deletefile.success')); + } + + // Redirect to the licence management page + return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist')); + } + + /** + * Allows the selected file to be viewed. + * + * @author [A. Gianotto] [] + * @since [v1.4] + * @param int $accessoryId + * @param int $fileId + * @return \Symfony\Accessory\HttpFoundation\Response + * @throws \Illuminate\Auth\Access\AuthorizationException + */ + public function show($accessoryId = null, $fileId = null, $download = true) + { + \Log::debug('Private filesystem is: '.config('filesystems.default')); + $accessory = Accessory::find($accessoryId); + + // the accessory is valid + if (isset($accessory->id)) { + $this->authorize('view', $accessory); + $this->authorize('accessories.files', $accessory); + + if (! $log = Actionlog::find($fileId)) { + return response('No matching record for that asset/file', 500) + ->header('Content-Type', 'text/plain'); + } + + $file = 'private_uploads/accessories/'.$log->filename; + + if (Storage::missing($file)) { + \Log::debug('FILE DOES NOT EXISTS for '.$file); + \Log::debug('URL should be '.Storage::url($file)); + + return response('File '.$file.' ('.Storage::url($file).') not found on server', 404) + ->header('Content-Type', 'text/plain'); + } else { + + // We have to override the URL stuff here, since local defaults in Laravel's Flysystem + // won't work, as they're not accessible via the web + if (config('filesystems.default') == 'local') { // TODO - is there any way to fix this at the StorageHelper layer? + return StorageHelper::downloader($file); + } else { + if ($download != 'true') { + \Log::debug('display the file'); + if ($contents = file_get_contents(Storage::url($file))) { // TODO - this will fail on private S3 files or large public ones + return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file))); + } + + return JsonResponse::create(['error' => 'Failed validation: '], 500); + } + + return StorageHelper::downloader($file); + + } + } + } + + return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId])); + } +} diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php index 1f2f50463c..3f2004b047 100755 --- a/app/Models/Accessory.php +++ b/app/Models/Accessory.php @@ -101,6 +101,23 @@ class Accessory extends SnipeModel + /** + * Establishes the accessories -> action logs -> uploads relationship + * + * @author A. Gianotto + * @since [v6.1.13] + * @return \Illuminate\Database\Eloquent\Relations\Relation + */ + public function uploads() + { + return $this->hasMany(\App\Models\Actionlog::class, 'item_id') + ->where('item_type', '=', self::class) + ->where('action_type', '=', 'uploaded') + ->whereNotNull('filename') + ->orderBy('created_at', 'desc'); + } + + /** * Establishes the accessory -> supplier relationship * diff --git a/config/permissions.php b/config/permissions.php index 00c11356d0..adb216b960 100644 --- a/config/permissions.php +++ b/config/permissions.php @@ -145,6 +145,13 @@ return [ 'note' => '', 'display' => true, ], + [ + 'permission' => 'accessories.files', + 'label' => 'View and Modify Accessory Files', + 'note' => '', + 'display' => true, + ], + ], 'Consumables' => [ diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index c85acefe35..82ff8efc44 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -46,65 +46,234 @@ {{-- Page content --}} @section('content') + {{-- Page content --}} +
+
- -
+ +
+ + +
+ +
+
+
+
+ + + + + + + + + +
{{ trans('general.user') }}{{ trans('general.notes') }}{{ trans('admin/hardware/table.checkout_date') }}{{ trans('table.actions') }}
+
+
+
+
+ + +
+
+
+
+ + + + + + + + + + + + @if ($snipeSettings->require_accept_signature=='1') + + @endif + + +
{{ trans('general.record_created') }}{{ trans('general.admin') }}{{ trans('general.action') }}{{ trans('general.item') }}{{ trans('general.target') }}{{ trans('general.notes') }}{{ trans('general.date') }}{{ trans('general.signature') }}
+
+
+
+
-
-
-
-
- - - - - - - - - -
{{ trans('general.user') }}{{ trans('general.notes') }}{{ trans('admin/hardware/table.checkout_date') }}{{ trans('table.actions') }}
-
+ @can('accessorys.files', $accessory) +
+
+
+
+ + + + + + + + + + + + + + + @if ($accessory->uploads->count() > 0) + @foreach ($accessory->uploads as $file) + + + + + + + + + + + + @endforeach + @else + + + + @endif + +
{{trans('general.file_type')}}{{ trans('general.image') }}{{ trans('general.file_name') }}{{ trans('general.filesize') }}{{ trans('general.notes') }}{{ trans('general.download') }}{{ trans('general.created_at') }}{{ trans('table.actions') }}
+ + {{ Helper::filetype_icon($file->filename) }} + + @if ($file->filename) + @if ( Helper::checkUploadIsImage($file->get_src('accessorys'))) + + @endif + @endif + + {{ $file->filename }} + + {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/accessorys/'.$file->filename) ? Storage::size('private_uploads/accessorys/'.$file->filename) : '') }} + + @if ($file->note) + {{ $file->note }} + @endif + + @if ($file->filename) + + + {{ trans('general.download') }} + + @endif + {{ $file->created_at }} + + + {{ trans('general.delete') }} + +
{{ trans('general.no_results') }}
+
+
+ @endcan + +
+
+
+
+
@@ -220,17 +389,17 @@
+ + + +@can('update', Accessory::class) + @include ('modals.upload-file', ['item_type' => 'accessory', 'item_id' => $accessory->id]) +@endcan @stop - - - - - - @section('moar_scripts') @include ('partials.bootstrap-table') @stop diff --git a/routes/web/accessories.php b/routes/web/accessories.php index c250c122d2..3166b36cd9 100644 --- a/routes/web/accessories.php +++ b/routes/web/accessories.php @@ -27,6 +27,21 @@ Route::group(['prefix' => 'accessories', 'middleware' => ['auth']], function () [Accessories\AccessoryCheckinController::class, 'store'] )->name('accessories.checkin.store'); + Route::post( + '{accessoryId}/upload', + [Accessories\AccessoriesFilesController::class, 'store'] + )->name('upload/accessory'); + + Route::delete( + '{accessoryId}/deletefile/{fileId}', + [Accessories\AccessoriesFilesController::class, 'destroy'] + )->name('delete/accessoryfile'); + + Route::get( + '{accessoryId}/showfile/{fileId}/{download?}', + [Accessories\AccessoriesFilesController::class, 'show'] + )->name('show.accessoryfile'); + }); Route::resource('accessories', Accessories\AccessoriesController::class, [ diff --git a/storage/private_uploads/accessories/.gitignore b/storage/private_uploads/accessories/.gitignore new file mode 100755 index 0000000000..c96a04f008 --- /dev/null +++ b/storage/private_uploads/accessories/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file