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

fix: [correlation] MISP.enable_advanced_correlations config option works again

pull/8356/head
Jakub Onderka 2022-05-09 21:53:37 +02:00
parent 6951643d30
commit 3ccf211bae
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Model/Correlation.php
View File

@ -33,11 +33,15 @@ class Correlation extends AppModel
/** @var bool */
private $deadlockAvoidance;
/** @var bool */
private $advancedCorrelationEnabled;
public function __construct($id = false, $table = null, $ds = null)
{
parent::__construct($id, $table, $ds);
$this->oldSchema = $this->schema('date') !== null;
$this->deadlockAvoidance = Configure::read('MISP.deadlock_avoidance');
$this->advancedCorrelationEnabled = (bool)Configure::read('MISP.enable_advanced_correlations');
}
public function correlateValueRouter($value)
@ -78,18 +82,21 @@ class Correlation extends AppModel
*/
private function __buildAdvancedCorrelationConditions($attribute)
{
$extraConditions = null;
if (in_array($attribute['type'], ['ip-src', 'ip-dst', 'ip-src|port', 'ip-dst|port'], true)) {
$extraConditions = $this->cidrCorrelation($attribute);
} else if ($attribute['type'] === 'ssdeep' && function_exists('ssdeep_fuzzy_compare')) {
$extraConditions = $this->ssdeepCorrelation($attribute);
if (!$this->advancedCorrelationEnabled) {
return null;
}
return $extraConditions;
if (in_array($attribute['type'], ['ip-src', 'ip-dst', 'ip-src|port', 'ip-dst|port'], true)) {
return $this->cidrCorrelation($attribute);
} else if ($attribute['type'] === 'ssdeep' && function_exists('ssdeep_fuzzy_compare')) {
return $this->ssdeepCorrelation($attribute);
}
return null;
}
private function __addAdvancedCorrelations($correlatingAttribute)
{
if (empty(Configure::read('MISP.enable_advanced_correlations'))) {
if (!$this->advancedCorrelationEnabled) {
return [];
}
$extraConditions = $this->__buildAdvancedCorrelationConditions($correlatingAttribute['Attribute']);