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

User: Move `$user:local_name$` handling to class `AdmissionLoader` 

This way it also adjusts the roles directly, and not just their
copies for the user object
This commit is contained in:
Johannes Meyer 2021-02-01 15:19:17 +01:00
parent bdd0f204f0
commit 6eb0139446
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,9 +155,13 @@ class AdmissionLoader
array_diff($role->getPermissions(), $permissions) array_diff($role->getPermissions(), $permissions)
); );
foreach ($role->getRestrictions() as $name => $restriction) { $roleRestrictions = $role->getRestrictions();
foreach ($roleRestrictions as $name => & $restriction) {
$restriction = str_replace('$user:local_name$', $user->getLocalUsername(), $restriction);
$restrictions[$name][] = $restriction; $restrictions[$name][] = $restriction;
} }
$role->setRestrictions($roleRestrictions);
} }
} }
} }

4
library/Icinga/User.php
View File

@ -252,10 +252,6 @@ class User
*/ */
public function setRestrictions(array $restrictions) public function setRestrictions(array $restrictions)
{ {
foreach ($restrictions as $name => $restriction) {
$restrictions[$name] = str_replace('$user:local_name$', $this->getLocalUsername(), $restriction);
}
$this->restrictions = $restrictions; $this->restrictions = $restrictions;
return $this; return $this;
} }