tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify conditions

Browse Source
This commit is contained in:
Johannes Rauh 2025-01-08 10:36:41 +01:00
parent be2501eff2
commit 0a0805c68b
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
library/Icinga/Authentication/AdmissionLoader.php
View File

@ -183,39 +183,38 @@ class AdmissionLoader
$assignedRoles = []; $assignedRoles = [];
$isUnrestricted = false; $isUnrestricted = false;
foreach ($this->roleConfig as $roleName => $roleConfig) { foreach ($this->roleConfig as $roleName => $roleConfig) {
$assigned = $this->match($username, $userGroups, $roleConfig); if ($this->match($username, $userGroups, $roleConfig)) {
if ($assigned) {
$assignedRoles[] = $roleName; $assignedRoles[] = $roleName;
}
if (! isset($roles[$roleName]) && $assigned) { if (! isset($roles[$roleName])) {
foreach ($this->loadRole($roleName, $roleConfig) as $role) { foreach ($this->loadRole($roleName, $roleConfig) as $role) {
/** @var Role $role */ /** @var Role $role */
if (isset($roles[$role->getName()])) { if (isset($roles[$role->getName()])) {
continue; continue;
} }
$roles[$role->getName()] = $role; $roles[$role->getName()] = $role;
$permissions = array_merge( $permissions = array_merge(
$permissions, $permissions,
array_diff($role->getPermissions(), $permissions) array_diff($role->getPermissions(), $permissions)
);
$roleRestrictions = $role->getRestrictions();
foreach ($roleRestrictions as $name => & $restriction) {
$restriction = str_replace(
'$user.local_name$',
$user->getLocalUsername(),
$restriction
); );
$restrictions[$name][] = $restriction;
}
$role->setRestrictions($roleRestrictions); $roleRestrictions = $role->getRestrictions();
foreach ($roleRestrictions as $name => & $restriction) {
$restriction = str_replace(
'$user.local_name$',
$user->getLocalUsername(),
$restriction
);
$restrictions[$name][] = $restriction;
}
if (! $isUnrestricted) { $role->setRestrictions($roleRestrictions);
$isUnrestricted = $role->isUnrestricted();
if (! $isUnrestricted) {
$isUnrestricted = $role->isUnrestricted();
}
} }
} }
} }