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

ichg: [analyst-note:pull] Continuation of adding support of PULL sync filtering rule - WiP

notes
Sami Mokaddem 2024-02-06 10:58:58 +01:00
parent b928e8241b
commit a8607c54dd
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Controller/AnalystDataController.php
View File

@ -256,7 +256,24 @@ class AnalystDataController extends AppController
if ($this->request->is('post')) {
$filters = $this->request->data;
}
$allData = $this->AnalystData->indexMinimal($this->Auth->user(), $filters);
$options = [];
$acceptedFilters = ['orgc_uuid', ];
foreach ($acceptedFilters as $filterName) {
if (!empty($filters[$filterName])) {
$filterValue = $filters[$filterName];
if (!is_array($filterValue)) {
$filterValue = [$filterValue];
}
foreach ($filterValue as $entry) {
if ($entry[0] === '!') {
$options[]['AND'][] = ["{$filterName} !=" => substr($entry, 1)];
} else {
$options['OR'][] = [$filterName => $entry];
}
}
}
}
$allData = $this->AnalystData->indexMinimal($this->Auth->user(), $options);
return $this->RestResponse->viewData($allData, $this->response->type());
}

22
app/Model/AnalystData.php
View File

@ -780,9 +780,25 @@ class AnalystData extends AppModel
$this->Server = ClassRegistry::init('Server');
$this->AnalystData = ClassRegistry::init('AnalystData');
try {
$filterRules = $this->Server->filterRuleToParameter($serverSync->server()['Server']['pull_rules']);
if (!empty($filterRules['org']) && !$serverSync->isSupported(ServerSyncTool::FEATURE_ORG_RULE)) {
$filterRules['org'] = implode('|', $filterRules['org']);
$filterRules = ['orgc_uuid' => []];
$pullRules = $this->jsonDecode($serverSync->server()['Server']['pull_rules']);
if (!empty($pullRules['orgs']['OR'])) {
$orgsOR = $this->AnalystData->Orgc->find('column', [
'recursive' => -1,
'conditions' => ['name' => $pullRules['orgs']['OR']],
'fields' => ['uuid'],
]);
$filterRules['orgc_uuid'] = $orgsOR;
}
if (!empty($pullRules['orgs']['NOT'])) {
$orgsNOT = $this->AnalystData->Orgc->find('column', [
'recursive' => -1,
'conditions' => ['name' => $pullRules['orgs']['NOT']],
'fields' => ['uuid'],
]);
$filterRules['orgc_uuid'] = array_merge($filterRules['orgc_uuid'], array_map(function($orgUUID) {
return '!' . $orgUUID;
}, $orgsNOT));
}
$remoteData = $serverSync->fetchIndexMinimal($filterRules);
} catch (Exception $e) {