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

Support FastGCI in http auth (patch #1192219)

Browse Source
This commit is contained in:
Michal Čihař
2005-07-10 18:03:19 +00:00
parent 678a4a1c77
commit ff0fe8ebaf
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-07-10 Michal Čihař <michal@cihar.com>
* libraries/auth/http.auth.lib.php: Support FastGCI in http auth (patch
#1192219)
2005-07-10 Marc Delisle <lem9@users.sourceforge.net> 2005-07-10 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_tbl.lib.php: bug #1235473 display_tbl.lib.php, * libraries/display_tbl.lib.php: bug #1235473 display_tbl.lib.php,
Undefined variable order_img Undefined variable order_img
@@ -34,7 +38,7 @@ $Source$
instructions, thanks to Isaac Bennetch - ibennetch instructions, thanks to Isaac Bennetch - ibennetch
2005-06-30 Marc Delisle <lem9@users.sourceforge.net> 2005-06-30 Marc Delisle <lem9@users.sourceforge.net>
* lang/hungarian update, thanks to Mih<EFBFBD>ly M<EFBFBD>sz<EFBFBD>ros <necronix@freemail.hu> * lang/hungarian update, thanks to Mihály Mészáros <necronix@freemail.hu>
* lang/japanese: updated, thanks to Tadashi Jokagi (elf2000) * lang/japanese: updated, thanks to Tadashi Jokagi (elf2000)
* lang/chinese_traditional: Updates, thanks to Siu Sun * lang/chinese_traditional: Updates, thanks to Siu Sun
* lang/catalan update, thanks to Xavier Navarro (xavin). * lang/catalan update, thanks to Xavier Navarro (xavin).

17
libraries/auth/http.auth.lib.php
View File

@@ -186,8 +186,7 @@ function PMA_auth_check()
} }
} }
// Gets authenticated user settings with IIS // Gets authenticated user settings with IIS
if (empty($PHP_AUTH_USER) && empty($PHP_AUTH_PW) if (empty($PHP_AUTH_USER) && empty($PHP_AUTH_PW)) {
&& function_exists('base64_decode')) {
if (!empty($HTTP_AUTHORIZATION) if (!empty($HTTP_AUTHORIZATION)
&& substr($HTTP_AUTHORIZATION, 0, 6) == 'Basic ') { && substr($HTTP_AUTHORIZATION, 0, 6) == 'Basic ') {
list($PHP_AUTH_USER, $PHP_AUTH_PW) = explode(':', base64_decode(substr($HTTP_AUTHORIZATION, 6))); list($PHP_AUTH_USER, $PHP_AUTH_PW) = explode(':', base64_decode(substr($HTTP_AUTHORIZATION, 6)));
@@ -203,6 +202,20 @@ function PMA_auth_check()
} }
} // end IIS } // end IIS
// Gets authenticated user settings with FastCGI
// set FastCGI option '-pass-header Authorization'
if (empty($PHP_AUTH_USER) && empty($PHP_AUTH_PW)) {
if (!empty($_ENV)
&& isset($_ENV['Authorization'])
&& substr($_ENV['Authorization'], 0, 6) == 'Basic ') {
list($PHP_AUTH_USER, $PHP_AUTH_PW) = explode(':', base64_decode(substr($_ENV['Authorization'], 6)));
}
else if (@getenv('Authorization')
&& substr(getenv('Authorization'), 0, 6) == 'Basic ') {
list($PHP_AUTH_USER, $PHP_AUTH_PW) = explode(':', base64_decode(substr(getenv('Authorization'), 6)));
}
} // end FastCGI
// 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)
&& (isset($PHP_AUTH_USER) && $old_usr == $PHP_AUTH_USER)) { && (isset($PHP_AUTH_USER) && $old_usr == $PHP_AUTH_USER)) {