NB-Public/user_saml
14
0
Fork 0
mirror of https://github.com/netzbegruenung/user_saml.git synced 2024-04-27 23:04:53 +02:00
Code Issues Projects Releases Wiki Activity

we only allow multiple user back ends in combination with SAML, not with environment variables

Browse source 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Björn Schiessle 2018-08-13 16:36:02 +02:00
parent 1eccb28948
commit b6b576852a
No known key found for this signature in database
GPG key ID: 2378A753E2BF04F6
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/Settings/Admin.php
View file

@ -88,11 +88,6 @@ class Admin implements ISettings {
'lowercaseUrlencoding' => $this->l10n->t('ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses uppercase. Enable for ADFS compatibility on signature verification.'),
];
$generalSettings = [
'idp0_display_name' => [
'text' => $this->l10n->t('Optional display name of the identity provider (default: "SSO & SAML log in")'),
'type' => 'line',
'required' => false,
],
'uid_mapping' => [
'text' => $this->l10n->t('Attribute to map the UID to.'),
'type' => 'line',
@ -102,13 +97,7 @@ class Admin implements ISettings {
'text' => $this->l10n->t('Only allow authentication if an account exists on some other backend. (e.g. LDAP)'),
'type' => 'checkbox',
'global' => true,
],
'allow_multiple_user_back_ends' => [
'text' => $this->l10n->t('Allow the use of multiple user back-ends (e.g. LDAP)'),
'type' => 'checkbox',
'hideForEnv' => true,
'global' => true,
],
]
];
$attributeMappingSettings = [
'displayName_mapping' => [
@ -140,6 +129,17 @@ class Admin implements ISettings {
'type' => 'checkbox',
'global' => true,
];
$generalSettings['idp0_display_name'] = [
'text' => $this->l10n->t('Optional display name of the identity provider (default: "SSO & SAML log in")'),
'type' => 'line',
'required' => false,
];
$generalSettings['allow_multiple_user_back_ends'] = [
'text' => $this->l10n->t('Allow the use of multiple user back-ends (e.g. LDAP)'),
'type' => 'checkbox',
'hideForEnv' => true,
'global' => true,
];
}
$params = [

2
tests/unit/Settings/AdminTest.php
View file

@ -169,6 +169,8 @@ class AdminTest extends \Test\TestCase {
$params = $this->formDataProvider();
unset($params['general']['use_saml_auth_for_desktop']);
unset($params['general']['idp0_display_name']);
unset($params['general']['allow_multiple_user_back_ends']);
$params['type'] = '';
$expected = new TemplateResponse('user_saml', 'admin', $params);