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

Further progress

pull/1106/head
Iglocska 2016-04-22 02:24:08 +02:00
parent 9d6e23c8c1
commit 28aa0728bf
2 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/EventsController.php
View File

@ -721,6 +721,10 @@ class EventsController extends AppController {
}
}
$params = $this->Event->rearrangeEventForView($event);
$this->loadModel('Warninglist');
$warningLists = $this->Warninglist->fetchForEventView();
if (!empty($warningLists)) $event = $this->Warninglist->setWarnings($event, $warningLists);
$this->params->params['paging'] = array($this->modelClass => $params);
$this->set('event', $event);
$dataForView = array(

66
app/Model/Warninglist.php
View File

@ -93,4 +93,70 @@ class Warninglist extends AppModel{
return $this->id;
} else return $this->validationErrors;
}
public function fetchForEventView() {
$warninglists = $this->find('all', array('contain' => array('WarninglistType'), 'conditions' => array('enabled' => true)));
if (empty($warninglists)) return array();
$results = array();
foreach ($warninglists as $k => &$t) {
$t['values'] = $this->WarninglistEntry->find('list', array(
'recursive' => -1,
'conditions' => array('warninglist_id' => $t['Warninglist']['id']),
'fields' => array('value')
));
$t['values'] = array_values($t['values']);
foreach ($t['WarninglistType'] as &$wt) $t['types'][] = $wt['type'];
unset($warninglists[$k]['WarninglistType']);
}
return $warninglists;
}
public function setWarnings(&$event, &$warninglists) {
if (empty($event['objects'])) return $event;
$eventWarnings = array();
debug($warninglists);
foreach ($event['objects'] as &$object) {
foreach ($warninglists as &$list) {
if (in_array($object['type'], $list['types'])) {
$result = $this->__checkValue($list['values'], $object['value'], $object['type'], $list['Warninglist']['type']);
if (!empty($result)) {
$object['warnings'] = $result;
if (!in_array($list['Warninglist']['name'], $eventWarnings)) $eventWarnings[] = $list['Warninglist']['name'];
}
}
}
}
return $event;
}
private function __checkValue(&$listValues, $value, $type, $listType) {
if (strpos($type, '|')) $value = explode('|', $value);
else $value = array($value);
$components = array(0, 1);
foreach ($components as $component) {
if (!isset($value[$component])) continue;
debug($value);
debug($component);
if ($listType === 'cidr') $result = $this->__evalCIDR($listValues, $value[$component]);
else if ($listType === 'string') $result = $this->__evalString($listValues, $value[$component]);
if ($result) return ($component + 1);
}
return false;
}
private function __evalCIDR(&$listValues, $value) {
return false;
}
private function __evalString(&$listValues, $value) {
if (in_array($value, $listValues)) return true;
return false;
}
private function __checkCIDR(&$listValues, $value, $type) {
if (strpos($type, '|')) $value = explode('|', $value);
else $value = array($value);
$components = array(0, 1);
}
}