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

Merge branch '2.4' into feature/warninglists

pull/1106/head
Iglocska 2016-04-22 15:04:04 +02:00
parent a1a27da0cf 71d7cfc5f0
commit be514d9011
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/Controller/AppController.php
View File

@ -72,26 +72,29 @@ class AppController extends Controller {
'ACL'
);
public function beforeFilter() {
//Let s check if Apache have kerberos auth.
$envvar = Configure::read('ApacheSecureAuth.apacheEnv');
if (isset($_SERVER[$envvar])) {
$this->Auth->className = 'ApacheSecureAuth';
$this->Auth->authenticate = array(
'Apache' => array(
// envvar = field return by Apache when used Authentificatied
'fields' => array('username' => 'email', 'envvar' => $envvar)
)
);
} else {
$this->Auth->className = 'SecureAuth';
$this->Auth->authenticate = array(
'Form' => array(
'fields' => array('username' => 'email')
)
);
}
$this->loadModel('User');
$auth_user_fields = $this->User->describeAuthFields();
//Let s check if Apache have kerberos auth.
$envvar = Configure::read('ApacheSecureAuth.apacheEnv');
if (isset($_SERVER[$envvar])) {
$this->Auth->className = 'ApacheSecureAuth';
$this->Auth->authenticate = array(
'Apache' => array(
// envvar = field return by Apache when used Authentificatied
'fields' => array('username' => 'email', 'envvar' => $envvar),
'userFields' => $auth_user_fields
)
);
} else {
$this->Auth->className = 'SecureAuth';
$this->Auth->authenticate = array(
'Form' => array(
'fields' => array('username' => 'email'),
'userFields' => $auth_user_fields
)
);
}
$versionArray = $this->{$this->modelClass}->checkMISPVersion();
$this->mispVersion = implode('.', array_values($versionArray));
@ -185,7 +188,6 @@ class AppController extends Controller {
if($this->Auth->startup($this)) {
$user = $this->Auth->user();
if ($user) {
unset($user['gpgkey']);
// User found in the db, add the user info to the session
$this->Session->renew();
$this->Session->write(AuthComponent::$sessionKey, $user);

11
app/Model/User.php
View File

@ -715,4 +715,15 @@ class User extends AppModel {
}
return $final;
}
public function describeAuthFields() {
$fields = array();
$fields = array_merge($fields, array_keys($this->getColumnTypes()));
if (($key = array_search('gpgkey', $fields)) !== false) unset($fields[$key]);
$relatedModels = array_keys($this->belongsTo);
foreach ($relatedModels as $relatedModel) {
$fields[] = $relatedModel . '.*';
}
return $fields;
}
}