Skip to content

[FIX] OIDC: Handle object-shaped role claims in role assignment #12009

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

Open
mjansenDatabay wants to merge 1 commit into
base: release_10
Choose a base branch
from
Open

[FIX] OIDC: Handle object-shaped role claims in role assignment #12009

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 56 additions & 20 deletions components/ILIAS/OpenIdConnect/classes/class.ilOpenIdConnectUserSync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,26 +314,8 @@ protected function parseRoleAssignments(): array
continue;
}

if (is_array($this->user_info->{$role_attribute})) {
$roles_claim = array_map(
static function (mixed $value): string {
return match (true) {
is_string($value) => trim($value),
$value instanceof stdClass && property_exists($value, 'id') => trim((string) $value->id),
$value instanceof stdClass && property_exists($value, 'value') => trim((string) $value->value),
default => throw new DomainException(sprintf(
'Unexpected role value type, please check your provider configuration: %s',
print_r($value, true)
)),
};
},
$this->user_info->{$role_attribute}
);
if (!in_array($role_value, $roles_claim, true)) {
$this->logger->debug('User account has no ' . $role_value);
continue;
}
} elseif (strcmp(trim((string) $this->user_info->{$role_attribute}), $role_value) !== 0) {
$roles_claim = $this->extractRoleClaimValues($this->user_info->{$role_attribute});
if (!in_array($role_value, $roles_claim, true)) {
$this->logger->debug('User account has no ' . $role_value);
continue;
}
Expand Down Expand Up @@ -372,6 +354,60 @@ static function (mixed $value): string {
return $roles_assignable;
}

/**
* @return list<string>
*/
private function extractRoleClaimValues(mixed $claim): array
{
if (is_string($claim)) {
return [trim($claim)];
}

if ($claim instanceof stdClass) {
if (property_exists($claim, 'id') && is_scalar($claim->id)) {
return [trim((string) $claim->id)];
}
if (property_exists($claim, 'value') && is_scalar($claim->value)) {
return [trim((string) $claim->value)];
}

$claim = get_object_vars($claim);
}

if (!is_array($claim)) {
throw new DomainException(sprintf(
'Unexpected role value type, please check your provider configuration: %s',
print_r($claim, true)
));
}

if ($claim === []) {
return [];
}

if (!array_is_list($claim)) {
return array_map(
static fn(int|string $role): string => trim((string) $role),
array_keys($claim)
);
}

return array_map(
static function (mixed $value): string {
return match (true) {
is_string($value) => trim($value),
$value instanceof stdClass && property_exists($value, 'id') => trim((string) $value->id),
$value instanceof stdClass && property_exists($value, 'value') => trim((string) $value->value),
default => throw new DomainException(sprintf(
'Unexpected role value type, please check your provider configuration: %s',
print_r($value, true)
)),
};
},
$claim
);
}

private function valueFrom(string $connect_name): string
{
if (!$connect_name) {
Expand Down
Loading