Skip to content

EspoCRM – Open Source CRM Application

role validation impr

Yuri Kuznetsov5d77aefaa613
diff --git a/application/Espo/Classes/RecordHooks/Role/BeforeSaveValidate.php b/application/Espo/Classes/RecordHooks/Role/BeforeSaveValidate.php
index 179c781ae9..4973b3c060 100644
--- a/application/Espo/Classes/RecordHooks/Role/BeforeSaveValidate.php
+++ b/application/Espo/Classes/RecordHooks/Role/BeforeSaveValidate.php
@@ -100,8 +100,7 @@ class BeforeSaveValidate implements SaveHook
*/
private function validateDataItem(string $scope, Role|PortalRole $entity, bool|stdClass $item): void
{
- $key = $entity instanceof PortalRole ?
- 'aclPortal' : 'acl';
+ $key = $entity instanceof PortalRole ? 'aclPortal' : 'acl';
$type = $this->metadata->get("scopes.$scope.$key");
@@ -133,8 +132,7 @@ class BeforeSaveValidate implements SaveHook
Table::ACTION_STREAM,
];
- $levels = $entity instanceof PortalRole ?
- $this->portalLevelList : $this->levelList;
+ $isPortal = $entity instanceof PortalRole;
foreach ($actions as $action) {
if (!property_exists($item, $action)) {
@@ -143,10 +141,36 @@ class BeforeSaveValidate implements SaveHook
$level = $item->$action;
- if (!in_array($level, $levels)) {
+ $this->checkActionLevel($scope, $action, $level, $isPortal);
+ }
+ }
+
+ /**
+ * @throws BadRequest
+ */
+ private function checkActionLevel(string $scope, string $action, string $level, bool $isPortal): void
+ {
+ if ($action === Table::ACTION_CREATE) {
+ if (!in_array($level, [Table::LEVEL_YES, Table::LEVEL_NO])) {
throw new BadRequest("Level `$level` is not allowed for action *$action* for *$scope*.");
}
+
+ return;
+ }
+
+ $mapKey = $isPortal ? 'aclPortalActionLevelListMap' : 'aclActionLevelListMap';
+ $key = $isPortal ? 'aclPortalLevelList' : 'aclActionList';
+ $defaultLevels = $isPortal ? $this->portalLevelList : $this->levelList;
+
+ $levels = $this->metadata->get("scopes.$scope.$mapKey.$action") ??
+ $this->metadata->get("scopes.$scope.$key") ??
+ $defaultLevels;
+
+ if (in_array($level, $levels)) {
+ return;
}
+
+ throw new BadRequest("Level `$level` is not allowed for action *$action* for *$scope*.");
}
/**