tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move permission match code from class `User` to `Role`

This commit is contained in:
Johannes Meyer 2021-01-22 15:47:36 +01:00
parent 57b4a31bc3
commit c0541d70e9
2 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
library/Icinga/Authentication/Role.php
View File

@ -106,4 +106,41 @@ class Role
$this->restrictions = $restrictions;
return $this;
}
/**
* Whether this role grants the given permission
*
* @param string $permission
*
* @return bool
*/
public function grants($permission)
{
$requiredWildcard = strpos($permission, '*');
foreach ($this->permissions as $grantedPermission) {
if ($grantedPermission === '*' || $grantedPermission === $permission) {
return true;
}
if ($requiredWildcard !== false) {
if (($grantedWildcard = strpos($grantedPermission, '*')) !== false) {
$wildcard = min($requiredWildcard, $grantedWildcard);
} else {
$wildcard = $requiredWildcard;
}
} else {
$wildcard = strpos($grantedPermission, '*');
}
if ($wildcard !== false && $wildcard > 0) {
if (substr($permission, 0, $wildcard) === substr($grantedPermission, 0, $wildcard)) {
return true;
}
} elseif ($permission === $grantedPermission) {
return true;
}
}
return false;
}
}

23
library/Icinga/User.php
View File

@ -563,27 +563,8 @@ class User
*/
public function can($requiredPermission)
{
if (isset($this->permissions['*']) || isset($this->permissions[$requiredPermission])) {
return true;
}
$requiredWildcard = strpos($requiredPermission, '*');
foreach ($this->permissions as $grantedPermission) {
if ($requiredWildcard !== false) {
if (($grantedWildcard = strpos($grantedPermission, '*')) !== false) {
$wildcard = min($requiredWildcard, $grantedWildcard);
} else {
$wildcard = $requiredWildcard;
}
} else {
$wildcard = strpos($grantedPermission, '*');
}
if ($wildcard !== false && $wildcard > 0) {
if (substr($requiredPermission, 0, $wildcard) === substr($grantedPermission, 0, $wildcard)) {
return true;
}
} elseif ($requiredPermission === $grantedPermission) {
foreach ($this->getRoles() as $role) {
if ($role->grants($requiredPermission)) {
return true;
}
}