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

Merge branch '2.4' into develop

pull/9700/head
Alexandre Dulaunoy 2024-04-22 09:51:10 +02:00
parent 68c68febda 536bbb9d92
commit 2b3a0d73ed
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Plugin/OidcAuth/Lib/Oidc.php
View File

@ -443,12 +443,13 @@ class Oidc
}
/**
* @param array $roles Role list provided by OIDC
* @param array|string $roles Role list provided by OIDC
* @param string $mispUsername
* @return int|null Role ID or null if no role matches
*/
private function getUserRole(array $roles, $mispUsername)
private function getUserRole($roles, $mispUsername)
{
$roles = is_string($roles) ? explode($this->getConfig('roles_delimiter', ','), $roles) : $roles;
$this->log($mispUsername, 'Provided roles: ' . implode(', ', $roles));
$roleMapper = $this->getConfig('role_mapper');
if (!is_array($roleMapper)) {