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

FIX CMSSecurity doesn't have Authenticators assigned.

Browse Source
This commit is contained in:
Damian Mooyman 2017-06-12 10:10:34 +12:00 committed by GitHub
commit 0dcfa5fa9d
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_config/security.yml
View File

@ -31,5 +31,8 @@ SilverStripe\Core\Injector\Injector:
properties: properties:
Authenticators: Authenticators:
default: %$SilverStripe\Security\MemberAuthenticator\MemberAuthenticator default: %$SilverStripe\Security\MemberAuthenticator\MemberAuthenticator
SilverStripe\Security\CMSSecurity:
properties:
Authenticators:
cms: %$SilverStripe\Security\MemberAuthenticator\CMSMemberAuthenticator cms: %$SilverStripe\Security\MemberAuthenticator\CMSMemberAuthenticator
SilverStripe\Security\IdentityStore: %$SilverStripe\Security\AuthenticationHandler SilverStripe\Security\IdentityStore: %$SilverStripe\Security\AuthenticationHandler

4
src/Security/CMSSecurity.php
View File

@ -165,14 +165,14 @@ PHP
* *
* @return bool * @return bool
*/ */
public static function enabled() public function enabled()
{ {
// Disable shortcut // Disable shortcut
if (!static::config()->get('reauth_enabled')) { if (!static::config()->get('reauth_enabled')) {
return false; return false;
} }
return count(Security::singleton()->getApplicableAuthenticators(Authenticator::CMS_LOGIN)) > 0; return count($this->getApplicableAuthenticators(Authenticator::CMS_LOGIN)) > 0;
} }
/** /**

2
src/Security/Security.php
View File

@ -356,7 +356,7 @@ class Security extends Controller implements TemplateGlobalProvider
_t('SilverStripe\\CMS\\Controllers\\ContentController.NOTLOGGEDIN', 'Not logged in') _t('SilverStripe\\CMS\\Controllers\\ContentController.NOTLOGGEDIN', 'Not logged in')
); );
// Tell the CMS to allow re-authentication // Tell the CMS to allow re-authentication
if (CMSSecurity::enabled()) { if (CMSSecurity::singleton()->enabled()) {
$response->addHeader('X-Reauthenticate', '1'); $response->addHeader('X-Reauthenticate', '1');
} }
} }