Skip to content
Open
Changes from all commits
Commits
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
28 changes: 27 additions & 1 deletion src/Traits/HasSelectableFields.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

trait HasSelectableFields
{
/** @var array<string, list<string>> */
private static array $selectableColumnsCache = [];

private function isFieldTranslatable(string $field): bool
{
/** @var array<string> $translatable */
Expand All @@ -19,16 +22,39 @@ private function isFieldTranslatable(string $field): bool
return in_array($field, $translatable, true);
}

/**
* Real columns of the underlying table, used to allowlist requested fields.
*
* @param Builder<Model> $query
* @return list<string>
*/
private function selectableColumns(Builder $query): array
{
$table = $this->getTable();

return self::$selectableColumnsCache[$table] ??= $query
->getConnection()
->getSchemaBuilder()
->getColumnListing($table);
}

/** @param Builder<Model> $query */
#[Scope]
protected function selectFields(Builder $query): void
{
$locale = request('locale', app()->getLocale());
$fields = explode(',', (string) request()->string('fields.'.$this->getTable()));
$allowedColumns = $this->selectableColumns($query);

foreach ($fields as $field) {
$field = mb_trim($field);

if (! $this->isFieldTranslatable($field)) {
$query->addSelect($field);
// Never let a user-supplied value dictate a column name: only
// select columns that actually exist on the table.
if (in_array($field, $allowedColumns, true)) {
$query->addSelect($field);
}

continue;
}
Expand Down