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

setup/AuthenticationPage: don't show the warning about external backend configuration if REDIRECT_REMOTE_USER is set

Browse Source 
refs #12164
This commit is contained in:
Alexander A. Klimov 2016-10-18 15:19:13 +02:00
parent be4a31c8e1
commit d6ac6c8374
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ class ExternalBackendForm extends Form
) )
); );
foreach (array('REDIRECT_REMOTE_USER', 'REMOTE_USER') as $envvar) { foreach (ExternalBackend::getRemoteUserEnvvars() as $envvar) {
if (ExternalBackend::getRemoteUser($envvar) !== null) { if (ExternalBackend::getRemoteUser($envvar) !== null) {
break; break;
} }

9
library/Icinga/Authentication/User/ExternalBackend.php
View File

@ -83,6 +83,15 @@ class ExternalBackend implements UserBackendInterface
return null; return null;
} }
/**
* Get possible variables where to read the user from
*
* @return string[]
*/
public static function getRemoteUserEnvvars()
{
return array('REDIRECT_REMOTE_USER', 'REMOTE_USER');
}
/** /**
* {@inheritdoc} * {@inheritdoc}

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

@ -31,8 +31,15 @@ class AuthenticationPage extends Form
*/ */
public function createElements(array $formData) public function createElements(array $formData)
{ {
if (isset($formData['type']) && $formData['type'] === 'external' if (isset($formData['type']) && $formData['type'] === 'external') {
&& ExternalBackend::getRemoteUser(null) === null) { $hasRemoteUser = false;
foreach (ExternalBackend::getRemoteUserEnvvars() as $envvar) {
if (ExternalBackend::getRemoteUser($envvar) !== null) {
$hasRemoteUser = true;
break;
}
}
if (! $hasRemoteUser) {
$this->info( $this->info(
$this->translate( $this->translate(
'You\'re currently not authenticated using any of the web server\'s authentication ' 'You\'re currently not authenticated using any of the web server\'s authentication '
@ -42,6 +49,7 @@ class AuthenticationPage extends Form
false false
); );
} }
}
$backendTypes = array(); $backendTypes = array();
if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) { if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {