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

new: [galaxyCluster:restSearch] Allow filtering by elements

pull/8641/head
Sami Mokaddem 2022-10-04 16:27:50 +02:00
parent 44c5fceb63
commit e4abd639d5
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controller/Component/RestResponseComponent.php
View File

@ -155,7 +155,7 @@ class RestResponseComponent extends Component
),
'restSearch' => array(
'description' => "Search MISP using a list of filter parameters and return the data in the selected format. This API allows pagination via the page and limit parameters.",
'optional' => array('page', 'limit', 'id', 'uuid', 'galaxy_id', 'galaxy_uuid', 'version', 'distribution', 'org_id', 'orgc_id', 'tag_name', 'custom', 'minimal', 'published', 'value', 'extends_uuid'),
'optional' => array('page', 'limit', 'id', 'uuid', 'galaxy_id', 'galaxy_uuid', 'version', 'distribution', 'org_id', 'orgc_id', 'tag_name', 'custom', 'minimal', 'published', 'value', 'elements', 'extends_uuid'),
'params' => array()
),
),
@ -1035,6 +1035,12 @@ class RestResponseComponent extends Component
'operators' => ['equal', 'not_equal'],
'values' => array(0 => 'dist1'),
),
'elements' => array(
'input' => 'text',
'type' => 'string',
'operators' => array('equal'),
'help' => __('Allow providing a JSON containing the keys and values to search for. Example: {"synonyms": "apt42"}'),
),
'email' => array(
'input' => 'text',
'type' => 'string',

7
app/Model/GalaxyCluster.php
View File

@ -1325,8 +1325,13 @@ class GalaxyCluster extends AppModel
}
}
if (isset($filters['elements'])) {
$matchingIDs = $this->GalaxyElement->getClusterIDsFromMatchingElements($user, $filters['elements']);
$filters['id'] = $matchingIDs;
}
$simpleParams = array(
'uuid', 'galaxy_id', 'version', 'distribution', 'type', 'value', 'default', 'extends_uuid', 'tag_name', 'published'
'uuid', 'galaxy_id', 'version', 'distribution', 'type', 'value', 'default', 'extends_uuid', 'tag_name', 'published', 'id',
);
foreach ($simpleParams as $k => $simpleParam) {
if (isset($filters[$simpleParam])) {

33
app/Model/GalaxyElement.php
View File

@ -130,4 +130,37 @@ class GalaxyElement extends AppModel
$expanded = Hash::expand($keyedValue);
return $expanded;
}
/**
* getClusterIDsFromMatchingElements
*
* @param array $user
* @param array $elements an associative array containg the elements to search for
* Example: {"synonyms": "apt42"}
* @return array
*/
public function getClusterIDsFromMatchingElements(array $user, array $elements): array
{
$elementConditions = [];
foreach ($elements as $key => $value) {
$elementConditions[] = [
'GalaxyElement.key' => $key,
'GalaxyElement.value' => $value,
];
}
$conditions = [
$this->buildACLConditions($user),
$elementConditions,
];
$elements = $this->find('all', [
'conditions' => $conditions,
'contain' => ['GalaxyCluster' => ['fields' => ['id', 'distribution', 'org_id']]],
'recursive' => -1
]);
$clusterIDs = [];
foreach ($elements as $element) {
$clusterIDs[] = $element['GalaxyElement']['galaxy_cluster_id'];
}
return $clusterIDs;
}
}