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

use saml config interface instead of generic system configuration (#3551)

Browse Source
This commit is contained in:
Kevin Papst
2022-09-23 13:29:46 +02:00
committed by GitHub
parent b38fc96623
commit bfab6f42d0
8 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Controller/Auth/SamlController.php
View File

@@ -9,7 +9,7 @@
namespace App\Controller\Auth;
use App\Configuration\SystemConfiguration;
use App\Configuration\SamlConfigurationInterface;
use App\Saml\SamlAuthFactory;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
@@ -23,12 +23,12 @@ use Symfony\Component\Security\Core\Security;
final class SamlController extends AbstractController
{
private $authFactory;
private $systemConfiguration;
private $samlConfiguration;
public function __construct(SamlAuthFactory $authFactory, SystemConfiguration $systemConfiguration)
public function __construct(SamlAuthFactory $authFactory, SamlConfigurationInterface $samlConfiguration)
{
$this->authFactory = $authFactory;
$this->systemConfiguration = $systemConfiguration;
$this->samlConfiguration = $samlConfiguration;
}
/**
@@ -36,7 +36,7 @@ final class SamlController extends AbstractController
*/
public function loginAction(Request $request)
{
if (!$this->systemConfiguration->isSamlActive()) {
if (!$this->samlConfiguration->isActivated()) {
throw $this->createNotFoundException('SAML deactivated');
}
@@ -67,7 +67,7 @@ final class SamlController extends AbstractController
*/
public function metadataAction()
{
if (!$this->systemConfiguration->isSamlActive()) {
if (!$this->samlConfiguration->isActivated()) {
throw $this->createNotFoundException('SAML deactivated');
}
@@ -84,7 +84,7 @@ final class SamlController extends AbstractController
*/
public function assertionConsumerServiceAction()
{
if (!$this->systemConfiguration->isSamlActive()) {
if (!$this->samlConfiguration->isActivated()) {
throw $this->createNotFoundException('SAML deactivated');
}
@@ -96,7 +96,7 @@ final class SamlController extends AbstractController
*/
public function logoutAction()
{
if (!$this->systemConfiguration->isSamlActive()) {
if (!$this->samlConfiguration->isActivated()) {
throw $this->createNotFoundException('SAML deactivated');
}

6
src/Controller/Security/SecurityController.php
View File

@@ -9,6 +9,7 @@
namespace App\Controller\Security;
use App\Configuration\SamlConfigurationInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -21,10 +22,12 @@ use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
final class SecurityController extends AbstractController
{
private $tokenManager;
private $samlConfiguration;
public function __construct(CsrfTokenManagerInterface $tokenManager)
public function __construct(CsrfTokenManagerInterface $tokenManager, SamlConfigurationInterface $samlConfiguration)
{
$this->tokenManager = $tokenManager;
$this->samlConfiguration = $samlConfiguration;
}
/**
@@ -67,6 +70,7 @@ final class SecurityController extends AbstractController
'last_username' => $lastUsername,
'error' => $error,
'csrf_token' => $csrfToken,
'saml_config' => $this->samlConfiguration,
]);
}

6
src/Saml/Provider/SamlProvider.php
View File

@@ -9,7 +9,7 @@
namespace App\Saml\Provider;
use App\Configuration\SystemConfiguration;
use App\Configuration\SamlConfigurationInterface;
use App\Entity\User;
use App\Repository\UserRepository;
use App\Saml\SamlTokenFactory;
@@ -29,7 +29,7 @@ final class SamlProvider implements AuthenticationProviderInterface
private $repository;
private $configuration;
public function __construct(UserRepository $repository, UserProviderInterface $userProvider, SamlTokenFactory $tokenFactory, SamlUserFactory $userFactory, SystemConfiguration $configuration)
public function __construct(UserRepository $repository, UserProviderInterface $userProvider, SamlTokenFactory $tokenFactory, SamlUserFactory $userFactory, SamlConfigurationInterface $configuration)
{
$this->repository = $repository;
$this->userProvider = $userProvider;
@@ -74,7 +74,7 @@ final class SamlProvider implements AuthenticationProviderInterface
public function supports(TokenInterface $token)
{
if (!$this->configuration->isSamlActive()) {
if (!$this->configuration->isActivated()) {
return false;
}