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

Merge branch 'develop' of github.com:MISP/MISP into develop

feature/event-view-collapsible-objects
Sami Mokaddem 2024-05-03 10:58:00 +02:00
parent 5a33d20806 9ec53daf44
commit accd12f00c
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":4, "hotfix":191}
{"major":2, "minor":4, "hotfix":192}

2
app/Controller/Component/ACLComponent.php
View File

@ -794,7 +794,7 @@ class ACLComponent extends Component
'discardRegistrations' => array(),
'downloadTerms' => array('*'),
'edit' => array('self_management_enabled'),
'email_otp' => array('otp_enabled'),
'email_otp' => array('*'),
'forgot' => ['AND' => ['password_forgotten_enabled', 'password_change_enabled']],
'otp' => ['otp_enabled'],
'hotp' => ['otp_enabled'],

3
app/Model/Event.php
View File

@ -5006,6 +5006,9 @@ class Event extends AppModel
$include = $include && ($filterType['correlation'] == 1);
} else { // `exclude`
$include = $include && ($filterType['correlation'] == 2);
if (!empty($attribute['over_correlation'])) {
$include = false;
}
}
if ($filterType['correlationId'] && $include) {