Skip to content

A free open source IT asset/license management system

Reporting: improve validation

Marcus Moorebb19add3b67a
diff --git a/app/Http/Requests/FilterRequest.php b/app/Http/Requests/FilterRequest.php
index 37f5037c6f..558116089c 100644
--- a/app/Http/Requests/FilterRequest.php
+++ b/app/Http/Requests/FilterRequest.php
@@ -2,9 +2,20 @@
namespace App\Http\Requests;
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Component;
+use App\Models\Consumable;
+use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\Location;
+use App\Models\Maintenance;
+use App\Models\User;
use App\Rules\ValidJson;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
class FilterRequest extends FormRequest
{
@@ -23,8 +34,33 @@ class FilterRequest extends FormRequest
*/
public function rules(): array
{
+ $allowedTypes = [
+ 'accessory',
+ Accessory::class,
+ 'asset',
+ Asset::class,
+ 'assetmodel',
+ AssetModel::class,
+ 'component',
+ Component::class,
+ 'consumable',
+ Consumable::class,
+ 'license',
+ License::class,
+ 'licenseseat',
+ LicenseSeat::class,
+ 'location',
+ Location::class,
+ 'maintenance',
+ Maintenance::class,
+ 'user',
+ User::class,
+ ];
+
return [
'filter' => ['nullable', new ValidJson],
+ 'item_type' => ['nullable', Rule::in($allowedTypes)],
+ 'target_type' => ['nullable', Rule::in($allowedTypes)],
];
}
}