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

AdminAccountPage: Fetch the entire set of users only if necessary 

refs #8704
This commit is contained in:
Johannes Meyer 2015-06-30 09:20:52 +02:00
parent e795665421
commit 3ea9e50c02
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/setup/application/forms/AdminAccountPage.php
View File

@ -5,6 +5,8 @@ namespace Icinga\Module\Setup\Forms;
use Exception;
use Icinga\Authentication\User\UserBackend;
use Icinga\Authentication\User\DbUserBackend;
use Icinga\Authentication\User\LdapUserBackend;
use Icinga\Data\ConfigObject;
use Icinga\Web\Form;
@ -204,7 +206,7 @@ class AdminAccountPage extends Form
return false;
}
if ($data['user_type'] === 'new_user' && array_search($data['new_user'], $this->fetchUsers()) !== false) {
if ($data['user_type'] === 'new_user' && !$this->hasUser($data['new_user'])) {
$this->getElement('new_user')->addError($this->translate('Username already exists.'));
return false;
}
@ -254,21 +256,41 @@ class AdminAccountPage extends Form
}
/**
* Return the names of all users this backend currently provides
* Return the names of all users the backend currently provides
*
* @return array
*/
protected function fetchUsers()
{
$config = new ConfigObject($this->backendConfig);
$config->resource = $this->resourceConfig;
$backend = UserBackend::create(null, $config);
try {
return $backend->select(array('user_name'))->order('user_name', 'asc', true)->fetchColumn();
return $this->createBackend()->select(array('user_name'))->order('user_name', 'asc', true)->fetchColumn();
} catch (Exception $_) {
// No need to handle anything special here. Error means no users found.
return array();
}
}
/**
* Return whether the backend provides a user with the given name
*
* @param string $username
*
* @return bool
*/
protected function hasUser($username)
{
return $this->createBackend()->select()->where('user_name', $username)->count() > 1;
}
/**
* Create and return the backend
*
* @return DbUserBackend|LdapUserBackend
*/
protected function createBackend()
{
$config = new ConfigObject($this->backendConfig);
$config->resource = $this->resourceConfig;
return UserBackend::create(null, $config);
}
}