Up to 20230404a

[packages/dokuwiki.git] / dokuwiki-http_auth-option.patch

- https://github.com/dokuwiki/dokuwiki/pull/15

--- dokuwiki-2020-07-29a/conf/dokuwiki.php~	2022-09-03 19:58:24.000000000 +0300
+++ dokuwiki-2020-07-29a/conf/dokuwiki.php	2023-03-27 11:25:04.212540600 +0300
@@ -63,6 +63,7 @@
 $conf['rememberme'] = 1;                 //Enable/disable remember me on login
 $conf['disableactions'] = '';            //comma separated list of actions to disable
 $conf['auth_security_timeout'] = 900;    //time (seconds) auth data is considered valid, set to 0 to recheck on every page view
+$conf['http_auth'] = 1;                  //allows HTTP authorization (SSO) from PHP_AUTH_USER/PHP_AUTH_PW variables
 $conf['securecookie'] = 1;               //never send HTTPS cookies via HTTP
 $conf['remote']      = 0;                //Enable/disable remote interfaces
 $conf['remoteuser']  = '!!not set!!';    //user/groups that have access to remote interface (comma separated). leave empty to allow all users
--- dokuwiki-2023-04-04/inc/auth.php~	2023-04-04 19:21:21.000000000 +0300
+++ dokuwiki-2023-04-04/inc/auth.php	2023-04-05 15:43:33.873377532 +0300
@@ -75,7 +75,7 @@
     }
 
     // if no credentials were given try to use HTTP auth (for SSO)
-    if (!$INPUT->str('u') && empty($_COOKIE[DOKU_COOKIE]) && !empty($INPUT->server->str('PHP_AUTH_USER'))) {
+    if ($conf['http_auth'] && !$INPUT->str('u') && empty($_COOKIE[DOKU_COOKIE]) && !empty($INPUT->server->str('PHP_AUTH_USER'))) {
         $INPUT->set('u', $INPUT->server->str('PHP_AUTH_USER'));
         $INPUT->set('p', $INPUT->server->str('PHP_AUTH_PW'));
         $INPUT->set('http_credentials', true);