jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

random improvements (#5506)

Browse Source 
* fix order of destroying form elements
* API documentation - fixes #1949
* make command path independent
* use PhpSubprocess to execute migrations
* allow to configure optional SAML attributes
* fix deprecation
* unify wording of exported state - fixes #5392
This commit is contained in:
Kevin Papst
2025-05-28 13:34:01 +02:00
committed by GitHub
parent 81107377f4
commit 0420eb27c7
19 changed files with 150 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Saml/SamlProvider.php
View File

@@ -97,6 +97,9 @@ final class SamlProvider
$field = $mapping['kimai'];
$attribute = $mapping['saml'];
$value = $this->getPropertyValue($token, $attribute);
if ($value === null) {
continue;
}
$setter = 'set' . ucfirst($field);
if (method_exists($user, $setter)) {
$user->$setter($value);
@@ -117,7 +120,7 @@ final class SamlProvider
$user->setAuth(User::AUTH_SAML);
}
private function getPropertyValue(SamlLoginAttributes $token, $attribute): string
private function getPropertyValue(SamlLoginAttributes $token, $attribute): ?string
{
$results = [];
$attributes = $token->getAttributes();
@@ -129,11 +132,16 @@ final class SamlProvider
}
if ($part[0] === '$') {
$key = substr($part, 1);
if (!\array_key_exists($key, $attributes)) {
$optional = false;
if ($key[0] === '$') {
$key = substr($key, 1);
$optional = true;
}
if (!$optional && !\array_key_exists($key, $attributes)) {
throw new \RuntimeException('Missing SAML attribute in response: ' . $key);
}
if (\is_array($attributes[$key]) && isset($attributes[$key][0])) {
if (\array_key_exists($key, $attributes) && \is_array($attributes[$key]) && isset($attributes[$key][0])) {
$results[] = $attributes[$key][0];
}
} else {
@@ -145,6 +153,6 @@ final class SamlProvider
return implode(' ', $results);
}
return $attribute;
return null;
}
}