espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new acl usage

Browse Source
This commit is contained in:
Yuri Kuznetsov
2021-04-17 10:33:26 +03:00
parent dc202f987a
commit ad1dece946
15 changed files with 187 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Acl/Import.php → application/Espo/Classes/Acl/Import/AccessChecker.php
+22 -6
View File
@@ -27,20 +27,36 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace Espo\Acl;
namespace Espo\Classes\Acl\Import;
use Espo\Entities\User as EntityUser;
use Espo\Entities\User;
use Espo\ORM\Entity;
use Espo\Core\{
Acl\Acl,
Acl\ScopeData,
Acl\AccessEntityReadChecker,
Acl\AccessEntityDeleteChecker,
};
class Import extends Acl
class AccessChecker implements AccessEntityReadChecker, AccessEntityDeleteChecker
{
public function checkEntityRead(EntityUser $user, Entity $entity, ScopeData $data): bool
public function check(User $user, ScopeData $data): bool
{
return $data->isTrue();
}
public function checkRead(User $user, ScopeData $data): bool
{
return $data->isTrue();
}
public function checkDelete(User $user, ScopeData $data): bool
{
return $data->isTrue();
}
public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
{
if ($user->isAdmin()) {
return true;
@@ -53,7 +69,7 @@ class Import extends Acl
return false;
}
public function checkEntityDelete(EntityUser $user, Entity $entity, ScopeData $data): bool
public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
{
if ($user->isAdmin()) {
return true;
application/Espo/Acl/Note.php → application/Espo/Classes/Acl/Note/AccessChecker.php
+53 -33
View File
@@ -27,62 +27,82 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace Espo\Acl;
namespace Espo\Classes\Acl\Note;
use Espo\Entities\User as EntityUser;
use Espo\Entities\User;
use Espo\ORM\Entity;
use Espo\Core\{
Acl\Acl,
Acl\ScopeData,
Acl\Table,
Acl\DefaultAccessChecker,
Acl\AccessEntityCREDChecker,
Acl\Traits\DefaultAccessCheckerDependency,
AclManager,
ORM\EntityManager,
Utils\Config,
};
use Exception;
use DateTime;
use Exception;
class Note extends Acl
class AccessChecker implements AccessEntityCREDChecker
{
protected $deleteThresholdPeriod = '1 month';
use DefaultAccessCheckerDependency;
protected $editThresholdPeriod = '7 days';
private const EDIT_PERIOD = '7 days';
public function checkIsOwner(EntityUser $user, Entity $entity)
private const DELETE_PERIOD = '1 month';
private $defaultAccessChecker;
private $aclManager;
private $entityManager;
private $config;
public function __construct(
DefaultAccessChecker $defaultAccessChecker,
AclManager $aclManager,
EntityManager $entityManager,
Config $config
) {
$this->defaultAccessChecker = $defaultAccessChecker;
$this->aclManager = $aclManager;
$this->entityManager = $entityManager;
$this->config = $config;
}
public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
{
if ($entity->get('type') === 'Post' && $user->id === $entity->get('createdById')) {
$parentId = $entity->get('parentId');
$parentType = $entity->get('parentType');
if (!$parentId || !$parentType) {
return true;
}
$parent = $this->entityManager->getEntity($parentType, $parentId);
if ($parent && $this->aclManager->checkEntityStream($user, $parent)) {
return true;
}
return false;
}
public function checkEntityCreate(EntityUser $user, Entity $entity, ScopeData $data): bool
{
if (!$entity->get('parentId') || !$entity->get('parentType')) {
return true;
}
$parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
if ($parent && $this->aclManager->checkEntity($user, $parent, 'stream')) {
return true;
}
return false;
}
public function checkEntityEdit(EntityUser $user, Entity $entity, ScopeData $data): bool
public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
{
if ($user->isAdmin()) {
return true;
}
if (!$this->checkEntity($user, $entity, $data, Table::ACTION_EDIT)) {
if (!$this->defaultAccessChecker->checkEntityEdit($user, $entity, $data)) {
return false;
}
if (!$this->checkIsOwner($user, $entity)) {
if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
return true;
}
@@ -93,7 +113,7 @@ class Note extends Acl
}
$noteEditThresholdPeriod =
'-' . $this->config->get('noteEditThresholdPeriod', $this->editThresholdPeriod);
'-' . $this->config->get('noteEditThresholdPeriod', self::EDIT_PERIOD);
$dt = new DateTime();
@@ -111,17 +131,17 @@ class Note extends Acl
return true;
}
public function checkEntityDelete(EntityUser $user, Entity $entity, ScopeData $data): bool
public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
{
if ($user->isAdmin()) {
return true;
}
if (!$this->checkEntity($user, $entity, $data, Table::ACTION_DELETE)) {
if (!$this->defaultAccessChecker->checkEntityDelete($user, $entity, $data)) {
return false;
}
if (!$this->checkIsOwner($user, $entity)) {
if (!$this->aclManager->checkOwnershipOwn($user, $entity)) {
return true;
}
@@ -132,7 +152,7 @@ class Note extends Acl
}
$deleteThresholdPeriod =
'-' . $this->config->get('noteDeleteThresholdPeriod', $this->deleteThresholdPeriod);
'-' . $this->config->get('noteDeleteThresholdPeriod', self::DELETE_PERIOD);
$dt = new DateTime();
application/Espo/Classes/Acl/Note/OwnershipChecker.php
+50
View File
@@ -0,0 +1,50 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM - Open Source CRM application.
* Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
* Website: https://www.espocrm.com
*
* EspoCRM is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* EspoCRM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
*
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace Espo\Classes\Acl\Note;
use Espo\Entities\User;
use Espo\ORM\Entity;
use Espo\Core\{
Acl\OwnershipOwnChecker,
};
class OwnershipChecker implements OwnershipOwnChecker
{
public function checkOwn(User $user, Entity $entity): bool
{
if ($entity->get('type') === 'Post' && $user->getId() === $entity->get('createdById')) {
return true;
}
return false;
}
}
application/Espo/Acl/Notification.php → application/Espo/Classes/Acl/Notification/OwnershipChecker.php
+7 -5
View File
@@ -27,17 +27,19 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace Espo\Acl;
namespace Espo\Classes\Acl\Notification;
use Espo\Entities\User as EntityUser;
use Espo\Entities\User;
use Espo\ORM\Entity;
use Espo\Core\Acl\Acl;
use Espo\Core\{
Acl\OwnershipOwnChecker,
};
class Notification extends Acl
class OwnershipChecker implements OwnershipOwnChecker
{
public function checkIsOwner(EntityUser $user, Entity $entity)
public function checkOwn(User $user, Entity $entity): bool
{
if ($user->getId() === $entity->get('userId')) {
return true;
application/Espo/Acl/ScheduledJob.php → application/Espo/Classes/Acl/ScheduledJob/AccessChecker.php
+27 -17
View File
@@ -27,53 +27,63 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace Espo\Acl;
namespace Espo\Classes\Acl\ScheduledJob;
use Espo\Entities\User as EntityUser;
use Espo\Entities\User;
use Espo\ORM\Entity;
use Espo\Core\{
Acl\Acl,
Acl\ScopeData,
Acl\Table,
Acl\DefaultAccessChecker,
Acl\AccessEntityCREDChecker,
Acl\Traits\DefaultAccessCheckerDependency,
};
class ScheduledJob extends Acl
class AccessChecker implements AccessEntityCREDChecker
{
public function checkEntityRead(EntityUser $user, Entity $entity, ScopeData $data): bool
{
if ($entity->get('isInternal')) {
return false;
}
use DefaultAccessCheckerDependency;
return $this->checkEntity($user, $entity, $data, Table::ACTION_READ);
private $defaultAccessChecker;
public function __construct(DefaultAccessChecker $defaultAccessChecker)
{
$this->defaultAccessChecker = $defaultAccessChecker;
}
public function checkEntityEdit(EntityUser $user, Entity $entity, ScopeData $data): bool
public function checkEntityCreate(User $user, Entity $entity, ScopeData $data): bool
{
if ($entity->get('isInternal')) {
return false;
}
return $this->checkEntity($user, $entity, $data, Table::ACTION_EDIT);
return $this->defaultAccessChecker->checkEntityCreate($user, $entity, $data);
}
public function checkEntityDelete(EntityUser $user, Entity $entity, ScopeData $data): bool
public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
{
if ($entity->get('isInternal')) {
return false;
}
return $this->checkEntity($user, $entity, $data, Table::ACTION_DELETE);
return $this->defaultAccessChecker->checkEntityRead($user, $entity, $data);
}
public function checkEntityCreate(EntityUser $user, Entity $entity, ScopeData $data): bool
public function checkEntityEdit(User $user, Entity $entity, ScopeData $data): bool
{
if ($entity->get('isInternal')) {
return false;
}
return $this->checkEntity($user, $entity, $data, Table::ACTION_CREATE);
return $this->defaultAccessChecker->checkEntityEdit($user, $entity, $data);
}
public function checkEntityDelete(User $user, Entity $entity, ScopeData $data): bool
{
if ($entity->get('isInternal')) {
return false;
}
return $this->defaultAccessChecker->checkEntityDelete($user, $entity, $data);
}
}
application/Espo/Acl/Team.php → application/Espo/Classes/Acl/Team/OwnershipChecker.php
+8 -6
View File
@@ -27,17 +27,19 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace Espo\Acl;
namespace Espo\Classes\Acl\Team;
use Espo\Entities\User;
use Espo\ORM\Entity;
use Espo\Entities\User as UserEntity;
use Espo\Core\{
Acl\OwnershipOwnChecker,
};
use Espo\Core\Acl\Acl;
class Team extends Acl
class OwnershipChecker implements OwnershipOwnChecker
{
public function checkInTeam(UserEntity $user, Entity $entity)
public function checkOwn(User $user, Entity $entity): bool
{
$userTeamIdList = $user->getLinkMultipleIdList('teams');
application/Espo/Resources/metadata/aclDefs/ActionHistoryRecord.json
+1 -1
View File
@@ -1,3 +1,3 @@
{
"ownershipCheckerClassName": "Espo\\Classes\\Acl\\ActionHistoryRecord\\OwnershipChecker"
}
}
application/Espo/Resources/metadata/aclDefs/Attachment.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"accessCheckerClassName": "Espo\\Classes\\Acl\\Attachment\\AccessChecker",
"ownershipCheckerClassName": "Espo\\Classes\\Acl\\Attachment\\OwnershipChecker"
}
}
application/Espo/Resources/metadata/aclDefs/Email.json
+1 -1
View File
@@ -2,4 +2,4 @@
"accessCheckerClassName": "Espo\\Classes\\Acl\\Email\\AccessChecker",
"ownershipCheckerClassName": "Espo\\Classes\\Acl\\Email\\OwnershipChecker",
"readOwnerUserField": "users"
}
}
application/Espo/Resources/metadata/aclDefs/EmailFilter.json
+1 -1
View File
@@ -1,3 +1,3 @@
{
"ownershipCheckerClassName": "Espo\\Classes\\Acl\\EmailFilter\\OwnershipChecker"
}
}
application/Espo/Resources/metadata/aclDefs/Import.json
+3
View File
@@ -0,0 +1,3 @@
{
"accessCheckerClassName": "Espo\\Classes\\Acl\\Import\\AccessChecker"
}
application/Espo/Resources/metadata/aclDefs/Note.json
+4
View File
@@ -0,0 +1,4 @@
{
"accessCheckerClassName": "Espo\\Classes\\Acl\\Note\\AccessChecker",
"ownershipCheckerClassName": "Espo\\Classes\\Acl\\Note\\OwnershipChecker"
}
application/Espo/Resources/metadata/aclDefs/Notification.json
+3
View File
@@ -0,0 +1,3 @@
{
"ownershipCheckerClassName": "Espo\\Classes\\Acl\\Notification\\OwnershipChecker"
}
application/Espo/Resources/metadata/aclDefs/ScheduledJob.json
+3
View File
@@ -0,0 +1,3 @@
{
"accessCheckerClassName": "Espo\\Classes\\Acl\\ScheduledJob\\AccessChecker"
}
application/Espo/Resources/metadata/aclDefs/Team.json
+3
View File
@@ -0,0 +1,3 @@
{
"ownershipCheckerClassName": "Espo\\Classes\\Acl\\Team\\OwnershipChecker"
}