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

Correlation graph in event view

pull/3172/head
Sami Mokaddem 2018-04-20 12:35:51 +00:00
parent 607d203c04
commit 43e8529b9d
4 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/EventsController.php
View File

@ -4300,6 +4300,8 @@ class EventsController extends AppController {
public function viewGraph($id) {
$event = $this->Event->fetchEvent($this->Auth->user(), array('eventid' => $id));
if (empty($event)) throw new MethodNotAllowedException('Invalid Event.');
$this->set('ajax', $this->request->is('ajax'));
$this->set('event', $event[0]);
$this->set('scope', 'event');
$this->set('id', $id);

11
app/View/Events/view.ctp
View File

@ -361,6 +361,9 @@
<button class="btn btn-inverse toggle qet galaxy-toggle-button" id="eventgraph_toggle" data-toggle-type="eventgraph" onclick="enable_interactive_graph();">
<span class="icon-plus icon-white" title="<?php echo __('Toggle Event graph');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle Event graph');?>" style="vertical-align:top;"></span><?php echo __('Event graph');?>
</button>
<button class="btn btn-inverse toggle qet galaxy-toggle-button" id="correlationgraph_toggle" data-toggle-type="correlationgraph" onclick="enable_correlation_graph();">
<span class="icon-plus icon-white" title="<?php echo __('Toggle Correlation graph');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle Correlation graph');?>" style="vertical-align:top;"></span><?php echo __('Correlation graph');?>
</button>
<button class="btn btn-inverse toggle qet galaxy-toggle-button" id="attributes_toggle" data-toggle-type="attributes">
<span class="icon-minus icon-white" title="<?php echo __('Toggle attributes');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle attributes');?>" style="vertical-align:top;"></span><?php echo __('Attributes');?>
</button>
@ -380,6 +383,8 @@
<div id="eventgraph_div" class="info_container_eventgraph_network" style="display: none;" data-fullscreen="false">
<?php echo $this->element('view_event_graph'); ?>
</div>
<div id="correlationgraph_div" class="info_container_eventgraph_network" style="display: none;" data-fullscreen="false">
</div>
<div id="attributes_div">
<?php echo $this->element('eventattribute'); ?>
</div>
@ -403,5 +408,11 @@ $(document).ready(function () {
$("#discussions_div").html(data);
});
});
function enable_correlation_graph() {
$.get("/events/viewGraph/10/<?php echo $event['Event']['id']; ?>", function(data) {
$("#correlationgraph_div").html(data);
});
}
</script>
<input type="hidden" value="/shortcuts/event_view.json" class="keyboardShortcutsConfig" />

45
app/View/Events/view_graph.ctp
View File

@ -8,24 +8,32 @@
echo $this->Html->script('d3');
echo $this->Html->script('correlation-graph');
?>
<div class="view">
<div id="chart" style="width:100%;height:100%"></div>
<div id="hover-menu-container" class="menu-container">
<span class="bold hidden" id="hover-header"><?php echo __('Hover target');?></span><br />
<ul id="hover-menu" class="menu">
<?php
if (!$ajax) {
?>
<div class="view">
<?php } ?>
<div id="chart" style="width:100%;height:100%"></div>
<div id="hover-menu-container" class="menu-container">
<span class="bold hidden" id="hover-header"><?php echo __('Hover target');?></span><br />
<ul id="hover-menu" class="menu">
</ul>
</div>
<div id="selected-menu-container" class="menu-container">
<span class="bold hidden" id="selected-header"><?php echo __('Selected');?></span><br />
<ul id = "selected-menu" class="menu">
</ul>
</div>
<ul id="context-menu" class="menu">
<li id="expand"><?php echo __('Expand');?></li>
<li id="context-delete"><?php echo __('Delete');?></li>
</ul>
<?php
if (!$ajax) {
?>
</div>
<div id="selected-menu-container" class="menu-container">
<span class="bold hidden" id="selected-header"><?php echo __('Selected');?></span><br />
<ul id = "selected-menu" class="menu">
</ul>
</div>
<ul id="context-menu" class="menu">
<li id="expand"><?php echo __('Expand');?></li>
<li id="context-delete"><?php echo __('Delete');?></li>
</ul>
</div>
<div id="graph_init" class="hidden" data-id="<?php echo h($id);?>" data-scope="<?php echo h($scope);?>">
<?php } ?>
<div id="graph_init" class="hidden" data-id="<?php echo h($id);?>" data-scope="<?php echo h($scope);?>" data-ajax="<?php echo $ajax ? 'true' : 'false'; ?>">
</div>
<?php
$scope_list = array(
@ -46,5 +54,8 @@
$params['taxonomy'] = $taxonomy['Taxonomy']['id'];
}
}
echo $this->element('side_menu', $params);
if (!$ajax) {
echo $this->element('side_menu', $params);
}
?>

13
app/webroot/js/correlation-graph.js
View File

@ -11,10 +11,17 @@ $(document).ready( function() {
height = $(window).height() - 160 - margin.top - margin.bottom;
var menu_x_buffer_ = width - 150;
var menu_y_buffer = height - 100;
$('.menu-container').css('left', '200px');
$('#hover-menu-container').css('top', '50px');
if ($('#graph_init').data('ajax')) {
$('.menu-container').css('left', '20px');
$('#hover-menu-container').css('top', '20px');
$('#selected-menu-container').css('top', '250px');
} else {
$('.menu-container').css('left', '200px');
$('#hover-menu-container').css('top', '50px');
$('#selected-menu-container').css('top', '400px');
}
$('#hover-menu-container').css('z-index', 0);
$('#selected-menu-container').css('top', '400px');
$('#selected-menu-container').css('z-index', 1);
var root;