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

fix: Some cleanup

pull/3250/head
iglocska 2018-05-12 17:26:16 +02:00
parent 567012ad10
commit 5acfac3539
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/AppController.php
View File

@ -180,7 +180,7 @@ class AppController extends Controller {
$found_misp_auth_key = true;
$temp = $this->checkAuthUser(trim($auth_key));
if ($temp) {
$user['User'] = $this->checkAuthUser(trim($auth_key));
$user['User'] = $temp;
}
}
}
@ -484,7 +484,7 @@ class AppController extends Controller {
public function checkAuthUser($authkey) {
$this->loadModel('User');
$user = $this->User->getAuthUserByUuid($authkey);
$user = $this->User->getAuthUserByAuthkey($authkey);
if (empty($user)) return false;
if (!$user['Role']['perm_auth']) return false;
if ($user['Role']['perm_site_admin']) $user['siteadmin'] = true;

20
app/Model/User.php
View File

@ -619,7 +619,7 @@ class User extends AppModel {
}
// get the current user and rearrange it to be in the same format as in the auth component
public function getAuthUserByUuid($id) {
public function getAuthUserByAuthkey($id) {
$conditions = array('User.authkey' => $id);
$user = $this->find('first', array('conditions' => $conditions, 'recursive' => -1,'contain' => array('Organisation', 'Role', 'Server')));
if (empty($user)) return $user;
@ -627,13 +627,23 @@ class User extends AppModel {
$user['User']['Role'] = $user['Role'];
$user['User']['Organisation'] = $user['Organisation'];
$user['User']['Server'] = $user['Server'];
unset($user['Organisation'], $user['Role'], $user['Server']);
return $user['User'];
}
public function getAuthUserByExternalAuth($id) {
$conditions = array('User.external_auth_key' => $id, 'User.external_auth_required' => true);
$user = $this->find('first', array('conditions' => $conditions, 'recursive' => -1,'contain' => array('Organisation', 'Role', 'Server')));
public function getAuthUserByExternalAuth($auth_key) {
$conditions = array(
'User.external_auth_key' => $auth_key,
'User.external_auth_required' => true
);
$user = $this->find('first', array(
'conditions' => $conditions,
'recursive' => -1,
'contain' => array(
'Organisation',
'Role',
'Server'
)
));
if (empty($user)) return $user;
// Rearrange it a bit to match the Auth object created during the login
$user['User']['Role'] = $user['Role'];