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

Next major version 2 with PHP 8.1, Symfony 6, Tabler UI, 2FA ... (#2902)

Browse Source
This commit is contained in:
Kevin Papst
2022-12-31 21:19:55 +01:00
committed by GitHub
parent 95e06746bd
commit 90a0fd8a22
2164 changed files with 83700 additions and 86426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/Ldap/LdapUserProvider.php
View File

@@ -12,61 +12,49 @@ namespace App\Ldap;
use App\Entity\User;
use Psr\Log\LoggerInterface;
use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
use Symfony\Component\Security\Core\Exception\UserNotFoundException;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Security\Core\User\UserProviderInterface;
/**
* Overwritten to be able to deactivate LDAP via config switch.
*
* Inspired by https://github.com/Maks3w/FR3DLdapBundle @ MIT License
*
* @final
*/
class LdapUserProvider implements UserProviderInterface
final class LdapUserProvider implements UserProviderInterface
{
private $ldapManager;
private $logger;
public function __construct(LdapManager $ldapManager, LoggerInterface $logger = null)
public function __construct(private LdapManager $ldapManager, private ?LoggerInterface $logger = null)
{
$this->ldapManager = $ldapManager;
$this->logger = $logger;
}
public function loadUserByUsername($username)
public function loadUserByIdentifier(string $identifier): UserInterface
{
$user = $this->ldapManager->findUserByUsername($username);
$user = $this->ldapManager->findUserByUsername($identifier);
if (empty($user)) {
$this->logInfo('User {username} {result} on LDAP', [
'action' => 'loadUserByUsername',
'username' => $username,
$this->logDebug('User {username} {result} on LDAP', [
'action' => 'loadUserByIdentifier',
'username' => $identifier,
'result' => 'not found',
]);
$ex = new UsernameNotFoundException(sprintf('User "%s" not found', $username));
$ex->setUsername($username);
$ex = new UserNotFoundException(sprintf('User "%s" not found', $identifier));
$ex->setUserIdentifier($identifier);
throw $ex;
}
$this->logInfo('User {username} {result} on LDAP', [
'action' => 'loadUserByUsername',
'username' => $username,
$this->logDebug('User {username} {result} on LDAP', [
'action' => 'loadUserByIdentifier',
'username' => $identifier,
'result' => 'found',
]);
return $user;
}
public function refreshUser(UserInterface $user)
public function refreshUser(UserInterface $user): UserInterface
{
if (!($user instanceof User) || !$this->supportsClass(\get_class($user))) {
if (!($user instanceof User)) {
throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', \get_class($user)));
}
if (!$user->isLdapUser() && null === $user->getPreferenceValue('ldap.dn')) {
throw new UnsupportedUserException(sprintf('Account "%s" is not a registered LDAP user.', $user->getUsername()));
throw new UnsupportedUserException(sprintf('Account "%s" is not a registered LDAP user.', $user->getUserIdentifier()));
}
try {
@@ -77,26 +65,23 @@ class LdapUserProvider implements UserProviderInterface
$user->setAuth(User::AUTH_LDAP);
}
} catch (LdapDriverException $ex) {
throw new UnsupportedUserException(sprintf('Failed to refresh user "%s", probably DN is expired.', $user->getUsername()));
throw new UnsupportedUserException(sprintf('Failed to refresh user "%s", probably DN is expired.', $user->getUserIdentifier()));
}
return $user;
}
public function supportsClass($class)
public function supportsClass($class): bool
{
return $class === User::class;
}
/**
* Log a message into the logger if this exists.
*/
private function logInfo(string $message, array $context = []): void
private function logDebug(string $message, array $context = []): void
{
if (!$this->logger) {
if ($this->logger === null) {
return;
}
$this->logger->info($message, $context);
$this->logger->debug($message, $context);
}
}