Skip to content

Field access for sorting and filtering (2.x) #876

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

Open
bitamar wants to merge 1 commit into
base: 7.x-2.x
Choose a base branch
from
Open

Field access for sorting and filtering (2.x) #876

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/Plugin/resource/DataProvider/DataProviderEntity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,10 @@ protected function queryForListSort(\EntityFieldQuery $query) {
throw new BadRequestException('The current sort selection does not map to any entity property or Field API field.');
}
if (ResourceFieldEntity::propertyIsField($property_name)) {
$field = field_info_field($property_name);
if (!field_access('view', $field, $this->entityType)) {
throw new BadRequestException(format_string('Access denied for sorting by @sort.', array('@sort' => $public_field_name)));
}
$query->fieldOrderBy($property_name, $resource_field->getColumn(), $direction);
}
else {
Expand Down Expand Up @@ -649,7 +653,11 @@ protected function queryForListFilter(\EntityFieldQuery $query) {
throw new BadRequestException(sprintf('The current filter "%s" selection does not map to any entity property or Field API field.', $filter['public_field']));
}

if (field_info_field($property_name)) {
if ($field = field_info_field($property_name)) {
if (!field_access('view', $field, $this->entityType)) {
throw new BadRequestException(format_string('Access denied for filtering by @filter.', array('@filter' => $filter['public_field'])));
}

if ($this::isMultipleValuOperator($filter['operator'][0])) {
$query->fieldCondition($property_name, $resource_field->getColumn(), $this->getReferencedIds($filter['value'], $resource_field), $filter['operator'][0]);
continue;
Expand Down