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

chg: [galaxyCluster:add] Improved error reporting and importing now uses 

`add` endpoint
pull/6120/head
mokaddem 2020-06-09 11:01:25 +02:00
parent 00728eae92
commit be7ef90366
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controller/GalaxyClustersController.php
View File

@ -309,13 +309,7 @@ class GalaxyClustersController extends AppController
if ($cluster['GalaxyCluster']['distribution'] != 4) {
$cluster['GalaxyCluster']['sharing_group_id'] = null;
}
$saveSuccess = $this->GalaxyCluster->saveCluster($this->Auth->user(), $cluster);
if (!$saveSuccess) {
foreach($this->GalaxyCluster->validationErrors as $validationError) {
$errors[] = $validationError;
}
}
$errors = $this->GalaxyCluster->saveCluster($this->Auth->user(), $cluster);
if (!empty($errors)) {
$message = implode(', ', implode(' ', $errors));
if ($this->_isRest()) {

14
app/Model/Galaxy.php
View File

@ -283,13 +283,15 @@ class Galaxy extends AppModel
}
$cluster['GalaxyCluster']['galaxy_id'] = $existingGalaxy['Galaxy']['id'];
$cluster['GalaxyCluster']['locked'] = true;
$saveResult = $this->GalaxyCluster->captureCluster($user, $cluster, $fromPull=true);
$results['imported'] += $saveResult['imported'];
$results['ignored'] += $saveResult['ignored'];
$results['failed'] += $saveResult['failed'];
$results['errors'] = array_merge($results['errors'], $saveResult['errors']);
$saveResult = $this->GalaxyCluster->saveCluster($user, $cluster, $allowEdit=true);
if (empty($errors)) {
$results['imported']++;
} else {
$results['failed']++;
$results['errors'] = array_merge($results['errors'], $errors);
}
}
$results['success'] = !($results['failed'] > 0 && $results['imported'] == 0 && $results['ignored'] == 0);
$results['success'] = !($results['failed'] > 0 && $results['imported'] == 0);
return $results;
}

35
app/Model/GalaxyCluster.php
View File

@ -162,11 +162,13 @@ class GalaxyCluster extends AppModel
if (!$user['Role']['perm_galaxy_editor'] && !$user['Role']['perm_site_admin']) {
return false;
}
$errors = array();
$galaxy = $this->Galaxy->find('first', array('conditions' => array(
'id' => $cluster['GalaxyCluster']['galaxy_id']
)));
if (empty($galaxy)) {
return false;
$errors[] = __('Galaxy not found');
return $errors;
} else {
$galaxy = $galaxy['Galaxy'];
}
@ -176,22 +178,27 @@ class GalaxyCluster extends AppModel
$existingGalaxyCluster = $this->find('first', array('conditions' => array('GalaxyCluster.uuid' => $cluster['GalaxyCluster']['uuid'])));
if ($existingGalaxyCluster) {
if ($existingGalaxyCluster['GalaxyCluster']['galaxy_id'] != $galaxy['id']) { // cluster already exists in another galaxy
return false;
$errors[] = __('Cluster already exists in another galaxy');
return $errors;
}
if (!$existingGalaxyCluster['GalaxyCluster']['default'] && $allowEdit) {
$errors = $this->editCluster($user, $cluster);
return empty($errors);
} else {
// Maybe redirect to the correct URL?
if (!$existingGalaxyCluster['GalaxyCluster']['default']) {
$errors[] = __('Edit not allowed on default clusters');
return $errors;
}
return false;
if (!$allowEdit) {
$errors[] = __('Edit not allowed');
return $errors;
}
$errors = $this->editCluster($user, $cluster);
return $errors;
}
} else {
$cluster['GalaxyCluster']['uuid'] = CakeText::uuid();
}
$forkedCluster = $this->find('first', array('conditions' => array('GalaxyCluster.uuid' => $cluster['GalaxyCluster']['extends_uuid'])));
if (!empty($forkedCluster) && $forkedCluster['GalaxyCluster']['galaxy_id'] != $galaxy['id']) {
return false; // cluster forks always have to belong to the same galaxy as the parent
$errors[] = __('Cluster forks always have to belong to the same galaxy as the parent');
return $errors;
}
$cluster['GalaxyCluster']['org_id'] = $user['Organisation']['id'];
if (!isset($cluster['GalaxyCluster']['orgc_id'])) {
@ -205,8 +212,8 @@ class GalaxyCluster extends AppModel
if ($user['Role']['perm_sync']) {
if (isset($cluster['GalaxyCluster']['distribution']) && $cluster['GalaxyCluster']['distribution'] == 4 && !$this->SharingGroup->checkIfAuthorised($user, $cluster['GalaxyCluster']['sharing_group_id'])) {
// The sync user has to have access to the sharing group in order to be able to edit it
return false;
$errors[] = __('The sync user has to have access to the sharing group in order to be able to edit it');
return $errors;
}
}
@ -234,8 +241,12 @@ class GalaxyCluster extends AppModel
if (!empty($cluster['GalaxyCluster']['GalaxyClusterRelation'])) {
$this->GalaxyClusterRelation->saveRelations($user, $cluster['GalaxyCluster'], $cluster['GalaxyCluster']['GalaxyClusterRelation'], $capture=true);
}
} else {
foreach($this->validationErrors as $validationError) {
$errors[] = $validationError[0];
}
}
return $saveSuccess;
return $errors;
}
public function editCluster($user, $cluster, $fieldList = array(), $deleteOldElements=true)