Skip to content

Field access for sorting and filtering (1.x) #875

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 2 commits into
base: 7.x-1.x
Choose a base branch
from
Open

Field access for sorting and filtering (1.x) #875

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
168aea0
Field access for sorting and filtering
bitamar Mar 6, 2016
a8307b1
Improving exception messages
bitamar Mar 6, 2016
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
11 changes: 9 additions & 2 deletions plugins/restful/RestfulDataProviderEFQ.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,10 @@ protected function queryForListSort(\EntityFieldQuery $query) {
if (!$property_name = $public_fields[$public_field_name]['property']) {
throw new \RestfulBadRequestException('The current sort selection does not map to any entity property or Field API field.');
}
if (field_info_field($property_name)) {
if ($field = field_info_field($property_name)) {
if (!field_access('view', $field, $this->entityType)) {
Copy link
Copy Markdown
Member

@amitaibu amitaibu Mar 7, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will require also passing the $this->getAccount() to field_access

throw new RestfulBadRequestException(format_string('Access denied for sorting by @sort.', array('@sort' => $public_field_name)));
}
$query->fieldOrderBy($public_fields[$public_field_name]['property'], $public_fields[$public_field_name]['column'], $direction);
}
else {
Expand All @@ -170,7 +173,11 @@ protected function queryForListFilter(\EntityFieldQuery $query) {
if (!$property_name = $public_fields[$filter['public_field']]['property']) {
throw new \RestfulBadRequestException('The current filter selection does not map to any entity property or Field API field.');
}
if (field_info_field($property_name)) {
if ($field = field_info_field($property_name)) {
if (!field_access('view', $field, $this->entityType)) {
throw new RestfulBadRequestException(format_string('Access denied for filtering by @filter.', array('@filter' => $filter['public_field'])));
}

if (in_array(strtoupper($filter['operator'][0]), array('IN', 'BETWEEN'))) {
$query->fieldCondition($public_fields[$filter['public_field']]['property'], $public_fields[$filter['public_field']]['column'], $filter['value'], $filter['operator'][0]);
continue;
Expand Down