Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-06 16:36:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [MOD] Merge v3.1 changes

Browse Source 
* [ADD] Use custom ldap attributes for users or groups
* [ADD] Use custom ldap filter for users or groups lookup
* [MOD] Improved internal config handling by using an array instead of class properties

Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2020-06-28 19:38:06 +02:00
parent 563b275b23
commit d310a10ba0
26 changed files with 911 additions and 1071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/modules/web/Controllers/ConfigManagerController.php
View File

@@ -43,6 +43,8 @@ use SP\Modules\Web\Controllers\Helpers\TabsHelper;
use SP\Mvc\View\Components\DataTab;
use SP\Mvc\View\Components\SelectItemAdapter;
use SP\Plugin\PluginManager;
use SP\Providers\Auth\Ldap\LdapMsAds;
use SP\Providers\Auth\Ldap\LdapStd;
use SP\Providers\Auth\Ldap\LdapTypeInterface;
use SP\Providers\Log\LogInterface;
use SP\Providers\Mail\MailHandler;
@@ -231,9 +233,14 @@ final class ConfigManagerController extends ControllerBase
$template->setBase('config');
$template->addTemplate('ldap');
$template->assign('ldapIsAvailable', $this->extensionChecker->checkIsAvailable('ldap'));
$template->assign('userGroups', SelectItemAdapter::factory(UserGroupService::getItemsBasic())->getItemsFromModel());
$template->assign('userProfiles', SelectItemAdapter::factory(UserProfileService::getItemsBasic())->getItemsFromModel());
$template->assign('ldapIsAvailable',
$this->extensionChecker->checkIsAvailable('ldap'));
$template->assign('userGroups',
SelectItemAdapter::factory(UserGroupService::getItemsBasic())
->getItemsFromModel());
$template->assign('userProfiles',
SelectItemAdapter::factory(UserProfileService::getItemsBasic())
->getItemsFromModel());
$serverTypes = [
LdapTypeInterface::LDAP_STD => 'Standard',
@@ -241,7 +248,29 @@ final class ConfigManagerController extends ControllerBase
LdapTypeInterface::LDAP_AZURE => 'Azure Active Directory',
];
$template->assign('serverTypes', SelectItemAdapter::factory($serverTypes)->getItemsFromArraySelected([$this->configData->getLdapType()]));
$template->assign('serverTypes',
SelectItemAdapter::factory($serverTypes)
->getItemsFromArraySelected([$this->configData->getLdapType()]));
$userAttributes = array_merge(
LdapStd::DEFAULT_FILTER_USER_ATTRIBUTES,
LdapMsAds::DEFAULT_FILTER_USER_ATTRIBUTES,
$this->configData->getLdapFilterUserAttributes()
);
$template->assign('userAttributes',
SelectItemAdapter::factory($userAttributes)
->getItemsFromArraySelected($this->configData->getLdapFilterUserAttributes()));
$groupAttributes = array_merge(
LdapStd::DEFAULT_FILTER_GROUP_ATTRIBUTES,
LdapMsAds::DEFAULT_FILTER_GROUP_ATTRIBUTES,
$this->configData->getLdapFilterGroupAttributes()
);
$template->assign('groupAttributes',
SelectItemAdapter::factory($groupAttributes)
->getItemsFromArraySelected($this->configData->getLdapFilterGroupAttributes()));
return new DataTab(__('LDAP'), $template);
}