Merge branch 'feature/use-_env-variables-with-built-in-php-webserver-10488'
resolves #10488
This commit is contained in:
commit
720e022bea
|
@ -138,9 +138,8 @@ abstract class ApplicationBootstrap
|
|||
$this->setupAutoloader();
|
||||
|
||||
if ($configDir === null) {
|
||||
if (array_key_exists('ICINGAWEB_CONFIGDIR', $_SERVER)) {
|
||||
$configDir = $_SERVER['ICINGAWEB_CONFIGDIR'];
|
||||
} else {
|
||||
$configDir = getenv('ICINGAWEB_CONFIGDIR');
|
||||
if ($configDir === false) {
|
||||
$configDir = Platform::isWindows()
|
||||
? $baseDir . '/config'
|
||||
: '/etc/icingaweb2';
|
||||
|
|
|
@ -58,8 +58,8 @@ class ExternalBackend implements UserBackendInterface
|
|||
*/
|
||||
public function authenticate(User $user, $password = null)
|
||||
{
|
||||
if (isset($_SERVER['REMOTE_USER'])) {
|
||||
$username = $_SERVER['REMOTE_USER'];
|
||||
$username = getenv('REMOTE_USER');
|
||||
if ($username !== false) {
|
||||
$user->setExternalUserInformation($username, 'REMOTE_USER');
|
||||
|
||||
if ($this->stripUsernameRegexp) {
|
||||
|
|
|
@ -269,11 +269,11 @@ class AdminAccountPage extends Form
|
|||
*/
|
||||
protected function getUsername()
|
||||
{
|
||||
if (false === isset($_SERVER['REMOTE_USER'])) {
|
||||
$name = getenv('REMOTE_USER');
|
||||
if ($name === false) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$name = $_SERVER['REMOTE_USER'];
|
||||
if (isset($this->backendConfig['strip_username_regexp']) && $this->backendConfig['strip_username_regexp']) {
|
||||
// No need to silence or log anything here because the pattern has
|
||||
// already been successfully compiled during backend configuration
|
||||
|
|
|
@ -30,7 +30,7 @@ class AuthenticationPage extends Form
|
|||
*/
|
||||
public function createElements(array $formData)
|
||||
{
|
||||
if (isset($formData['type']) && $formData['type'] === 'external' && !isset($_SERVER['REMOTE_USER'])) {
|
||||
if (isset($formData['type']) && $formData['type'] === 'external' && getenv('REMOTE_USER') === false) {
|
||||
$this->info(
|
||||
$this->translate(
|
||||
'You\'re currently not authenticated using any of the web server\'s authentication '
|
||||
|
|
Loading…
Reference in New Issue