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

ExternalBackend: don't reference more than necessary from the config

Browse Source 
refs #12164
This commit is contained in:
Alexander A. Klimov 2016-10-18 10:17:21 +02:00
parent ce951295d3
commit ab01d2f915
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,13 +11,6 @@ use Icinga\User;
*/ */
class ExternalBackend implements UserBackendInterface class ExternalBackend implements UserBackendInterface
{ {
/**
* The configuration of this backend
*
* @var ConfigObject
*/
protected $config;
/** /**
* The name of this backend * The name of this backend
* *
@ -32,6 +25,13 @@ class ExternalBackend implements UserBackendInterface
*/ */
protected $stripUsernameRegexp; protected $stripUsernameRegexp;
/**
* The name variable where to read the user from
*
* @var string|null
*/
protected $usernameEnvvar;
/** /**
* Create new authentication backend of type "external" * Create new authentication backend of type "external"
* *
@ -39,8 +39,8 @@ class ExternalBackend implements UserBackendInterface
*/ */
public function __construct(ConfigObject $config) public function __construct(ConfigObject $config)
{ {
$this->config = $config;
$this->stripUsernameRegexp = $config->get('strip_username_regexp'); $this->stripUsernameRegexp = $config->get('strip_username_regexp');
$this->usernameEnvvar = $config->get('username_envvar');
} }
/** /**
@ -87,10 +87,9 @@ class ExternalBackend implements UserBackendInterface
*/ */
public function authenticate(User $user, $password = null) public function authenticate(User $user, $password = null)
{ {
$usernameEnvvar = $this->config->username_envvar; $username = static::getRemoteUser($this->usernameEnvvar);
$username = static::getRemoteUser($usernameEnvvar);
if ($username !== null) { if ($username !== null) {
$user->setExternalUserInformation($username, $usernameEnvvar); $user->setExternalUserInformation($username, $this->usernameEnvvar);
if ($this->stripUsernameRegexp) { if ($this->stripUsernameRegexp) {
$stripped = preg_replace($this->stripUsernameRegexp, '', $username); $stripped = preg_replace($this->stripUsernameRegexp, '', $username);