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

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

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

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

@ -29,6 +29,13 @@ class LdapBackendForm extends Form
*/
protected $suggestions = array();
/**
* Cache for {@link getLdapCapabilities()}
*
* @var LdapCapabilities
*/
protected $ldapCapabilities;
/**
* Initialize this form
*/
@ -235,10 +242,6 @@ class LdapBackendForm extends Form
'formnovalidate' => 'formnovalidate'
)
);
if ($this->getElement('btn_discover_domain')->isChecked() && isset($formData['resource'])) {
$this->populateDomain(ResourceFactory::create($formData['resource']));
}
}
public function isValidPartial(array $formData)
@ -250,13 +253,9 @@ class LdapBackendForm extends Form
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();
$capabilities = $this->getLdapCapabilities($formData);
$baseDn = $capabilities->getDefaultNamingContext();
$hasAdOid = $capabilities->isActiveDirectory();
} catch (Exception $e) {
@ -290,35 +289,45 @@ class LdapBackendForm extends Form
}
}
if (isset($formData['btn_discover_domain']) && $formData['btn_discover_domain'] === 'discovery_btn') {
try {
$formData['domain'] = $this->discoverDomain($formData);
} catch (LdapException $e) {
$this->error($e->getMessage());
}
}
return parent::isValidPartial($formData);
}
/**
* Discover the domain the LDAP server is responsible for and fill it in the form
* Get the LDAP capabilities of either the resource specified by the user or the default one
*
* @param LdapConnection $connection
* @param string[] $formData
*
* @return LdapCapabilities
*/
public function populateDomain(LdapConnection $connection)
protected function getLdapCapabilities(array $formData)
{
try {
$domain = $this->discoverDomain($connection);
} catch (LdapException $e) {
$this->_elements['btn_discover_domain']->addError($e->getMessage());
if ($this->ldapCapabilities === null) {
$this->ldapCapabilities = ResourceFactory::create(
isset($formData['resource']) ? $formData['resource'] : reset($this->resources)
)->bind()->getCapabilities();
}
$this->_elements['domain']->setValue($domain);
return $this->ldapCapabilities;
}
/**
* Discover the domain the LDAP server is responsible for
*
* @param LdapConnection $connection
* @param string[] $formData
*
* @return string
*/
protected function discoverDomain(LdapConnection $connection)
protected function discoverDomain(array $formData)
{
$cap = LdapCapabilities::discoverCapabilities($connection);
$cap = $this->getLdapCapabilities($formData);
if ($cap->isActiveDirectory()) {
$netBiosName = $cap->getNetBiosName();