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

chg: [attribute search] rework 

- Massive performance improvement when using MysqlExtended or MysqlObserverExtended data sources
- event level lookup moved to subqueries, allowing for simpler, much faster indexed queries
- Ignoring the deleted index as it slows things down
pull/9631/head
iglocska 2024-03-20 13:07:10 +01:00
parent 7072451d0f
commit 94d7537eec
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Model/Attribute.php
View File

@ -1549,11 +1549,26 @@
if (!$user['Role']['perm_site_admin']) {
$sgids = $this->SharingGroup->authorizedIds($user);
$eventConditions = $this->Event->createEventConditions($user, true);
$subQuery1 = [
'conditions' => ['org_id' => $user['org_id']],
'fields' => ['id']
];
$subQuery2 = [
'conditions' => ['distribution IN' => [1, 2, 3]],
'fields' => ['id']
];
$subQuery3 = [
'conditions' => ['Event.distribution' => 4, 'Event.sharing_group_id IN' => $sgids],
'fields' => ['id']
];
$conditions = [
'OR' => [
'Event.org_id' => $user['org_id'],
$this->subQueryGenerator($this->Event, $subQuery1, 'Attribute.event_id'),
'AND' => [
$eventConditions['AND'],
'OR' => [
$this->subQueryGenerator($this->Event, $subQuery2, 'Attribute.event_id'),
$this->subQueryGenerator($this->Event, $subQuery3, 'Attribute.event_id')
],
[
'OR' => [
'Attribute.distribution' => [1, 2, 3, 5],
@ -1886,8 +1901,8 @@
}
$eventTags = []; // tag cache
$attributes = [];
$params['ignoreIndexHint'] = 'deleted';
do {
$continue = true;
$results = $this->find('all', $params);
if (empty($results)) {
break;