tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-26 07:14:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Call extended backend health checks when creating ldap authentication backends

Browse Source 
fixes #6457
This commit is contained in:
Matthias Jentsch 2014-06-11 15:04:19 +02:00
parent 6c82cb8988
commit c42c7977be
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/forms/Config/Authentication/LdapBackendForm.php
View File

@ -179,9 +179,12 @@ class LdapBackendForm extends BaseBackendForm
$backendConfig->user_class, $backendConfig->user_class,
$backendConfig->user_name_attribute $backendConfig->user_name_attribute
); );
$testConn->assertAuthenticationPossible();
/*
if ($testConn->count() === 0) { if ($testConn->count() === 0) {
throw new Exception('No Users Found On Directory Server'); throw new Exception('No Users Found On Directory Server');
} }
*/
} catch (Exception $exc) { } catch (Exception $exc) {
$this->addErrorMessage( $this->addErrorMessage(
t('Connection Validation Failed: ' . $exc->getMessage()) t('Connection Validation Failed: ' . $exc->getMessage())

6
library/Icinga/Authentication/Backend/LdapUserBackend.php
View File

@ -87,15 +87,15 @@ class LdapUserBackend extends UserBackend
* *
* @throws AuthenticationException When authentication is not possible * @throws AuthenticationException When authentication is not possible
*/ */
protected function assertAuthenticationPossible() public function assertAuthenticationPossible()
{ {
$q = $this->conn->select()->from($this->userClass); $q = $this->conn->select()->from($this->userClass);
$result = $q->fetchRow(); $result = $q->fetchRow();
if (!isset($result)) { if (!isset($result)) {
throw new AuthenticationException( throw new AuthenticationException(
sprintf('No users with objectClass="%s" in DN="%s" available', sprintf('No objects with objectClass="%s" in DN="%s" found.',
$this->userClass, $this->userClass,
$this->userNameAttribute $this->conn->getDN()
)); ));
} }