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

Replace ExternalBackend::getRemoteUserEnvvars() with an attribute

Browse Source 
refs #12164
This commit is contained in:
Alexander A. Klimov 2016-11-04 17:27:36 +01:00
parent f8501aa80d
commit d9330486e9
3 changed files with 9 additions and 12 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 (ExternalBackend::getRemoteUserEnvvars() as $envvar) { foreach (ExternalBackend::$remoteUserEnvvars as $envvar) {
if (ExternalBackend::getRemoteUser($envvar) !== null) { if (ExternalBackend::getRemoteUser($envvar) !== null) {
break; break;
} }

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

@ -11,6 +11,13 @@ use Icinga\User;
*/ */
class ExternalBackend implements UserBackendInterface class ExternalBackend implements UserBackendInterface
{ {
/**
* Possible variables where to read the user from
*
* @var string[]
*/
public static $remoteUserEnvvars = array('REDIRECT_REMOTE_USER', 'REMOTE_USER');
/** /**
* The name of this backend * The name of this backend
* *
@ -83,16 +90,6 @@ 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}
*/ */

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

@ -33,7 +33,7 @@ class AuthenticationPage extends Form
{ {
if (isset($formData['type']) && $formData['type'] === 'external') { if (isset($formData['type']) && $formData['type'] === 'external') {
$hasRemoteUser = false; $hasRemoteUser = false;
foreach (ExternalBackend::getRemoteUserEnvvars() as $envvar) { foreach (ExternalBackend::$remoteUserEnvvars as $envvar) {
if (ExternalBackend::getRemoteUser($envvar) !== null) { if (ExternalBackend::getRemoteUser($envvar) !== null) {
$hasRemoteUser = true; $hasRemoteUser = true;
break; break;