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

ExternalBackendForm: Remove option to configure where to fetch a remote user 

refs #12164
This commit is contained in:
Johannes Meyer 2016-11-16 12:06:58 +01:00
parent 3a816ce0f7
commit 2c817215cb
3 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
application/forms/Config/UserBackend/ExternalBackendForm.php
View File

@ -3,7 +3,6 @@
namespace Icinga\Forms\Config\UserBackend;
use Icinga\Authentication\User\ExternalBackend;
use Zend_Validate_Callback;
use Icinga\Web\Form;
@ -56,31 +55,6 @@ class ExternalBackendForm extends Form
'validators' => array($callbackValidator)
)
);
$hasRemoteUser = false;
foreach (ExternalBackend::$remoteUserEnvvars as $envvar) {
if (ExternalBackend::getRemoteUser($envvar) !== null) {
$hasRemoteUser = true;
break;
}
}
if (! $hasRemoteUser) {
$envvar = 'REMOTE_USER';
}
$this->addElement(
'text',
'username_envvar',
array(
'label' => $this->translate('Username Environment Variable'),
'description' => $this->translate(
'The environment variable the webserver assigns the authenticated user\'s name to.'
),
'required' => true,
'value' => $envvar
)
);
$this->addElement(
'hidden',
'backend',

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

@ -270,7 +270,7 @@ class AdminAccountPage extends Form
*/
protected function getUsername()
{
$name = ExternalBackend::getRemoteUser($this->backendConfig['username_envvar']);
list($name, $_) = ExternalBackend::getRemoteUserInformation();
if ($name === null) {
return '';
}

10
modules/setup/application/forms/AuthenticationPage.php
View File

@ -32,14 +32,8 @@ class AuthenticationPage extends Form
public function createElements(array $formData)
{
if (isset($formData['type']) && $formData['type'] === 'external') {
$hasRemoteUser = false;
foreach (ExternalBackend::$remoteUserEnvvars as $envvar) {
if (ExternalBackend::getRemoteUser($envvar) !== null) {
$hasRemoteUser = true;
break;
}
}
if (! $hasRemoteUser) {
list($username, $_) = ExternalBackend::getRemoteUserInformation();
if ($username === null) {
$this->info(
$this->translate(
'You\'re currently not authenticated using any of the web server\'s authentication '