nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for http authentication mode with IIS

Browse Source
This commit is contained in:
Loïc Chapeaux
2002-04-21 20:47:43 +00:00
parent 150088c53a
commit d2eecef75c
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-04-21 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* libraries/auth/http.auth.lib.php3: tried a fix to allow the use of http
authentication mode with IIS.
2002-04-21 Marc Delisle <lem9@users.sourceforge.net>
* ### 2.2.6 released ###
2002-04-21 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-04-21 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* sql.php3; libraries/functions.js: improved regexp used to find some * sql.php3; libraries/functions.js: improved regexp used to find some
statements in order to "fix" an error reported by statements in order to "fix" an error reported by

23
libraries/auth/http.auth.lib.php3
View File

@@ -88,6 +88,7 @@ h1 {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo
global $PHP_AUTH_USER, $PHP_AUTH_PW; global $PHP_AUTH_USER, $PHP_AUTH_PW;
global $HTTP_SERVER_VARS, $HTTP_ENV_VARS; global $HTTP_SERVER_VARS, $HTTP_ENV_VARS;
global $REMOTE_USER, $AUTH_USER, $REMOTE_PASSWORD, $AUTH_PASSWORD; global $REMOTE_USER, $AUTH_USER, $REMOTE_PASSWORD, $AUTH_PASSWORD;
global $HTTP_AUTHORIZATION;
global $old_usr; global $old_usr;
// Grabs the $PHP_AUTH_USER variable whatever are the values of the // Grabs the $PHP_AUTH_USER variable whatever are the values of the
@@ -162,6 +163,28 @@ h1 {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo
$PHP_AUTH_PW = getenv('AUTH_PASSWORD'); $PHP_AUTH_PW = getenv('AUTH_PASSWORD');
} }
} }
// Gets authenticated user settings with IIS
if (empty($PHP_AUTH_USER) && empty($PHP_AUTH_PW)
&& function_exists('base64_decode')) {
if (!empty($HTTP_AUTHORIZATION)
&& ereg('^Basic ', $HTTP_AUTHORIZATION)) {
list($PHP_AUTH_USER, $PHP_AUTH_PW) = explode(':', base64_decode(substr($HTTP_AUTHORIZATION, 6)));
}
else if (!empty($_ENV)
&& isset($_ENV['HTTP_AUTHORIZATION'])
&& ereg('^Basic ', $_ENV['HTTP_AUTHORIZATION'])) {
list($PHP_AUTH_USER, $PHP_AUTH_PW) = explode(':', base64_decode(substr($_ENV['HTTP_AUTHORIZATION'], 6)));
}
else if (!empty($HTTP_ENV_VARS)
&& isset($HTTP_ENV_VARS['HTTP_AUTHORIZATION'])
&& ereg('^Basic ', $HTTP_ENV_VARS['HTTP_AUTHORIZATION'])) {
list($PHP_AUTH_USER, $PHP_AUTH_PW) = explode(':', base64_decode(substr($HTTP_ENV_VARS['HTTP_AUTHORIZATION'], 6)));
}
else if (@getenv('HTTP_AUTHORIZATION')
&& ereg('^Basic ', getenv('HTTP_AUTHORIZATION'))) {
list($PHP_AUTH_USER, $PHP_AUTH_PW) = explode(':', base64_decode(substr(getenv('HTTP_AUTHORIZATION'), 6)));
}
} // end IIS
// User logged out -> ensure the new username is not the same // User logged out -> ensure the new username is not the same
if (!empty($old_usr) if (!empty($old_usr)