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

fix: [event index] search via attribute key allows for empty input now

pull/6596/head
iglocska 2020-11-16 16:17:47 +01:00
parent 5a29fcc370
commit 459144011e
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Controller/EventsController.php
View File

@ -109,14 +109,17 @@ class EventsController extends AppController
*/ */
private function __filterOnAttributeValue($value) private function __filterOnAttributeValue($value)
{ {
// dissect the value
$include = array();
$exclude = array();
$includeIDs = [];
$excludeIDs = [];
if (!empty($value)) {
if (!is_array($value)) { if (!is_array($value)) {
$pieces = explode('|', strtolower($value)); $pieces = explode('|', strtolower($value));
} else { } else {
$pieces = $value; $pieces = $value;
} }
// dissect the value
$include = array();
$exclude = array();
foreach ($pieces as $piece) { foreach ($pieces as $piece) {
if ($piece[0] === '!') { if ($piece[0] === '!') {
@ -126,7 +129,6 @@ class EventsController extends AppController
} }
} }
$includeIDs = array();
if (!empty($include)) { if (!empty($include)) {
$includeConditions = []; $includeConditions = [];
foreach ($include as $i) { foreach ($include as $i) {
@ -142,7 +144,6 @@ class EventsController extends AppController
))); )));
} }
$excludeIDs = array();
if (!empty($exclude)) { if (!empty($exclude)) {
$excludeConditions = []; $excludeConditions = [];
foreach ($exclude as $e) { foreach ($exclude as $e) {
@ -157,6 +158,7 @@ class EventsController extends AppController
'list' => true, 'list' => true,
))); )));
} }
}
// return -1 as the only value in includedIDs if both arrays are empty. This will mean that no events will be shown if there was no hit // return -1 as the only value in includedIDs if both arrays are empty. This will mean that no events will be shown if there was no hit
if (empty($includeIDs) && empty($excludeIDs)) { if (empty($includeIDs) && empty($excludeIDs)) {
$includeIDs[] = -1; $includeIDs[] = -1;