mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-26 11:48:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Moved all user info updating logic into SAMLUserFactory"

Browse source 
This reverts commit 960ee342e4.
This commit is contained in:
Jan Böhmer 2023-02-24 00:12:44 +01:00
parent 960ee342e4
commit 99f04d71af
8 changed files with 88 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

88
src/Security/SamlUserFactory.php
View file

@ -21,29 +21,13 @@
namespace App\Security;
use App\Entity\UserSystem\User;
use Doctrine\ORM\EntityManagerInterface;
use Hslavich\OneloginSamlBundle\Event\AbstractUserEvent;
use Hslavich\OneloginSamlBundle\Event\UserCreatedEvent;
use Hslavich\OneloginSamlBundle\Event\UserModifiedEvent;
use Hslavich\OneloginSamlBundle\Security\Http\Authenticator\Token\SamlToken;
use Hslavich\OneloginSamlBundle\Security\User\SamlUserFactoryInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Security\Core\User\UserInterface;
class SamlUserFactory implements SamlUserFactoryInterface, EventSubscriberInterface
class SamlUserFactory implements SamlUserFactoryInterface
{
public const SAML_PASSWORD_PLACEHOLDER = '!!SAML!!';
private Security $security;
private EntityManagerInterface $entityManager;
public function __construct(Security $security, EntityManagerInterface $entityManager)
{
$this->entityManager = $entityManager;
$this->security = $security;
}
public function createUser($username, array $attributes = []): UserInterface
{
$user = new User();
@ -53,76 +37,8 @@ class SamlUserFactory implements SamlUserFactoryInterface, EventSubscriberInterf
//This is a SAML user now!
$user->setSamlUser(true);
$this->updateUserInfoFromSAMLAttributes($user, $attributes);
$user->setSamlAttributes($attributes);
return $user;
}
public function updateAndPersistUser(AbstractUserEvent $event): void
{
$user = $event->getUser();
$token = $this->security->getToken();
if (!$user instanceof User) {
throw new \RuntimeException('User must be an instance of '.User::class);
}
if (!$token instanceof SamlToken) {
throw new \RuntimeException('Token must be an instance of '.SamlToken::class);
}
$attributes = $token->getAttributes();
//Update the user info based on the SAML attributes
$this->updateUserInfoFromSAMLAttributes($user, $attributes);
//Persist the user
$this->entityManager->persist($user);
//Flush the entity manager
$this->entityManager->flush();
}
public static function getSubscribedEvents()
{
return [
UserCreatedEvent::class => 'updateAndPersistUser',
UserModifiedEvent::class => 'updateAndPersistUser',
];
}
/**
* Sets the SAML attributes to the user.
* @param User $user
* @param array $attributes
* @return void
*/
public function updateUserInfoFromSAMLAttributes(User $user, array $attributes): void
{
//When mail attribute exists, set it
if (isset($attributes['email'])) {
$user->setEmail($attributes['email'][0]);
}
//When first name attribute exists, set it
if (isset($attributes['firstName'])) {
$user->setFirstName($attributes['firstName'][0]);
}
//When last name attribute exists, set it
if (isset($attributes['lastName'])) {
$user->setLastName($attributes['lastName'][0]);
}
if (isset($attributes['department'])) {
$user->setDepartment($attributes['department'][0]);
}
//Use X500 attributes as userinfo
if (isset($attributes['urn:oid:2.5.4.42'])) {
$user->setFirstName($attributes['urn:oid:2.5.4.42'][0]);
}
if (isset($attributes['urn:oid:2.5.4.4'])) {
$user->setLastName($attributes['urn:oid:2.5.4.4'][0]);
}
if (isset($attributes['urn:oid:1.2.840.113549.1.9.1'])) {
$user->setEmail($attributes['urn:oid:1.2.840.113549.1.9.1'][0]);
}
}
}