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

fix: [API] /galaxies/view by uuid added, fixes #4993

pull/5005/head
iglocska 2019-08-14 11:56:06 +02:00
parent de99495edf
commit 6e23cb18bf
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controller/GalaxiesController.php
View File

@ -49,17 +49,22 @@ class GalaxiesController extends AppController
public function view($id)
{
if (!is_numeric($id)) {
if (!is_numeric($id) && !Validation::uuid($id)) {
throw new NotFoundException('Invalid galaxy.');
}
if (isset($this->params['named']['searchall']) && strlen($this->params['named']['searchall']) > 0) {
$this->set('passedArgsArray', array('all' => $this->params['named']['searchall']));
}
if (Validation::uuid($id)) {
$conditions = array('Galaxy.uuid' => $id);
} else {
$conditions = array('Galaxy.id' => $id);
}
if ($this->_isRest()) {
$galaxy = $this->Galaxy->find('first', array(
'contain' => array('GalaxyCluster' => array('GalaxyElement'/*, 'GalaxyReference'*/)),
'recursive' => -1,
'conditions' => array('Galaxy.id' => $id)
'conditions' => $conditions
));
if (empty($galaxy)) {
throw new NotFoundException('Galaxy not found.');
@ -68,7 +73,7 @@ class GalaxiesController extends AppController
} else {
$galaxy = $this->Galaxy->find('first', array(
'recursive' => -1,
'conditions' => array('Galaxy.id' => $id)
'conditions' => $conditions
));
if (empty($galaxy)) {
throw new NotFoundException('Galaxy not found.');