MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5541 from JakubOnderka/proper_logout 

fix: Proper logout when `CustomAuth_custom_logout` is set
pull/5555/head
Andras Iklody 2020-01-27 07:56:52 +01:00 committed by GitHub
parent cb952e8f2e a3c07277c4
commit 56e0d009e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controller/AppController.php
View File

@ -112,7 +112,14 @@ class AppController extends Controller
public function beforeFilter()
{
$this->Auth->loginRedirect = Configure::read('MISP.baseurl') . '/users/routeafterlogin';
$this->Auth->logoutRedirect = Configure::read('MISP.baseurl') . '/users/login';
$customLogout = Configure::read('Plugin.CustomAuth_custom_logout');
if ($customLogout) {
$this->Auth->logoutRedirect = $customLogout;
} else {
$this->Auth->logoutRedirect = Configure::read('MISP.baseurl') . '/users/login';
}
$this->__sessionMassage();
if (Configure::read('Security.allow_cors')) {
// Add CORS headers

7
app/View/Elements/global_menu.ctp
View File

@ -419,15 +419,10 @@
)
)
),
array(
'url' => h(Configure::read('Plugin.CustomAuth_custom_logout')),
'text' => __('Log out'),
'requirement' => (Configure::read('Plugin.CustomAuth_custom_logout') && empty(Configure::read('Plugin.CustomAuth_disable_logout')))
),
array(
'url' => '/users/logout',
'text' => __('Log out'),
'requirement' => (!$externalAuthUser && empty(Configure::read('Plugin.CustomAuth_disable_logout')))
'requirement' => empty(Configure::read('Plugin.CustomAuth_disable_logout'))
)
);
}