EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
order field access check
Yuri Kuznetsov8008741e35a4
diff --git a/application/Espo/Core/Select/Order/Applier.php b/application/Espo/Core/Select/Order/Applier.phpindex 70d258fc82..f8844f1cd2 100644--- a/application/Espo/Core/Select/Order/Applier.php+++ b/application/Espo/Core/Select/Order/Applier.php@@ -29,8 +29,11 @@namespace Espo\Core\Select\Order;+use Espo\Core\Acl;+use Espo\Core\AclManager;use Espo\Core\Exceptions\BadRequest;use Espo\Core\ORM\Type\FieldType;+use Espo\Entities\User;use Espo\ORM\Name\Attribute;use Espo\ORM\Query\Part\OrderList;use Espo\Core\Exceptions\Forbidden;@@ -47,7 +50,9 @@ class Applierprivate string $entityType,private MetadataProvider $metadataProvider,private ItemConverterFactory $itemConverterFactory,- private OrdererFactory $ordererFactory+ private OrdererFactory $ordererFactory,+ private AclManager $aclManager,+ private User $user,) {}/**@@ -80,6 +85,13 @@ class Applierif ($this->metadataProvider->getFieldType($this->entityType, $orderBy) === FieldType::PASSWORD) {throw new Forbidden("Order by field '$orderBy' is not allowed.");}++ if (+ $params->applyPermissionCheck() &&+ !$this->aclManager->checkField($this->user, $this->entityType, $orderBy)+ ) {+ throw new Forbidden("Not access to order by field '$orderBy'.");+ }}if ($orderBy === null) {diff --git a/application/Espo/Core/Select/Order/Params.php b/application/Espo/Core/Select/Order/Params.phpindex 24a5a02741..a4d1fe7eb5 100644--- a/application/Espo/Core/Select/Order/Params.php+++ b/application/Espo/Core/Select/Order/Params.php@@ -40,12 +40,11 @@ use InvalidArgumentException;*/class Params{- //private bool $forbidComplexExpressions = false;private bool $forceDefault = false;- /** @var mixed */- private $orderBy = null;+ private mixed $orderBy = null;/** @var SearchParams::ORDER_ASC|SearchParams::ORDER_DESC|null */private $order = null;+ private bool $applyPermissionCheck = false;private function __construct() {}@@ -54,16 +53,17 @@ class Params* forceDefault?: bool,* orderBy?: ?string,* order?: SearchParams::ORDER_ASC|SearchParams::ORDER_DESC|null,+ * applyPermissionCheck?: bool,* } $params*/public static function fromAssoc(array $params): self{$object = new self();- //$object->forbidComplexExpressions = $params['forbidComplexExpressions'] ?? false;$object->forceDefault = $params['forceDefault'] ?? false;$object->orderBy = $params['orderBy'] ?? null;$object->order = $params['order'] ?? null;+ $object->applyPermissionCheck = $params['applyPermissionCheck'] ?? false;foreach ($params as $key => $value) {if (!property_exists($object, $key)) {@@ -89,11 +89,6 @@ class Paramsreturn $object;}- /*public function forbidComplexExpressions(): bool- {- return $this->forbidComplexExpressions;- }*/-/*** Force default order.*/@@ -120,4 +115,12 @@ class Params{return $this->order;}++ /**+ * Apply permission check.+ */+ public function applyPermissionCheck(): bool+ {+ return $this->applyPermissionCheck;+ }}diff --git a/application/Espo/Core/Select/SelectBuilder.php b/application/Espo/Core/Select/SelectBuilder.phpindex cd9c73ad6a..527071d984 100644--- a/application/Espo/Core/Select/SelectBuilder.php+++ b/application/Espo/Core/Select/SelectBuilder.php@@ -453,9 +453,9 @@ class SelectBuilder($this->searchParams->getOrderBy() || $this->searchParams->getOrder())) {$params = OrderParams::fromAssoc([- //'forbidComplexExpressions' => $this->applyComplexExpressionsForbidden,'orderBy' => $this->searchParams->getOrderBy(),'order' => $this->searchParams->getOrder(),+ 'applyPermissionCheck' => $this->applyWherePermissionCheck,]);$this->createOrderApplier()diff --git a/tests/unit/Espo/Core/Select/Applier/Appliers/OrderApplierTest.php b/tests/unit/Espo/Core/Select/Applier/Appliers/OrderApplierTest.phpindex 348fccdc39..1c8261dfd8 100644--- a/tests/unit/Espo/Core/Select/Applier/Appliers/OrderApplierTest.php+++ b/tests/unit/Espo/Core/Select/Applier/Appliers/OrderApplierTest.php@@ -29,7 +29,9 @@namespace tests\unit\Espo\Core\Select\Applier\Appliers;+use Espo\Core\AclManager;use Espo\Core\Exceptions\BadRequest;+use Espo\Entities\User;use Espo\ORM\Query\Part\OrderList;use Espo\ORM\Query\Part\Order;use Espo\Core\Select\Order\Applier as OrderApplier;@@ -56,13 +58,18 @@ class OrderApplierTest extends TestCase$this->queryBuilder = $this->createMock(QueryBuilder::class);$this->params = $this->createMock(OrderParams::class);+ $aclManager = $this->createMock(AclManager::class);+ $user = $this->createMock(User::class);+$this->entityType = 'Test';$this->applier = new OrderApplier($this->entityType,$this->metadataProvider,$this->itemConverterFactory,- $this->ordererFactory+ $this->ordererFactory,+ $aclManager,+ $user,);}diff --git a/tests/unit/Espo/Core/Select/SelectBuilderTest.php b/tests/unit/Espo/Core/Select/SelectBuilderTest.phpindex c7e94f3696..8718d3a6f9 100644--- a/tests/unit/Espo/Core/Select/SelectBuilderTest.php+++ b/tests/unit/Espo/Core/Select/SelectBuilderTest.php@@ -206,9 +206,9 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase);$orderParams = OrderParams::fromAssoc([- //'forbidComplexExpressions' => true,'orderBy' => $searchParams->getOrderBy(),'order' => $searchParams->getOrder(),+ 'applyPermissionCheck' => true,]);$this->orderApplier