MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #7138 from JakubOnderka/oidc-role-fix 

fix: [OIDC] Change algo how roles are assigned to users
pull/7071/merge
Jakub Onderka 2021-03-03 13:58:47 +01:00 committed by GitHub
parent 2e4c01035d 6a553d39da
commit 6487a079d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php
View File

@ -72,9 +72,9 @@ class OidcAuthenticate extends BaseAuthenticate
}
if ($user['role_id'] != $roleId) {
$user['role_id'] = $roleId;
$this->userModel()->updateField($user, 'role_id', $roleId);
$this->log($mispUsername, "User role changed from {$user['role_id']} to $roleId.");
$user['role_id'] = $roleId;
}
$this->log($mispUsername, 'Logged in.');
@ -182,20 +182,18 @@ class OidcAuthenticate extends BaseAuthenticate
]);
$roleNameToId = array_change_key_case($roleNameToId); // normalize role names to lowercase
$userRole = null;
foreach ($roles as $role) {
if (isset($roleMapper[$role])) {
$roleId = $roleMapper[$role];
if (!is_numeric($roleId)) {
$roleId = mb_strtolower($roleId);
if (isset($roleNameToId[$roleId])) {
$roleId = $roleNameToId[$roleId];
foreach ($roleMapper as $oidcRole => $mispRole) {
if (in_array($oidcRole, $roles, true)) {
if (!is_numeric($mispRole)) {
$mispRole = mb_strtolower($mispRole);
if (isset($roleNameToId[$mispRole])) {
$mispRole = $roleNameToId[$mispRole];
} else {
$this->log($mispUsername, "MISP Role with name `$roleId` not found, skipping.");
$this->log($mispUsername, "MISP Role with name `$mispRole` not found, skipping.");
continue;
}
}
return $roleId; // first match wins
return $mispRole; // first match wins
}
}