tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LdapBackendForm: move discovery from createElements() to isValidPartial() 

refs #2997
This commit is contained in:
Alexander A. Klimov 2017-10-06 16:16:12 +02:00
parent 9bc64d931e
commit 5ef8be2031
2 changed files with 57 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
application/forms/Config/UserBackend/LdapBackendForm.php
View File

@ -87,7 +87,6 @@ class LdapBackendForm extends Form
)
);
$hasAdOid = false;
if (! $isAd && !empty($this->resources)) {
$this->addElement(
'button',
@ -108,35 +107,6 @@ class LdapBackendForm extends Form
'formnovalidate' => 'formnovalidate'
)
);
if ($this->getElement('discovery_btn')->isChecked()) {
$connection = ResourceFactory::create(
isset($formData['resource']) ? $formData['resource'] : reset($this->resources)
);
try {
$capabilities = $connection->bind()->getCapabilities();
$baseDn = $capabilities->getDefaultNamingContext();
$hasAdOid = $capabilities->isActiveDirectory();
} catch (Exception $e) {
$this->warning(sprintf(
$this->translate('Failed to discover the chosen LDAP connection: %s'),
$e->getMessage()
));
}
}
}
if ($isAd || $hasAdOid) {
// ActiveDirectory defaults
$userClass = 'user';
$filter = '!(objectClass=computer)';
$userNameAttribute = 'sAMAccountName';
} else {
// OpenLDAP defaults
$userClass = 'inetOrgPerson';
$filter = null;
$userNameAttribute = 'uid';
}
$this->addElement(
@ -149,7 +119,7 @@ class LdapBackendForm extends Form
'disabled' => $isAd ?: null,
'label' => $this->translate('LDAP User Object Class'),
'description' => $this->translate('The object class used for storing users on the LDAP server.'),
'value' => $this->getSuggestion('user_class', $userClass)
'value' => $this->getSuggestion('user_class')
)
);
$this->addElement(
@ -158,7 +128,7 @@ class LdapBackendForm extends Form
array(
'preserveDefault' => true,
'allowEmpty' => true,
'value' => $this->getSuggestion('filter', $filter),
'value' => $this->getSuggestion('filter'),
'label' => $this->translate('LDAP Filter'),
'description' => $this->translate(
'An additional filter to use when looking up users using the specified connection. '
@ -201,7 +171,7 @@ class LdapBackendForm extends Form
'description' => $this->translate(
'The attribute name used for storing the user name on the LDAP server.'
),
'value' => $this->getSuggestion('user_name_attribute', $userNameAttribute)
'value' => $this->getSuggestion('user_name_attribute')
)
);
$this->addElement(
@ -223,7 +193,7 @@ class LdapBackendForm extends Form
'The path where users can be found on the LDAP server. Leave ' .
'empty to select all users available using the specified connection.'
),
'value' => isset($baseDn) ? $baseDn : $this->getSuggestion('base_dn')
'value' => $this->getSuggestion('base_dn')
)
);
@ -271,6 +241,58 @@ class LdapBackendForm extends Form
}
}
public function isValidPartial(array $formData)
{
$isAd = isset($formData['type']) && $formData['type'] === 'msldap';
$baseDn = null;
$hasAdOid = false;
$discoverySuccessful = false;
if (! $isAd && ! empty($this->resources) && isset($formData['discovery_btn'])
&& $formData['discovery_btn'] === 'discovery_btn') {
$connection = ResourceFactory::create(
isset($formData['resource']) ? $formData['resource'] : reset($this->resources)
);
$discoverySuccessful = true;
try {
$capabilities = $connection->bind()->getCapabilities();
$baseDn = $capabilities->getDefaultNamingContext();
$hasAdOid = $capabilities->isActiveDirectory();
} catch (Exception $e) {
$this->warning(sprintf(
$this->translate('Failed to discover the chosen LDAP connection: %s'),
$e->getMessage()
));
$discoverySuccessful = false;
}
}
if ($discoverySuccessful) {
if ($isAd || $hasAdOid) {
// ActiveDirectory defaults
$userClass = 'user';
$filter = '!(objectClass=computer)';
$userNameAttribute = 'sAMAccountName';
} else {
// OpenLDAP defaults
$userClass = 'inetOrgPerson';
$filter = null;
$userNameAttribute = 'uid';
}
$formData['user_class'] = $userClass;
$formData['filter'] = $filter;
$formData['user_name_attribute'] = $userNameAttribute;
if ($baseDn !== null) {
$formData['base_dn'] = $baseDn;
}
}
return parent::isValidPartial($formData);
}
/**
* Discover the domain the LDAP server is responsible for and fill it in the form
*

2
modules/setup/application/forms/AuthBackendPage.php
View File

@ -212,7 +212,7 @@ class AuthBackendPage extends Form
}
$this->info($this->translate('The configuration has been successfully validated.'));
} elseif (isset($formData['btn_discover_domain'])) {
} elseif (isset($formData['discovery_btn']) || isset($formData['btn_discover_domain'])) {
return parent::isValidPartial($formData);
} elseif (! isset($formData['backend_validation'])) {
// This is usually done by isValid(Partial), but as we're not calling any of these...