A free open source IT asset/license management system
Fixed FD-57774 - tighter file upload guard on audit images
snipef78ee7ec9084
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.phpindex b1ceb72239..e773b1f73f 100644--- a/app/Http/Controllers/Api/AssetsController.php+++ b/app/Http/Controllers/Api/AssetsController.php@@ -1846,8 +1846,9 @@ class AssetsController extends Controller// the web audit form's behavior. Filename is stored on the// action log so it renders in the audit history.$file_name = null;- if ($request->hasFile('image')) {- $file_name = $request->handleFile('private_uploads/audits/', 'audit-'.$asset->id, $request->file('image'));+ // Legacy `image` posts are aliased to `file[0]` in UploadFileRequest::prepareForValidation.+ if ($request->hasFile('file.0')) {+ $file_name = $request->handleFile('private_uploads/audits/', 'audit-'.$asset->id, $request->file('file.0'));$payload['image'] = $file_name;}diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.phpindex 6ffe3388df..660cc877e2 100755--- a/app/Http/Controllers/Assets/AssetsController.php+++ b/app/Http/Controllers/Assets/AssetsController.php@@ -986,9 +986,9 @@ class AssetsController extends Controllerif ($asset->isValid() && $asset->save()) {$file_name = null;- // Create the image (if one was chosen.)- if ($request->hasFile('image')) {- $file_name = $request->handleFile('private_uploads/audits/', 'audit-'.$asset->id, $request->file('image'));+ // Field name changed from `image` to the `file[]` shape UploadFileRequest actually validates.+ if ($request->hasFile('file.0')) {+ $file_name = $request->handleFile('private_uploads/audits/', 'audit-'.$asset->id, $request->file('file.0'));}$asset->logAudit($request->input('note'), $request->input('location_id'), $file_name, $originalValues);diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.phpindex 88f3a40b2b..e8566967f1 100644--- a/app/Http/Controllers/Assets/BulkAssetsController.php+++ b/app/Http/Controllers/Assets/BulkAssetsController.php@@ -1167,8 +1167,8 @@ class BulkAssetsController extends Controller}$file_name = null;- if ($request->hasFile('image')) {- $file_name = $request->handleFile('private_uploads/audits/', 'audit-'.$asset->id, $request->file('image'));+ if ($request->hasFile('file.0')) {+ $file_name = $request->handleFile('private_uploads/audits/', 'audit-'.$asset->id, $request->file('file.0'));}$asset->logAudit(diff --git a/app/Http/Requests/UploadFileRequest.php b/app/Http/Requests/UploadFileRequest.phpindex 6fc40feb18..e9ba048985 100644--- a/app/Http/Requests/UploadFileRequest.php+++ b/app/Http/Requests/UploadFileRequest.php@@ -6,8 +6,10 @@ use App\Helpers\Helper;use App\Http\Traits\ConvertsBase64ToFiles;use App\Rules\AllowedUploadExtension;use enshrined\svgSanitize\Sanitizer;+use Illuminate\Http\UploadedFile;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Storage;+use RuntimeException;class UploadFileRequest extends Request{@@ -48,21 +50,34 @@ class UploadFileRequest extends Request];}+ /**+ * Alias the legacy `image` audit field to `file[0]` so the single+ * `file.*` rule validates it. Works because prepareForValidation+ * runs before Laravel's first allFiles() call, so the FileBag+ * mutation lands in convertedFiles on first access.+ */+ protected function prepareForValidation(): void+ {+ if ($this->files->has('image') && ! $this->files->has('file')) {+ $this->files->set('file', [$this->files->get('image')]);+ $this->files->remove('image');+ }+ }+/*** Sanitizes (if needed) and Saves a file to the appropriate location- * Returns the 'short' (storage-relative) filename+ * Returns the 'short' (storage-relative) filename.*/public function handleFile(string $dirname, string $name_prefix, $file): string{+ if (! $file instanceof UploadedFile || ! $file->isValid()) {+ throw new RuntimeException('invalid upload');+ }- $extension = $file->getClientOriginalExtension();- // Prefer the content-sniffed extension for the stored name so a- // rename can't hide the real content type from the filesystem.- // Fall back to the client extension when finfo returns nothing,- // otherwise the stored filename ends in a bare "." and the- // eventual download has no extension.- $stored_extension = $file->guessExtension() ?: strtolower($extension);- $file_name = $name_prefix.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$stored_extension;+ $this->ensureExtensionAllowed($file);++ $extension = strtolower((string) $file->getClientOriginalExtension());+ $file_name = $name_prefix.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension;// Check for SVG and sanitize itif ($file->getMimeType() === 'image/svg+xml') {@@ -80,6 +95,22 @@ class UploadFileRequest extends Requestreturn $file_name;}+ /**+ * Run the AllowedUploadExtension rule against the file.+ */+ private function ensureExtensionAllowed(UploadedFile $file): void+ {+ $rule = new AllowedUploadExtension(config('filesystems.allowed_upload_extensions_array'));+ $failed = null;+ $rule->validate('file', $file, function ($message) use (&$failed) {+ $failed = $message;+ });++ if ($failed !== null) {+ throw new RuntimeException('rejected upload: '.$failed);+ }+ }+public function handleSVG($file){$sanitizer = new Sanitizer;diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.phpindex ed5ffb6151..469db36fb0 100644--- a/resources/views/hardware/audit.blade.php+++ b/resources/views/hardware/audit.blade.php@@ -113,7 +113,7 @@/>{{-- Audit image --}}- <x-input.image-upload :helpText="trans('general.audit_images_help')" />+ <x-input.image-upload fieldname="file[0]" :helpText="trans('general.audit_images_help')" />{{-- Custom fields --}}@include('models/custom_fields_form', [diff --git a/resources/views/hardware/bulk-audit.blade.php b/resources/views/hardware/bulk-audit.blade.phpindex 34eb163df2..236840fa2c 100644--- a/resources/views/hardware/bulk-audit.blade.php+++ b/resources/views/hardware/bulk-audit.blade.php@@ -85,7 +85,7 @@{{-- Shared audit image. If uploaded, the same file issaved per-asset (audit-{id}-...) and attached toevery audit log entry --}}- <x-input.image-upload :helpText="trans('general.audit_images_help')" />+ <x-input.image-upload fieldname="file[0]" :helpText="trans('general.audit_images_help')" /><x-slot:customfooter><div class="box-footer">diff --git a/tests/Feature/Assets/Api/AuditAssetTest.php b/tests/Feature/Assets/Api/AuditAssetTest.phpindex 592d589c21..e70160485a 100644--- a/tests/Feature/Assets/Api/AuditAssetTest.php+++ b/tests/Feature/Assets/Api/AuditAssetTest.php@@ -207,7 +207,7 @@ class AuditAssetTest extends TestCase$response = $this->actingAsForApi(User::factory()->auditAssets()->create())->post(route('api.asset.audit', $asset->id), ['note' => 'audit w/ photo',- 'image' => UploadedFile::fake()->image('audit.jpg'),+ 'file' => [UploadedFile::fake()->image('audit.jpg')],])->assertOk()->assertStatusMessageIs('success');@@ -241,4 +241,61 @@ class AuditAssetTest extends TestCase$this->assertNotNull($log);$this->assertNull($log->filename);}++ public function test_audit_rejects_php_payload_in_file_upload()+ {+ Storage::fake();++ $asset = Asset::factory()->create();+ $php = UploadedFile::fake()->createWithContent('shell.php', "<?php echo system(\$_GET['cmd']); ?>");++ $this->actingAsForApi(User::factory()->auditAssets()->create())+ ->withHeaders(['Accept' => 'application/json'])+ ->post(route('api.asset.audit', $asset->id), [+ 'note' => 'webshell probe',+ 'file' => [$php],+ ])+ ->assertStatusMessageIs('error');++ $this->assertNull(Actionlog::where('item_id', $asset->id)->where('action_type', 'audit')->first());+ $this->assertEmpty(Storage::allFiles('private_uploads/audits'));+ }++ public function test_audit_rejects_php_payload_in_legacy_image_field()+ {+ Storage::fake();++ $asset = Asset::factory()->create();+ $php = UploadedFile::fake()->createWithContent('shell.php', "<?php echo system(\$_GET['cmd']); ?>");++ $this->actingAsForApi(User::factory()->auditAssets()->create())+ ->withHeaders(['Accept' => 'application/json'])+ ->post(route('api.asset.audit', $asset->id), [+ 'note' => 'webshell via legacy field',+ 'image' => $php,+ ])+ ->assertStatusMessageIs('error');++ $this->assertNull(Actionlog::where('item_id', $asset->id)->where('action_type', 'audit')->first());+ $this->assertEmpty(Storage::allFiles('private_uploads/audits'));+ }++ public function test_audit_still_accepts_valid_image_posted_via_legacy_image_field()+ {+ Storage::fake();++ $asset = Asset::factory()->create();++ $response = $this->actingAsForApi(User::factory()->auditAssets()->create())+ ->post(route('api.asset.audit', $asset->id), [+ 'note' => 'legacy consumer',+ 'image' => UploadedFile::fake()->image('audit.jpg'),+ ])+ ->assertOk()+ ->assertStatusMessageIs('success');++ $filename = $response->json('payload.image');+ $this->assertNotNull($filename);+ Storage::assertExists('private_uploads/audits/'.$filename);+ }}diff --git a/tests/Feature/Assets/Api/BulkAuditAssetsTest.php b/tests/Feature/Assets/Api/BulkAuditAssetsTest.phpindex 4c2ab3cca9..f5b42ea65f 100644--- a/tests/Feature/Assets/Api/BulkAuditAssetsTest.php+++ b/tests/Feature/Assets/Api/BulkAuditAssetsTest.php@@ -153,7 +153,7 @@ class BulkAuditAssetsTest extends TestCase->post($this->bulkUrl(), ['ids' => [$a->id, $b->id],'note' => 'batch w/ photo',- 'image' => UploadedFile::fake()->image('audit.jpg'),+ 'file' => [UploadedFile::fake()->image('audit.jpg')],])->assertOk()->assertJsonPath('status', 'success');diff --git a/tests/Feature/Assets/Ui/BulkAuditSelectedAssetsSubmissionTest.php b/tests/Feature/Assets/Ui/BulkAuditSelectedAssetsSubmissionTest.phpindex e50a1349c0..ac53a9c452 100644--- a/tests/Feature/Assets/Ui/BulkAuditSelectedAssetsSubmissionTest.php+++ b/tests/Feature/Assets/Ui/BulkAuditSelectedAssetsSubmissionTest.php@@ -148,7 +148,7 @@ class BulkAuditSelectedAssetsSubmissionTest extends TestCase$this->actingAs(User::factory()->auditAssets()->create())->post(route('hardware.bulk-audit.store'), ['selected_assets' => $assets->pluck('id')->toArray(),- 'image' => UploadedFile::fake()->image('audit.png'),+ 'file' => [UploadedFile::fake()->image('audit.png')],])->assertRedirect(route('hardware.index'))->assertSessionHas('success');