mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Updated http-auth to work with nginx http auth #6102 (#6174)

Browse Source
This commit is contained in:
Neil Lathwood
2017-03-12 12:54:59 +00:00
committed by Tony Murray
parent 1d243c40c7
commit e2962adac8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/authenticate.inc.php
View File

@@ -46,6 +46,8 @@ if (isset($_POST['username']) && isset($_POST['password'])) {
$_SESSION['password'] = $_GET['password']; $_SESSION['password'] = $_GET['password'];
} elseif (isset($_SERVER['REMOTE_USER'])) { } elseif (isset($_SERVER['REMOTE_USER'])) {
$_SESSION['username'] = $_SERVER['REMOTE_USER']; $_SESSION['username'] = $_SERVER['REMOTE_USER'];
} elseif (isset($_SERVER['PHP_AUTH_USER'])) {
$_SESSION['username'] = $_SERVER['PHP_AUTH_USER'];
} }
if (!isset($config['auth_mechanism'])) { if (!isset($config['auth_mechanism'])) {

4
html/includes/authentication/http-auth.inc.php
View File

@@ -11,8 +11,8 @@ function authenticate($username, $password)
{ {
global $config; global $config;
if (isset($_SERVER['REMOTE_USER'])) { if (isset($_SERVER['REMOTE_USER']) || isset($_SERVER['PHP_AUTH_USER'])) {
$_SESSION['username'] = mres($_SERVER['REMOTE_USER']); $_SESSION['username'] = mres($_SERVER['REMOTE_USER']) ?: mres($_SERVER['PHP_AUTH_USER']);
$row = @dbFetchRow('SELECT username FROM `users` WHERE `username`=?', array($_SESSION['username'])); $row = @dbFetchRow('SELECT username FROM `users` WHERE `username`=?', array($_SESSION['username']));
if (isset($row['username']) && $row['username'] == $_SESSION['username']) { if (isset($row['username']) && $row['username'] == $_SESSION['username']) {