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

fix: Fixed an issue where certain filters removed some elements from the object counter, fixes #2151

pull/2155/head
iglocska 2017-04-27 17:09:26 +02:00
parent d33b3b1434
commit ecf00e8c65
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/EventsController.php
View File

@ -778,7 +778,8 @@ class EventsController extends AppController {
private function __viewUI($event, $continue, $fromEvent) {
$emptyEvent = (!isset($event['Attribute']) || empty($event['Attribute']));
$this->set('emptyEvent', $emptyEvent);
$this->set('attribute_count', isset($event['Attribute']) ? count($event['Attribute']) : 0);
$attributeCount = isset($event['Attribute']) ? count($event['Attribute']) : 0;
$this->set('attribute_count', $attributeCount);
// set the data for the contributors / history field
$org_ids = $this->Event->ShadowAttribute->getEventContributors($event['Event']['id']);
$contributors = $this->Event->Org->find('list', array('fields' => array('Org.name'), 'conditions' => array('Org.id' => $org_ids)));

17
app/Model/Event.php
View File

@ -672,7 +672,8 @@ class Event extends AppModel {
'fields' => $settings[$context]['correlationModel'] . '.*',
'conditions' => $conditionsCorrelation,
'recursive' => 0,
'order' => array($settings[$context]['correlationModel'] . '.event_id DESC')));
'order' => false
));
$relatedAttributes = array();
foreach ($correlations as $correlation) {
$current = array(
@ -769,7 +770,7 @@ class Event extends AppModel {
$unpublish_event = $server['Server']['unpublish_event'];
if ($unpublish_event) {
$event['Event']['published'] = 0;
}
}
$updated = null;
$newLocation = $newTextBody = '';
$result = $this->restfulEventToServer($event, $server, null, $newLocation, $newTextBody, $HttpSocket);
@ -3030,12 +3031,17 @@ class Event extends AppModel {
$eventArray = array();
$correlatedAttributes = isset($event['RelatedAttribute']) ? array_keys($event['RelatedAttribute']) : array();
$correlatedShadowAttributes = isset($event['RelatedShadowAttribute']) ? array_keys($event['RelatedShadowAttribute']) : array();
$totalElements = count($event['Attribute']);
foreach ($event['Attribute'] as $attribute) {
$totalElements += isset($attribute['ShadowAttribute']) ? count($attribute['ShadowAttribute']) : 0;
if ($filterType && !in_array($filterType, array('proposal', 'correlation', 'warning'))) if (!in_array($attribute['type'], $this->Attribute->typeGroupings[$filterType])) continue;
if (isset($attribute['distribution']) && $attribute['distribution'] != 4) unset($attribute['SharingGroup']);
$attribute['objectType'] = 0;
if (!empty($attribute['ShadowAttribute'])) $attribute['hasChildren'] = 1;
else $attribute['hasChildren'] = 0;
if (!empty($attribute['ShadowAttribute'])) {
$attribute['hasChildren'] = 1;
} else {
$attribute['hasChildren'] = 0;
}
if ($filterType === 'proposal' && $attribute['hasChildren'] == 0) continue;
if ($filterType === 'correlation' && !in_array($attribute['id'], $correlatedAttributes)) continue;
if ($attribute['type'] == 'attachment' && preg_match('/.*\.(jpg|png|jpeg|gif)$/i', $attribute['value'])) {
@ -3045,6 +3051,7 @@ class Event extends AppModel {
}
unset($event['Attribute']);
if (isset($event['ShadowAttribute'])) {
$totalElements += count($event['ShadowAttribute']);
foreach ($event['ShadowAttribute'] as $shadowAttribute) {
if ($filterType === 'correlation' && !in_array($shadowAttribute['id'], $correlatedShadowAttributes)) continue;
if ($filterType && !in_array($filterType, array('proposal', 'correlation', 'warning'))) if (!in_array($attribute['type'], $this->Attribute->typeGroupings[$filterType])) continue;
@ -3060,7 +3067,6 @@ class Event extends AppModel {
$customPagination = new CustomPaginationTool();
if ($all) $passedArgs['page'] = 0;
$eventArrayWithProposals = array();
foreach ($eventArray as $k => &$object) {
if ($object['category'] === 'Financial fraud') {
if (!$fTool->validateRouter($object['type'], $object['value'])) {
@ -3095,6 +3101,7 @@ class Event extends AppModel {
$event['objects'] = array_values($event['objects']);
}
$params = $customPagination->applyRulesOnArray($event['objects'], $passedArgs, 'events', 'category');
$params['total_elements'] = $totalElements;
return $params;
}

2
app/View/Elements/eventattribute.ctp
View File

@ -117,7 +117,7 @@
</div>
<div class="tabMenu tabMenuFiltersBlock noPrint" style="padding-right:0px !important;">
<span id="filter_header" class="attribute_filter_header">Filters: </span>
<div id="filter_all" title="Show all attributes" role="button" tabindex="0" aria-label="Show all attributes" class="attribute_filter_text<?php if ($attributeFilter == 'all') echo '_active'; ?>" onClick="filterAttributes('all', '<?php echo h($event['Event']['id']); ?>');">All (<?php echo h($this->Paginator->params()['count']); ?>)</div>
<div id="filter_all" title="Show all attributes" role="button" tabindex="0" aria-label="Show all attributes" class="attribute_filter_text<?php if ($attributeFilter == 'all') echo '_active'; ?>" onClick="filterAttributes('all', '<?php echo h($event['Event']['id']); ?>');">All (<?php echo h($this->Paginator->params()['total_elements']); ?>)</div>
<?php foreach ($typeGroups as $group): ?>
<div id="filter_<?php echo h($group); ?>" title="Only show <?php echo $group; ?> related attributes" role="button" tabindex="0" aria-label="Only show <?php echo h($group); ?> related attributes" class="attribute_filter_text<?php if ($attributeFilter == $group) echo '_active'; ?>" onClick="filterAttributes('<?php echo $group; ?>', '<?php echo h($event['Event']['id']); ?>');"><?php echo ucfirst($group); ?></div>
<?php endforeach; ?>