mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
ENHANCEMENT Only logging out users on Security::permissionFailure() is called in non-ajax context. For ajax requests, we now return a 403 HTTP Status in a HTTPResponse Object, with a ":NOTLOGGEDIN" body for backwards compatibility. If a logout+redirection is required after an ajax-request, this should be handled by the clientside.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65147 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
c998006b2c
commit
c4f3bc962f
@ -140,6 +140,12 @@ class Security extends Controller {
|
|||||||
* access the item.
|
* access the item.
|
||||||
*/
|
*/
|
||||||
static function permissionFailure($controller = null, $messageSet = null) {
|
static function permissionFailure($controller = null, $messageSet = null) {
|
||||||
|
if(Director::is_ajax()) {
|
||||||
|
$response = ($controller) ? $controller->getResponse() : new HTTPResponse();
|
||||||
|
$response->setStatusCode(403);
|
||||||
|
$response->setBody('NOTLOGGEDIN:');
|
||||||
|
return $response;
|
||||||
|
} else {
|
||||||
// Prepare the messageSet provided
|
// Prepare the messageSet provided
|
||||||
if(!$messageSet) {
|
if(!$messageSet) {
|
||||||
if(self::$default_message_set) {
|
if(self::$default_message_set) {
|
||||||
@ -195,11 +201,6 @@ class Security extends Controller {
|
|||||||
// Audit logging hook
|
// Audit logging hook
|
||||||
if($controller) $controller->extend('permissionDenied', $member);
|
if($controller) $controller->extend('permissionDenied', $member);
|
||||||
|
|
||||||
// AccessLogEntry::create("Permission to access {$name} denied");
|
|
||||||
|
|
||||||
if(Director::is_ajax()) {
|
|
||||||
die('NOTLOGGEDIN:');
|
|
||||||
} else {
|
|
||||||
Director::redirect("Security/login");
|
Director::redirect("Security/login");
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user