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

chg: [internal] timestamp resolution for time ranges should reorder the conditions 

- always take from (smaller timestamp) to (larger timestamp), no matter the order which they were entered in
pull/4023/head
iglocska 2019-01-17 10:12:47 +01:00
parent 98248f9706
commit dbb1e01487
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Model/Attribute.php
View File

@ -3294,13 +3294,18 @@ class Attribute extends AppModel
public function setTimestampConditions($timestamp, $conditions, $scope = 'Event.timestamp') public function setTimestampConditions($timestamp, $conditions, $scope = 'Event.timestamp')
{ {
if (is_array($timestamp)) { if (is_array($timestamp)) {
$timestamp[0] = $this->Event->resolveTimeDelta($timestamp[0]); $timestamp[0] = intval($this->Event->resolveTimeDelta($timestamp[0]));
$timestamp[1] = $this->Event->resolveTimeDelta($timestamp[1]); $timestamp[1] = intval($this->Event->resolveTimeDelta($timestamp[1]));
$conditions['AND'][] = array($scope . ' >=' => intval($timestamp[0])); if ($timestamp[0] > $timestamp[1]) {
$conditions['AND'][] = array($scope . ' <=' => intval($timestamp[1])); $temp = $timestamp[0];
$timestamp[0] = $timestamp[1];
$timestamp[1] = $temp;
}
$conditions['AND'][] = array($scope . ' >=' => $timestamp[0]);
$conditions['AND'][] = array($scope . ' <=' => $timestamp[1]);
} else { } else {
$timestamp = $this->Event->resolveTimeDelta($timestamp); $timestamp = intval($this->Event->resolveTimeDelta($timestamp));
$conditions['AND'][] = array($scope . ' >=' => intval($timestamp)); $conditions['AND'][] = array($scope . ' >=' => $timestamp);
} }
return $conditions; return $conditions;
} }