mirror of https://github.com/MISP/MISP
commit
4382269454
|
@ -1 +1 @@
|
|||
{"major":2, "minor":3, "hotfix":66}
|
||||
{"major":2, "minor":3, "hotfix":67}
|
||||
|
|
|
@ -89,14 +89,17 @@ class AppController extends Controller {
|
|||
$this->Security->csrfCheck = false;
|
||||
// Authenticate user with authkey in Authorization HTTP header
|
||||
if (!empty($_SERVER['HTTP_AUTHORIZATION'])) {
|
||||
$found_misp_auth_key = false;
|
||||
$authentication = explode(',', $_SERVER['HTTP_AUTHORIZATION']);
|
||||
$user = false;
|
||||
foreach ($authentication as $auth_key) {
|
||||
if (preg_match('/^[a-zA-Z0-9]{40}$/', trim($auth_key))) {
|
||||
$found_misp_auth_key = true;
|
||||
$user = $this->checkAuthUser(trim($auth_key));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if ($found_misp_auth_key) {
|
||||
if ($user) {
|
||||
unset($user['User']['gpgkey']);
|
||||
// User found in the db, add the user info to the session
|
||||
|
@ -110,6 +113,7 @@ class AppController extends Controller {
|
|||
}
|
||||
unset($user);
|
||||
}
|
||||
}
|
||||
} else if(!$this->Session->read(AuthComponent::$sessionKey)) {
|
||||
// load authentication plugins from Configure::read('Security.auth')
|
||||
$auth = Configure::read('Security.auth');
|
||||
|
@ -190,7 +194,8 @@ class AppController extends Controller {
|
|||
|
||||
public $userRole = null;
|
||||
|
||||
protected function _isJson(){
|
||||
protected function _isJson($data=false){
|
||||
if ($data) return (json_decode($data) != NULL) ? true : false;
|
||||
return $this->request->header('Accept') === 'application/json';
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue