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

new: [attackMatrix] added instance UUID in rest response

pull/3347/head
Sami Mokaddem 2018-06-18 12:04:38 +00:00
parent 5cefdb3096
commit 929946f055
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/EventsController.php
View File

@ -4567,13 +4567,14 @@ class EventsController extends AppController {
$attackTactic = $attackTacticData['attackTactic'];
$attackTags = $attackTacticData['attackTags'];
$killChainOrders = $attackTacticData['killChain'];
$instanceUUID = $attackTacticData['instance-uuid'];
$scoresData = $this->Event->Attribute->AttributeTag->getTagScores($eventId, $attackTags);
$maxScore = $scoresData['maxScore'];
$scores = $scoresData['scores'];
if ($this->_isRest()) {
$json = array('matrix' => $attackTactic, 'scores' => $scores);
$json = array('matrix' => $attackTactic, 'scores' => $scores, 'instance-uuid' => $instanceUUID);
$this->response->type('json');
return new CakeResponse(array('body' => json_encode($json), 'status' => 200, 'type' => 'json'));
} else {

5
app/Controller/UsersController.php
View File

@ -1639,14 +1639,15 @@ class UsersController extends AppController {
$attackTactic = $attackTacticData['attackTactic'];
$attackTags = $attackTacticData['attackTags'];
$killChainOrders = $attackTacticData['killChain'];
$instanceUUID = $attackTacticData['instance-uuid'];
$scoresData = $this->Event->Attribute->AttributeTag->getTagScores(0, $attackTags);
$maxScore = $scoresData['maxScore'];
$scores = $scoresData['scores'];
if ($this->_isRest()) {
$data = array('matrix' => $attackTactic, 'scores' => $scores);
return $this->RestResponse->viewData($data, $this->response->type());
$json = array('matrix' => $attackTactic, 'scores' => $scores, 'instance-uuid' => $instanceUUID);
return $this->RestResponse->viewData($json, $this->response->type());
} else {
App::uses('ColourGradientTool', 'Tools');
$gradientTool = new ColourGradientTool();

5
app/Model/Galaxy.php
View File

@ -291,10 +291,13 @@ class Galaxy extends AppModel{
throw new NotFoundException('Galaxies not found.');
}
$mispUUID = Configure::read('MISP')['uuid'];
$attackTactic = array(
'killChain' => $killChainOrders,
'attackTactic' => array(),
'attackTags' => array()
'attackTags' => array(),
'instance-uuid' => $mispUUID
);
foreach ($galaxies as $galaxy) {