Skip to content

Fixed invalid custom fields being used for filtering #17544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snipe merged 2 commits into from
Aug 15, 2025
Merged

Fixed invalid custom fields being used for filtering #17544

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c95aeb3
Filter out unallowed columns (custom fields)
marcusmoore Aug 8, 2025
4a7b718
Add custom_fields. prefix so custom fields can be filtered against
marcusmoore Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions app/Http/Controllers/Api/AssetsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,21 @@ public function index(Request $request, $action = null, $upcoming_status = null)
'jobtitle',
];

$all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
foreach ($all_custom_fields as $field) {
// custom fields are prefixed with "custom_fields.".
// We'll add them to the allowed columns so they can be searched.
$allowed_columns[] = 'custom_fields.' . $field->db_column_name();
}

$filter = [];

if ($request->filled('filter')) {
$filter = json_decode($request->input('filter'), true);
}

$all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
foreach ($all_custom_fields as $field) {
$allowed_columns[] = $field->db_column_name();
$filter = array_filter($filter, function ($key) use ($allowed_columns) {
return in_array($key, $allowed_columns);
}, ARRAY_FILTER_USE_KEY);
}

$assets = Asset::select('assets.*')
Expand Down
Loading