mirror of
https://github.com/SuiteCRM/SuiteCRM-Core.git
synced 2025-09-01 08:00:47 +08:00
Add check for saml on Login Listener
- Add Auth Type config mapper
This commit is contained in:
parent
05f5a40bc3
commit
0911a1a7ee
3 changed files with 60 additions and 2 deletions
|
@ -28,6 +28,7 @@
|
|||
namespace App\Security;
|
||||
|
||||
use App\Authentication\LegacyHandler\Authentication;
|
||||
use App\SystemConfig\LegacyHandler\SystemConfigHandler;
|
||||
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
||||
use Symfony\Component\Security\Core\Exception\CustomUserMessageAuthenticationException;
|
||||
use Symfony\Component\Security\Http\Event\LoginSuccessEvent;
|
||||
|
@ -39,10 +40,12 @@ class LoginSuccessEventListener implements EventSubscriberInterface
|
|||
* @var Authentication
|
||||
*/
|
||||
private $authentication;
|
||||
protected SystemConfigHandler $config;
|
||||
|
||||
public function __construct(Authentication $authentication)
|
||||
public function __construct(Authentication $authentication, SystemConfigHandler $config)
|
||||
{
|
||||
$this->authentication = $authentication;
|
||||
$this->config = $config;
|
||||
}
|
||||
|
||||
public static function getSubscribedEvents(): array
|
||||
|
@ -60,7 +63,9 @@ class LoginSuccessEventListener implements EventSubscriberInterface
|
|||
|
||||
$user = $event->getUser();
|
||||
|
||||
if (!$user->isTotpAuthenticationEnabled()) {
|
||||
$authType = $this->config->getSystemConfig('auth_type')->getValue();
|
||||
|
||||
if (!$user->isTotpAuthenticationEnabled() || $authType === 'saml') {
|
||||
$result = $this->authentication->initLegacyUserSession($user->getUsername());
|
||||
|
||||
if ($result === false) {
|
||||
|
|
|
@ -0,0 +1,52 @@
|
|||
<?php
|
||||
/**
|
||||
* SuiteCRM is a customer relationship management program developed by SalesAgility Ltd.
|
||||
* Copyright (C) 2024 SalesAgility Ltd.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Affero General Public License version 3 as published by the
|
||||
* Free Software Foundation with the addition of the following permission added
|
||||
* to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
|
||||
* IN WHICH THE COPYRIGHT IS OWNED BY SALESAGILITY, SALESAGILITY DISCLAIMS THE
|
||||
* WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
* FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
|
||||
* details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* In accordance with Section 7(b) of the GNU Affero General Public License
|
||||
* version 3, these Appropriate Legal Notices must retain the display of the
|
||||
* "Supercharged by SuiteCRM" logo. If the display of the logos is not reasonably
|
||||
* feasible for technical reasons, the Appropriate Legal Notices must display
|
||||
* the words "Supercharged by SuiteCRM".
|
||||
*/
|
||||
|
||||
namespace App\SystemConfig\LegacyHandler;
|
||||
|
||||
use App\SystemConfig\Entity\SystemConfig;
|
||||
|
||||
class AuthTypeConfigMapper implements SystemConfigMapperInterface {
|
||||
|
||||
public function getKey(): string
|
||||
{
|
||||
return 'auth_type';
|
||||
}
|
||||
|
||||
public function map(SystemConfig $systemConfig): void
|
||||
{
|
||||
$env = $_ENV ?? [];
|
||||
|
||||
$authType = 'native';
|
||||
|
||||
if (!empty($env['AUTH_TYPE']) ?? '') {
|
||||
$systemConfig->setValue($env['AUTH_TYPE']);
|
||||
return;
|
||||
}
|
||||
|
||||
$systemConfig->setValue($authType);
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue