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

chg: [internal] Another bunch of event filter optim

pull/7748/head
Jakub Onderka 2021-09-13 23:58:10 +02:00
parent 76ac169810
commit a3d1ff8762
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Controller/EventsController.php
View File

@ -312,7 +312,7 @@ class EventsController extends AppController
$eventidConditions = array();
foreach ($pieces as $piece) {
$piece = trim($piece);
if ($piece[0] == '!') {
if ($piece[0] === '!') {
if (strlen($piece) === 37) {
$eventidConditions['NOT']['uuid'][] = substr($piece, 1);
} else {
@ -435,7 +435,7 @@ class EventsController extends AppController
$pieces = explode('|', $v);
$test = array();
foreach ($pieces as $piece) {
if ($piece[0] == '!') {
if ($piece[0] === '!') {
$this->paginate['conditions']['AND'][] = array('Event.sharing_group_id !=' => substr($piece, 1));
} else {
$test['OR'][] = array('Event.sharing_group_id' => $piece);
@ -454,9 +454,9 @@ class EventsController extends AppController
$test = array();
foreach ($pieces as $piece) {
if ($piece[0] == '!') {
$this->paginate['conditions']['AND'][] = array('lower(Event.info) NOT LIKE' => '%' . strtolower(substr($piece, 1)) . '%');
$this->paginate['conditions']['AND'][] = array('lower(Event.info) NOT LIKE' => '%' . mb_strtolower(substr($piece, 1)) . '%');
} else {
$test['OR'][] = array('lower(Event.info) LIKE' => '%' . strtolower($piece) . '%');
$test['OR'][] = array('lower(Event.info) LIKE' => '%' . mb_strtolower($piece) . '%');
}
}
$this->paginate['conditions']['AND'][] = $test;
@ -472,11 +472,11 @@ class EventsController extends AppController
$setOR = false;
$tagRules = [];
foreach ($pieces as $piece) {
if ($piece[0] == '!') {
if ($piece[0] === '!') {
if (is_numeric(substr($piece, 1))) {
$conditions = array('OR' => array('Tag.id' => substr($piece, 1)));
$conditions = array('Tag.id' => substr($piece, 1));
} else {
$conditions = array('OR' => array('Tag.name' => substr($piece, 1)));
$conditions = array('Tag.name' => substr($piece, 1));
}
$tagName = $this->Event->EventTag->Tag->find('first', array(
'conditions' => $conditions,
@ -506,9 +506,9 @@ class EventsController extends AppController
} else {
$expectOR = true;
if (is_numeric($piece)) {
$conditions = array('OR' => array('Tag.id' => $piece));
$conditions = array('Tag.id' => $piece);
} else {
$conditions = array('OR' => array('Tag.name' => $piece));
$conditions = array('Tag.name' => $piece);
}
$tagName = $this->Event->EventTag->Tag->find('first', array(
@ -559,7 +559,7 @@ class EventsController extends AppController
$users = $this->Event->User->find('column', array(
'recursive' => -1,
'fields' => array('User.id'),
'conditions' => array('lower(User.email) LIKE' => '%' . strtolower(substr($piece, 1)) . '%')
'conditions' => array('User.email LIKE' => '%' . strtolower(substr($piece, 1)) . '%')
));
if (!empty($users)) {
$this->paginate['conditions']['AND'][] = array('Event.user_id !=' => $users);
@ -568,7 +568,7 @@ class EventsController extends AppController
$users = $this->Event->User->find('column', array(
'recursive' => -1,
'fields' => array('User.id'),
'conditions' => array('lower(User.email) LIKE' => '%' . strtolower($piece) . '%')
'conditions' => array('User.email LIKE' => '%' . strtolower($piece) . '%')
));
if (!empty($users)) {
$test['OR'][] = array('Event.user_id' => $users);
@ -596,7 +596,7 @@ class EventsController extends AppController
} else {
$terms = $this->Event->distributionLevels;
}
$pieces = is_array($v) ? $v : explode('|', $v);
$pieces = is_array($v) ? $v : explode('|', $v);
$test = array();
foreach ($pieces as $piece) {
if ($filterString != "") {

4
app/Model/AppModel.php
View File

@ -3013,10 +3013,10 @@ class AppModel extends Model
}
$multiplierArray = array('d' => 86400, 'h' => 3600, 'm' => 60, 's' => 1);
$lastChar = strtolower(substr($delta, -1));
if (!is_numeric($lastChar) && array_key_exists($lastChar, $multiplierArray)) {
if (!is_numeric($lastChar) && isset($multiplierArray[$lastChar])) {
$multiplier = $multiplierArray[$lastChar];
$delta = substr($delta, 0, -1);
} else if(strtotime($delta) !== false) {
} else if (strtotime($delta) !== false) {
return strtotime($delta);
} else {
// invalid filter, make sure we don't return anything