tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Fixed bug in basicauth failover to session member.

Browse Source 
BUGFIX: Don't use session member for test site protection feature.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104962 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-05-16 23:19:01 +00:00
parent a9b238885c
commit 9140742fd3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
security/BasicAuth.php
View File

@ -24,23 +24,25 @@ class BasicAuth {
* *
* @param string $realm * @param string $realm
* @param string|array $permissionCode * @param string|array $permissionCode
* @param boolean $tryUsingSessionLogin If true, then the method with authenticate against the
* session log-in if those credentials are disabled.
* @return Member $member * @return Member $member
*/ */
static function requireLogin($realm, $permissionCode) { static function requireLogin($realm, $permissionCode, $tryUsingSessionLogin = true) {
if(!Security::database_is_ready() || Director::is_cli()) return true; if(!Security::database_is_ready() || Director::is_cli()) return true;
$authenticated = false;
$member = null;
if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) { if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
$member = MemberAuthenticator::authenticate(array( $member = MemberAuthenticator::authenticate(array(
'Email' => $_SERVER['PHP_AUTH_USER'], 'Email' => $_SERVER['PHP_AUTH_USER'],
'Password' => $_SERVER['PHP_AUTH_PW'], 'Password' => $_SERVER['PHP_AUTH_PW'],
), null); ), null);
if($member || Member::currentUser()) $authenticated = true;
} }
if(!$member && $tryUsingSessionLogin) $member = Member::currentUser();
// If we've failed the authentication mechanism, then show the login form // If we've failed the authentication mechanism, then show the login form
if(!$authenticated) { if(!$member) {
header("WWW-Authenticate: Basic realm=\"$realm\""); header("WWW-Authenticate: Basic realm=\"$realm\"");
header($_SERVER['SERVER_PROTOCOL'] . ' 401 Unauthorized'); header($_SERVER['SERVER_PROTOCOL'] . ' 401 Unauthorized');
@ -107,7 +109,9 @@ class BasicAuth {
*/ */
static function protect_site_if_necessary() { static function protect_site_if_necessary() {
if(self::$entire_site_protected) { if(self::$entire_site_protected) {
self::requireLogin("SilverStripe test website. Use your CMS login.", "ADMIN"); // The test-site protection should ignore the session log-in; otherwise it's difficult
// to test the log-in features of your site
self::requireLogin("SilverStripe test website. Use your CMS login.", "ADMIN", false);
} }
} }