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

chg: [analyst-data] Added missing ACL entries and improved pre-filtering before negotiation starts

notes
Sami Mokaddem 2024-02-06 08:50:21 +01:00
parent 3a8fe00df8
commit 80f97ad79f
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/Component/ACLComponent.php
View File

@ -23,8 +23,11 @@ class ACLComponent extends Component
'add' => ['AND' => ['perm_add', 'perm_analyst_data']],
'delete' => ['AND' => ['perm_add', 'perm_analyst_data']],
'edit' => ['AND' => ['perm_add', 'perm_analyst_data']],
'filterAnalystDataForPush' => ['perm_sync'],
'getRelatedElement' => ['*'],
'index' => ['*'],
'indexMinimal' => ['*'],
'pushAnalystData' => ['perm_sync'],
'view' => ['*'],
],
'analystDataBlocklists' => array(

50
app/Model/AnalystData.php
View File

@ -454,7 +454,7 @@ class AnalystData extends AppModel
$this->log("Starting Analyst Data sync with server #{$server['Server']['id']}", LOG_INFO);
$analystData = $this->collectDataForPush($user);
$analystData = $this->collectDataForPush($serverSync->server());
$keyedAnalystData = [];
foreach ($analystData as $type => $entries) {
foreach ($entries as $entry) {
@ -494,15 +494,57 @@ class AnalystData extends AppModel
* @param array $user
* @return array
*/
public function collectDataForPush(array $user): array
public function collectDataForPush(array $server): array
{
$sgIDs = $this->collectValidSharingGroupIDs($server);
$options = [
'recursive' => -1,
'conditions' => [
$this->buildConditions($user),
'OR' => [
[
'AND' => [
['distribution >' => 0],
['distribution <' => 4],
]
],
[
'AND' => [
'distribution' => 4,
'sharing_group_id' => $sgIDs,
]
],
]
],
];
return $this->getAllAnalystData('all', $options);
$dataForPush = $this->getAllAnalystData('all', $options);
$this->Event = ClassRegistry::init('Event');
foreach ($dataForPush as $type => $entries) {
foreach ($entries as $i => $analystData) {
if (!$this->Event->checkDistributionForPush($analystData, $server, $type)) {
unset($dataForPush[$type][$i]);
}
}
}
return $dataForPush;
}
private function collectValidSharingGroupIDs(array $server): array
{
$this->SharingGroup = ClassRegistry::init('SharingGroup');
$sgs = $this->SharingGroup->find('all', [
'recursive' => -1,
'contain' => ['Organisation', 'SharingGroupOrg' => ['Organisation'], 'SharingGroupServer']
]);
$sgIDs = [];
foreach ($sgs as $sg) {
if ($this->SharingGroup->checkIfServerInSG($sg, $server)) {
$sgIDs[] = $sg['SharingGroup']['id'];
}
}
if (empty($sgIDs)) {
$sgIDs = [-1];
}
return $sgIDs;
}