Merge pull request #7433 from owncloud/config_basic_auth
Config to disable basic_auth username checking
This commit is contained in:
commit
eff7667d26
|
@ -178,6 +178,9 @@ $CONFIG = array(
|
|||
/* Enable or disable the logging of IP addresses in case of webform auth failures */
|
||||
"log_authfailip" => false,
|
||||
|
||||
/* Whether http-basic username must equal username to login */
|
||||
"basic_auth" => true,
|
||||
|
||||
/*
|
||||
* Configure the size in bytes log rotation should happen, 0 or false disables the rotation.
|
||||
* This rotates the current owncloud logfile to a new name, this way the total log usage
|
||||
|
|
|
@ -554,7 +554,8 @@ class OC {
|
|||
OC_User::useBackend(new OC_User_Database());
|
||||
OC_Group::useBackend(new OC_Group_Database());
|
||||
|
||||
if (isset($_SERVER['PHP_AUTH_USER']) && self::$session->exists('loginname')
|
||||
$basic_auth = OC_Config::getValue('basic_auth', true);
|
||||
if ($basic_auth && isset($_SERVER['PHP_AUTH_USER']) && self::$session->exists('loginname')
|
||||
&& $_SERVER['PHP_AUTH_USER'] !== self::$session->get('loginname')) {
|
||||
$sessionUser = self::$session->get('loginname');
|
||||
$serverUser = $_SERVER['PHP_AUTH_USER'];
|
||||
|
|
Loading…
Reference in New Issue