From 3282702c736482eb86f1ff8991a36eef191728da Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 1 Nov 2022 17:51:53 -0700 Subject: [PATCH 1/7] Added consumables upload routes Signed-off-by: snipe --- storage/private_uploads/consumables/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 storage/private_uploads/consumables/.gitignore diff --git a/storage/private_uploads/consumables/.gitignore b/storage/private_uploads/consumables/.gitignore new file mode 100755 index 000000000000..c96a04f008ee --- /dev/null +++ b/storage/private_uploads/consumables/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file From f6a6478804c055fc3d153d733f4dc89e13551792 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 1 Nov 2022 17:52:04 -0700 Subject: [PATCH 2/7] Added consumable uploads gitignore Signed-off-by: snipe --- routes/web/consumables.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/routes/web/consumables.php b/routes/web/consumables.php index 9f930a968c59..4e2472d30c25 100644 --- a/routes/web/consumables.php +++ b/routes/web/consumables.php @@ -16,6 +16,21 @@ [Consumables\ConsumableCheckoutController::class, 'store'] )->name('consumables.checkout.store'); + Route::post( + '{consumableId}/upload', + [Consumables\ConsumablesFilesController::class, 'store'] + )->name('upload/consumable'); + + Route::delete( + '{consumableId}/deletefile/{fileId}', + [Consumables\ConsumablesFilesController::class, 'destroy'] + )->name('delete/consumablefile'); + + Route::get( + '{consumableId}/showfile/{fileId}/{download?}', + [Consumables\ConsumablesFilesController::class, 'show'] + )->name('show.consumablefile'); + }); From 25f69a7bd299a2d14f6eb420c92c5187be9bf821 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 1 Nov 2022 17:52:28 -0700 Subject: [PATCH 3/7] Added consumable methods for uploads Signed-off-by: snipe --- .../ConsumablesFilesController.php | 176 ++++++++++++++++++ app/Models/Consumable.php | 18 ++ 2 files changed, 194 insertions(+) create mode 100644 app/Http/Controllers/Consumables/ConsumablesFilesController.php diff --git a/app/Http/Controllers/Consumables/ConsumablesFilesController.php b/app/Http/Controllers/Consumables/ConsumablesFilesController.php new file mode 100644 index 000000000000..4dbed60491b3 --- /dev/null +++ b/app/Http/Controllers/Consumables/ConsumablesFilesController.php @@ -0,0 +1,176 @@ +] + * @since [v1.0] + * @param AssetFileRequest $request + * @param int $consumableId + * @return \Illuminate\Http\RedirectResponse + * @throws \Illuminate\Auth\Access\AuthorizationException + */ + public function store(AssetFileRequest $request, $consumableId = null) + { + $consumable = Consumable::find($consumableId); + + if (isset($consumable->id)) { + $this->authorize('update', $consumable); + + if ($request->hasFile('file')) { + if (! Storage::exists('private_uploads/consumables')) { + Storage::makeDirectory('private_uploads/consumables', 775); + } + + foreach ($request->file('file') as $file) { + + $extension = $file->getClientOriginalExtension(); + $file_name = 'consumable-'.$consumable->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/consumables/'.$file_name, $cleanSVG); + } catch (\Exception $e) { + \Log::debug('Upload no workie :( '); + \Log::debug($e); + } + + } else { + Storage::put('private_uploads/consumables/'.$file_name, file_get_contents($file)); + } + + //Log the upload to the log + $consumable->logUpload($file_name, e($request->input('notes'))); + } + + + return redirect()->route('consumables.show', $consumable->id)->with('success', trans('admin/consumables/message.upload.success')); + + } + + return redirect()->route('consumables.show', $consumable->id)->with('error', trans('admin/consumables/message.upload.nofiles')); + } + // Prepare the error message + return redirect()->route('consumables.index') + ->with('error', trans('admin/consumables/message.does_not_exist')); + } + + /** + * Deletes the selected consumable file. + * + * @author [A. Gianotto] [] + * @since [v1.0] + * @param int $consumableId + * @param int $fileId + * @return \Illuminate\Http\RedirectResponse + * @throws \Illuminate\Auth\Access\AuthorizationException + */ + public function destroy($consumableId = null, $fileId = null) + { + $consumable = Consumable::find($consumableId); + + // the asset is valid + if (isset($consumable->id)) { + $this->authorize('update', $consumable); + $log = Actionlog::find($fileId); + + // Remove the file if one exists + if (Storage::exists('consumables/'.$log->filename)) { + try { + Storage::delete('consumables/'.$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('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist')); + } + + /** + * Allows the selected file to be viewed. + * + * @author [A. Gianotto] [] + * @since [v1.4] + * @param int $consumableId + * @param int $fileId + * @return \Symfony\Consumable\HttpFoundation\Response + * @throws \Illuminate\Auth\Access\AuthorizationException + */ + public function show($consumableId = null, $fileId = null, $download = true) + { + $consumable = Consumable::find($consumableId); + + // the consumable is valid + if (isset($consumable->id)) { + $this->authorize('view', $consumable); + $this->authorize('consumables.files', $consumable); + + if (! $log = Actionlog::find($fileId)) { + return response('No matching record for that asset/file', 500) + ->header('Content-Type', 'text/plain'); + } + + $file = 'private_uploads/consumables/'.$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('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist', ['id' => $fileId])); + } +} diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php index ac4b8fd9d4ed..c04c9b53d5f0 100644 --- a/app/Models/Consumable.php +++ b/app/Models/Consumable.php @@ -96,6 +96,24 @@ class Consumable extends SnipeModel 'manufacturer' => ['name'], ]; + + /** + * Establishes the components -> 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'); + } + + /** * Sets the attribute of whether or not the consumable is requestable * From b362951c95f00c946b565cb4f1ea43ac3d134986 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 1 Nov 2022 17:52:45 -0700 Subject: [PATCH 4/7] Added consumables permissions Signed-off-by: snipe --- config/permissions.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/permissions.php b/config/permissions.php index 2af54d615a54..64310ac0509b 100644 --- a/config/permissions.php +++ b/config/permissions.php @@ -178,6 +178,12 @@ 'note' => '', 'display' => true, ], + [ + 'permission' => 'consumables.files', + 'label' => 'View and Modify Consumable Files', + 'note' => '', + 'display' => true, + ], ], From 761da534f36ca1d5b0bd72233947d6e73d45bd1c Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 1 Nov 2022 17:53:08 -0700 Subject: [PATCH 5/7] Updated consumables UI to allow uploads and display files Signed-off-by: snipe --- resources/views/consumables/view.blade.php | 188 +++++++++++++++++---- 1 file changed, 159 insertions(+), 29 deletions(-) diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php index c406264a77a2..2cd3ac5beeb7 100644 --- a/resources/views/consumables/view.blade.php +++ b/resources/views/consumables/view.blade.php @@ -18,55 +18,180 @@
-
- @if ($consumable->id) -
-
-

{{ $consumable->name }}

+ + +
+ + + +
+ +
+ + +
+ + + + + + + + + + +
{{ trans('general.user') }}{{ trans('general.date') }}{{ trans('general.notes') }}{{ trans('general.admin') }}
+
+
-
- @endif -
-
-
-
+ @can('consumables.files', $consumable) +
+ +
+ "fileName": "export-consumables-uploads-{{ str_slug($consumable->name) }}-{{ date('Y-m-d') }}", + "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"] + }'> + + + + + + + + + + + + + @if ($consumable->uploads->count() > 0) + @foreach ($consumable->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('consumables'))) + + @endif + @endif + + {{ $file->filename }} + + {{ Helper::formatFilesizeUnits(Storage::size('private_uploads/consumables/'.$file->filename)) }} + + @if ($file->note) + {{ $file->note }} + @endif + + @if ($file->filename) + + + {{ trans('general.download') }} + + @endif + {{ $file->created_at }} + + + {{ trans('general.delete') }} + +
{{ trans('general.user') }}{{ trans('general.date') }}{{ trans('general.notes') }}{{ trans('general.admin') }}{{ trans('general.no_results') }}
-
+
+ @endcan -
-
-
+
+ +
+ +
@@ -163,6 +288,11 @@ class="table table-striped snipe-table" @stop +@can('update', \App\Models\Consumable::class) + @include ('modals.upload-file', ['item_type' => 'consumable', 'item_id' => $consumable->id]) +@endcan + + @section('moar_scripts') @include ('partials.bootstrap-table', ['exportFile' => 'consumable' . $consumable->name . '-export', 'search' => false]) @stop From fa79a6c15f4172597b2eb74254c87ebc88b01933 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 1 Nov 2022 18:19:13 -0700 Subject: [PATCH 6/7] Skip storage:: facade on missing images Signed-off-by: snipe --- resources/views/consumables/view.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php index 2cd3ac5beeb7..70b30d89d9cc 100644 --- a/resources/views/consumables/view.blade.php +++ b/resources/views/consumables/view.blade.php @@ -149,8 +149,8 @@ class="table table-striped snipe-table" {{ $file->filename }} - - {{ Helper::formatFilesizeUnits(Storage::size('private_uploads/consumables/'.$file->filename)) }} + + {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/consumables/'.$file->filename) ? Storage::size('private_uploads/consumables/'.$file->filename) : '') }} From 2106b64da6a134e7397862864f5896e7b0719fcf Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 1 Nov 2022 19:06:49 -0700 Subject: [PATCH 7/7] Fixed some layout issues Signed-off-by: snipe --- .../Controllers/Api/ConsumablesController.php | 1 + resources/views/consumables/view.blade.php | 34 +++++++++---------- .../views/partials/bootstrap-table.blade.php | 8 +++-- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php index ebc27c608f17..fc6620df48cc 100644 --- a/app/Http/Controllers/Api/ConsumablesController.php +++ b/app/Http/Controllers/Api/ConsumablesController.php @@ -228,6 +228,7 @@ public function getDataView($consumableId) foreach ($consumable->consumableAssignments as $consumable_assignment) { $rows[] = [ + 'avatar' => ($consumable_assignment->user) ? e($consumable_assignment->user->present()->gravatar) : '', 'name' => ($consumable_assignment->user) ? $consumable_assignment->user->present()->nameUrl() : 'Deleted User', 'created_at' => Helper::getFormattedDateObject($consumable_assignment->created_at, 'datetime'), 'note' => ($consumable_assignment->note) ? e($consumable_assignment->note) : null, diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php index 70b30d89d9cc..406d3b4bd145 100644 --- a/resources/views/consumables/view.blade.php +++ b/resources/views/consumables/view.blade.php @@ -21,12 +21,10 @@
-
    -
  • - + @@ -47,9 +45,12 @@
    • @endcan - @can('update', \App\Models\Consumble::class) -
  • - {{ trans('button.upload') }} + @can('update', Consumable::class) + +
  • + + {{ trans('button.upload') }} +
    • @endcan @@ -57,9 +58,7 @@
    -
    - - +
    - - + + +
    {{ trans('general.user') }}{{ trans('general.date') }}{{ trans('general.image') }}{{ trans('general.user') }} + {{ trans('general.date') }} + {{ trans('general.notes') }} {{ trans('general.admin') }}
    -
    - -
    +
    +
    @can('consumables.files', $consumable) @@ -194,7 +195,6 @@ class="table table-striped snipe-table"
    -
    @@ -286,12 +286,12 @@ class="table table-striped snipe-table"
    -@stop + @can('update', \App\Models\Consumable::class) @include ('modals.upload-file', ['item_type' => 'consumable', 'item_id' => $consumable->id]) @endcan - +@stop @section('moar_scripts') @include ('partials.bootstrap-table', ['exportFile' => 'consumable' . $consumable->name . '-export', 'search' => false]) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 57ac6a4d7ec1..ef29f8370d42 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -632,10 +632,14 @@ function imageFormatter(value, row) { if (value) { - if (row.name) { + // This is a clunky override to handle unusual API responses where we're presenting a link instead of an array + if (row.avatar) { + var altName = ''; + } + else if (row.name) { var altName = row.name; } - else if ((row) && (row.model)) { + else if ((row) && (row.model)) { var altName = row.model.name; } return '' + altName + '';