mirror of https://github.com/MISP/MISP
fix: [ACLComponent] Put `pushClusters` into the correct section.
Also removed useless conditionpull/6120/head
parent
49ca882207
commit
f0f5f02ef1
|
@ -233,6 +233,7 @@ class ACLComponent extends Component
|
||||||
'forkTree' => array('*'),
|
'forkTree' => array('*'),
|
||||||
'index' => array('*'),
|
'index' => array('*'),
|
||||||
'import' => array('perm_galaxy_editor'),
|
'import' => array('perm_galaxy_editor'),
|
||||||
|
'pushCluster' => array('perm_sync'),
|
||||||
'relationsGraph' => array('*'),
|
'relationsGraph' => array('*'),
|
||||||
'selectGalaxy' => array('perm_tagger'),
|
'selectGalaxy' => array('perm_tagger'),
|
||||||
'selectGalaxyNamespace' => array('perm_tagger'),
|
'selectGalaxyNamespace' => array('perm_tagger'),
|
||||||
|
@ -249,7 +250,6 @@ class ACLComponent extends Component
|
||||||
'detach' => array('perm_tagger'),
|
'detach' => array('perm_tagger'),
|
||||||
'edit' => array('perm_galaxy_editor'),
|
'edit' => array('perm_galaxy_editor'),
|
||||||
'index' => array('*'),
|
'index' => array('*'),
|
||||||
'pushCluster' => array('perm_sync'),
|
|
||||||
'restSearch' => array('*'),
|
'restSearch' => array('*'),
|
||||||
'updateCluster' => array('perm_galaxy_editor'),
|
'updateCluster' => array('perm_galaxy_editor'),
|
||||||
'view' => array('*'),
|
'view' => array('*'),
|
||||||
|
|
|
@ -3056,7 +3056,7 @@ class Server extends AppModel
|
||||||
if ('Success' === $result) {
|
if ('Success' === $result) {
|
||||||
$successes[] = $event['Event']['id'];
|
$successes[] = $event['Event']['id'];
|
||||||
|
|
||||||
if ($push['canPush'] || $push['canEditGalaxyCluster']) {
|
if ($push['canEditGalaxyCluster']) {
|
||||||
$clustersSuccesses = $this->syncGalaxyClusters($HttpSocket, $this->data, $user, $event);
|
$clustersSuccesses = $this->syncGalaxyClusters($HttpSocket, $this->data, $user, $event);
|
||||||
} else {
|
} else {
|
||||||
$clustersSuccesses = array();
|
$clustersSuccesses = array();
|
||||||
|
|
Loading…
Reference in New Issue