mirror of https://github.com/MISP/MISP
Merge pull request #9695 from christianmg99/allow-oidc-roles-string
chg: [config] Allow Oidc roles as stringpull/9701/head
commit
536bbb9d92
|
@ -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
|
* @param string $mispUsername
|
||||||
* @return int|null Role ID or null if no role matches
|
* @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));
|
$this->log($mispUsername, 'Provided roles: ' . implode(', ', $roles));
|
||||||
$roleMapper = $this->getConfig('role_mapper');
|
$roleMapper = $this->getConfig('role_mapper');
|
||||||
if (!is_array($roleMapper)) {
|
if (!is_array($roleMapper)) {
|
||||||
|
|
Loading…
Reference in New Issue