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

chg: [decaying] `FetchAllowedModels` now supports `all_orgs`

pull/5032/head
mokaddem 2019-08-16 11:04:47 +02:00
parent 128cdb7744
commit bfbba4e33b
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Model/DecayingModel.php
View File

@ -160,24 +160,24 @@ class DecayingModel extends AppModel
return !is_null($decaying_model['DecayingModel']['uuid']);
}
public function fetchAllowedModels($user)
public function fetchAllowedModels($user, $full=true)
{
$conditions = array();
if (!$user['Role']['perm_site_admin']) {
if ($user['Role']['perm_decaying'] || true) {
$conditions['org_id'] = $user['Organisation']['id'];
} else {
return array();
}
$conditions['OR'] = array(
'org_id' => $user['Organisation']['id'],
'all_orgs' => 1
);
}
$decayingModels = $this->find('all', array(
'conditions' => $conditions,
'recursive' => -1,
'contain' => 'DecayingModelMapping',
'include' => $full ? 'DecayingModelMapping' :''
));
foreach ($decayingModels as $i => $decayingModel) {
$decayingModels[$i]['DecayingModel']['attribute_types'] = $decayingModels[$i]['DecayingModel']['attribute_types'] + Hash::extract($decayingModels[$i]['DecayingModelMapping'], '{n}.attribute_type');
unset($decayingModels[$i]['DecayingModelMapping']);
if ($full) {
foreach ($decayingModels as $i => $decayingModel) { // includes both model default mapping and user mappings
$decayingModels[$i]['DecayingModel']['attribute_types'] = $decayingModels[$i]['DecayingModel']['attribute_types'] + Hash::extract($decayingModels[$i]['DecayingModelMapping'], '{n}.attribute_type');
unset($decayingModels[$i]['DecayingModelMapping']);
}
}
return $decayingModels;