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

chg: [clusterRelations:relations_graph] Added distribution and Org info

pull/6120/head
mokaddem 2020-05-12 08:54:11 +02:00
parent 50d6c7833f
commit 989d420994
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/GalaxiesController.php
View File

@ -544,5 +544,8 @@ class GalaxiesController extends AppController
$this->set('relations', $relations);
$this->set('galaxy', $galaxy);
$this->set('galaxy_id', $galaxyId);
$this->loadModel('Attribute');
$distributionLevels = $this->Attribute->distributionLevels;
$this->set('distributionLevels', $distributionLevels);
}
}

36
app/Model/GalaxyClusterRelation.php
View File

@ -287,14 +287,21 @@ class GalaxyClusterRelation extends AppModel
$lookup[$cluster['GalaxyCluster']['id']] = $cluster;
}
foreach ($clusters as $cluster) {
$cluster = $this->attachOwnerInsideCluster($cluster);
if (!empty($cluster['GalaxyClusterRelation'])) {
foreach($cluster['GalaxyClusterRelation'] as $relation) {
$referencedClusterId = $relation['referenced_galaxy_cluster_id'];
if (!isset($lookup[$referencedClusterId])) {
$referencedCluster = $this->GalaxyCluster->fetchGalaxyClusters($user, array(
'conditions' => array('GalaxyCluster.id' => $referencedClusterId)
'conditions' => array('GalaxyCluster.id' => $referencedClusterId),
'contain' => array('Org', 'Orgc', 'SharingGroup'),
));
$lookup[$referencedClusterId] = !empty($referencedCluster) ? $referencedCluster[0] : array();
if (!empty($referencedCluster)) {
$referencedCluster[0] = $this->attachOwnerInsideCluster($referencedCluster[0]);
$lookup[$referencedClusterId] = $referencedCluster[0];
} else {
$lookup[$referencedClusterId] = array();
}
}
$referencedCluster = $lookup[$referencedClusterId];
if (!empty($referencedCluster)) {
@ -340,6 +347,7 @@ class GalaxyClusterRelation extends AppModel
}
$referencingCluster = $lookup[$referencingClusterId];
if (!empty($referencingCluster)) {
$referencingCluster = $this->attachOwnerInsideCluster($referencingCluster);
$nodes[$referencingClusterId] = $referencingCluster['GalaxyCluster'];
$nodes[$referencingClusterId]['group'] = $referencingCluster['GalaxyCluster']['type'];
$links[] = array(
@ -355,4 +363,28 @@ class GalaxyClusterRelation extends AppModel
}
return array('nodes' => array_values($nodes), 'links' => $links, 'invalid' => $invalid);
}
private function attachOwnerInsideCluster($cluster)
{
if (!empty($cluster['Org']) && !isset($cluster['GalaxyCluster']['Org'])) {
$cluster['GalaxyCluster']['Org'] = array(
'id' => $cluster['Org']['id'],
'name' => $cluster['Org']['name'],
);
}
if (!empty($cluster['Orgc']) && !isset($cluster['GalaxyCluster']['Orgc'])) {
$cluster['GalaxyCluster']['Orgc'] = array(
'id' => $cluster['Orgc']['id'],
'name' => $cluster['Orgc']['name'],
);
}
if (!empty($cluster['SharingGroup']) && !isset($cluster['GalaxyCluster']['SharingGroup'])) {
$cluster['GalaxyCluster']['SharingGroup'] = array(
'id' => $cluster['SharingGroup']['id'],
'name' => $cluster['SharingGroup']['name'],
'description' => $cluster['SharingGroup']['description'],
);
}
return $cluster;
}
}

17
app/View/Elements/GalaxyClusters/relations_graph.ctp
View File

@ -1,6 +1,6 @@
<div style="margin-bottom: 10px; position: relative">
<div id="graphContainer" style="height: 70vh; border: 1px solid #ddd; "></div>
<div id="tooltipContainer" style="max-height: 400px; min-width: 200px; max-width:300px; position: absolute; top: 10px; right: 10px; border: 1px solid #999; border-radius: 3px; background-color: #f5f5f5ee; overflow: auto;"></div>
<div id="tooltipContainer" style="max-height: 450px; min-width: 200px; max-width:300px; position: absolute; top: 10px; right: 10px; border: 1px solid #999; border-radius: 3px; background-color: #f5f5f5ee; overflow: auto;"></div>
</div>
<?php
@ -10,6 +10,7 @@ echo $this->element('genericElements/assetLoader', array(
?>
<script>
var distributionLevels = <?= json_encode($distributionLevels) ?>;
var hexagonPoints = '30,15 22.5,28 7.5,28 0,15 7.5,2.0 22.5,2'
var hexagonPointsSmaller = '21,10.5 15.75,19.6 5.25,19.6 0,10.5 5.25,1.4 15.75,1.4'
var hexagonTranslate = -10.5;
@ -322,7 +323,11 @@ function generateTooltip(d, type) {
tableArray = [
{label: '<?= __('Name') ?>', value: d.value, url: {path: '<?= sprintf('%s/galaxy_clusters/view/', $baseurl) ?>', id: d.id}},
{label: '<?= __('Galaxy') ?>', value: d.type, url: {path: '<?= sprintf('%s/galaxies/view/', $baseurl) ?>', id: d.galaxy_id}},
{label: '<?= __('Description') ?>', value: d.description},
{label: '<?= __('Default') ?>', value: d.default},
{label: '<?= __('Distribution') ?>', value: getReadableDistribution(d), url: {path: d.distribution == 4 ? '<?= sprintf('%s/sharing_groups/view/', $baseurl) ?>' : undefined, id: d.distribution == 4 ? d.SharingGroup.id : ''}},
{label: '<?= __('Owner Org.') ?>', value: d.Org.name, url: {path: '<?= sprintf('%s/organisations/view/', $baseurl) ?>', id: d.Org.id}},
{label: '<?= __('Creator Org.') ?>',value: d.Orgc.name, url: {path: '<?= sprintf('%s/organisations/view/', $baseurl) ?>', id: d.Orgc.id}},
{label: '<?= __('Tag name') ?>', value: d.tag_name},
{label: '<?= __('Version') ?>', value: d.version},
{label: '<?= __('UUID') ?>', value: d.uuid}
@ -353,7 +358,7 @@ function generateTooltip(d, type) {
tableArray.forEach(function(row) {
var $cell1 = $('<td></td>').text(row.label);
var $cell2 = $('<td></td>');
if (row.url !== undefined) {
if (row.url !== undefined && row.url.path !== undefined) {
var completeUrl = row.url.path + (row.url.id !== undefined ? row.url.id : '');
$cell2.append($('<a></a>').attr('href', completeUrl).attr('target', '_blank').text(row.value));
} else {
@ -421,6 +426,14 @@ function drawLabels() {
.attr('height', legendBB.height + pad)
.style('stroke', '#eee');
}
function getReadableDistribution(d) {
if (d.distribution != 4) {
return distributionLevels[d.distribution];
} else {
return d.SharingGroup.name;
}
}
</script>
<style>