Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log user roles #5311

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Log user roles #5311

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70e322c
Log assigned roles
jrauh01 Jan 8, 2025
49d4cda
Fix import order
jrauh01 Jan 8, 2025
a26617d
Fix array indentation
jrauh01 Jan 8, 2025
be2501e
Format docs
jrauh01 Jan 8, 2025
0a0805c
Simplify conditions
jrauh01 Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 62 additions & 57 deletions library/Icinga/Authentication/AdmissionLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
use Generator;
use Icinga\Application\Config;
use Icinga\Application\Logger;
use Icinga\Data\ConfigObject;
use Icinga\Exception\ConfigurationError;
use Icinga\Exception\NotReadableError;
use Icinga\Data\ConfigObject;
use Icinga\User;
use Icinga\Util\StringHelper;

Expand All @@ -18,32 +18,32 @@
class AdmissionLoader
{
const LEGACY_PERMISSIONS = [
'admin' => 'application/announcements',
'application/stacktraces' => 'user/application/stacktraces',
'application/share/navigation' => 'user/share/navigation',
'admin' => 'application/announcements',
'application/stacktraces' => 'user/application/stacktraces',
'application/share/navigation' => 'user/share/navigation',
// Migrating config/application/* would include config/modules, so that's skipped
//'config/application/*' => 'config/*',
'config/application/general' => 'config/general',
'config/application/resources' => 'config/resources',
'config/application/navigation' => 'config/navigation',
'config/application/userbackend' => 'config/access-control/users',
'config/application/usergroupbackend' => 'config/access-control/groups',
'config/authentication/*' => 'config/access-control/*',
'config/authentication/users/*' => 'config/access-control/users',
'config/authentication/users/show' => 'config/access-control/users',
'config/authentication/users/add' => 'config/access-control/users',
'config/authentication/users/edit' => 'config/access-control/users',
'config/authentication/users/remove' => 'config/access-control/users',
'config/authentication/groups/*' => 'config/access-control/groups',
'config/authentication/groups/show' => 'config/access-control/groups',
'config/authentication/groups/edit' => 'config/access-control/groups',
'config/authentication/groups/add' => 'config/access-control/groups',
'config/authentication/groups/remove' => 'config/access-control/groups',
'config/authentication/roles/*' => 'config/access-control/roles',
'config/authentication/roles/show' => 'config/access-control/roles',
'config/authentication/roles/add' => 'config/access-control/roles',
'config/authentication/roles/edit' => 'config/access-control/roles',
'config/authentication/roles/remove' => 'config/access-control/roles'
'config/application/general' => 'config/general',
'config/application/resources' => 'config/resources',
'config/application/navigation' => 'config/navigation',
'config/application/userbackend' => 'config/access-control/users',
'config/application/usergroupbackend' => 'config/access-control/groups',
'config/authentication/*' => 'config/access-control/*',
'config/authentication/users/*' => 'config/access-control/users',
'config/authentication/users/show' => 'config/access-control/users',
'config/authentication/users/add' => 'config/access-control/users',
'config/authentication/users/edit' => 'config/access-control/users',
'config/authentication/users/remove' => 'config/access-control/users',
'config/authentication/groups/*' => 'config/access-control/groups',
'config/authentication/groups/show' => 'config/access-control/groups',
'config/authentication/groups/edit' => 'config/access-control/groups',
'config/authentication/groups/add' => 'config/access-control/groups',
'config/authentication/groups/remove' => 'config/access-control/groups',
'config/authentication/roles/*' => 'config/access-control/roles',
'config/authentication/roles/show' => 'config/access-control/roles',
'config/authentication/roles/add' => 'config/access-control/roles',
'config/authentication/roles/edit' => 'config/access-control/roles',
'config/authentication/roles/remove' => 'config/access-control/roles'
];

/** @var Role[] */
Expand All @@ -64,9 +64,9 @@ public function __construct()
/**
* Whether the user or groups are a member of the role
*
* @param string $username
* @param array $userGroups
* @param ConfigObject $section
* @param string $username
* @param array $userGroups
* @param ConfigObject $section
*
* @return bool
*/
Expand Down Expand Up @@ -101,7 +101,7 @@ protected function match($username, $userGroups, ConfigObject $section)
*
* This will also resolve any parent-child relationships.
*
* @param string $name
* @param string $name
* @param ConfigObject $section
*
* @return Generator
Expand Down Expand Up @@ -166,7 +166,7 @@ protected function loadRole($name, ConfigObject $section)
/**
* Apply permissions, restrictions and roles to the given user
*
* @param User $user
* @param User $user
*/
public function applyRoles(User $user)
{
Expand All @@ -183,44 +183,49 @@ public function applyRoles(User $user)
$assignedRoles = [];
$isUnrestricted = false;
foreach ($this->roleConfig as $roleName => $roleConfig) {
$assigned = $this->match($username, $userGroups, $roleConfig);
if ($assigned) {
if ($this->match($username, $userGroups, $roleConfig)) {
$assignedRoles[] = $roleName;
}

if (! isset($roles[$roleName]) && $assigned) {
foreach ($this->loadRole($roleName, $roleConfig) as $role) {
/** @var Role $role */
if (isset($roles[$role->getName()])) {
continue;
}

$roles[$role->getName()] = $role;
if (! isset($roles[$roleName])) {
foreach ($this->loadRole($roleName, $roleConfig) as $role) {
/** @var Role $role */
if (isset($roles[$role->getName()])) {
continue;
}

$permissions = array_merge(
$permissions,
array_diff($role->getPermissions(), $permissions)
);
$roles[$role->getName()] = $role;

$roleRestrictions = $role->getRestrictions();
foreach ($roleRestrictions as $name => & $restriction) {
$restriction = str_replace(
'$user.local_name$',
$user->getLocalUsername(),
$restriction
$permissions = array_merge(
$permissions,
array_diff($role->getPermissions(), $permissions)
);
$restrictions[$name][] = $restriction;
}

$role->setRestrictions($roleRestrictions);

if (! $isUnrestricted) {
$isUnrestricted = $role->isUnrestricted();
$roleRestrictions = $role->getRestrictions();
foreach ($roleRestrictions as $name => & $restriction) {
$restriction = str_replace(
'$user.local_name$',
$user->getLocalUsername(),
$restriction
);
$restrictions[$name][] = $restriction;
}

$role->setRestrictions($roleRestrictions);

if (! $isUnrestricted) {
$isUnrestricted = $role->isUnrestricted();
}
}
}
}
}

Logger::debug(
'Groups assigned for user "%s": %s',
$user->getUsername(),
join(', ', $assignedRoles)
);

$user->setAdditional('assigned_roles', $assignedRoles);

$user->setIsUnrestricted($isUnrestricted);
Expand Down
Loading