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

fix: [performance] Changed regex clean all function to work in a chunked fashion

pull/3470/head
iglocska 2018-07-07 21:30:50 +02:00
parent fc3935e394
commit f89d6ba582
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Controller/RegexpController.php
View File

@ -157,16 +157,25 @@ class RegexpController extends AppController {
$deletable = array();
$modifications = 0;
$this->loadModel('Attribute');
$all = $this->Attribute->find('all', array('recursive' => -1));
foreach ($all as $item) {
$result = $this->Regexp->replaceSpecific($item['Attribute']['value'], $allRegexp, $item['Attribute']['type']);
// 0 = delete it, it is a blocked regexp; 1 = ran regexp check, made changes, resave this attribute with the new value; 2 = ran regexp check, no changes made, go on
if ($result == 0) $deletable[] = $item['Attribute']['id'];
else {
// Until now this wasn't checked and all attributes were resaved, no matter if they were changed...
if ($result == 1) {
$this->Attribute->save($item);
$modifications++;
$count = $this->Attribute->find('count', array());
$chunks = ceil($count / 1000);
for ($i = 1; $i <= $chunks; $i++) {
$all = $this->Attribute->find('all', array(
'recursive' => -1,
'deleted' => 0,
'limit' => 1000,
'page' => $i
));
foreach ($all as $item) {
$result = $this->Regexp->replaceSpecific($item['Attribute']['value'], $allRegexp, $item['Attribute']['type']);
// 0 = delete it, it is a blocked regexp; 1 = ran regexp check, made changes, resave this attribute with the new value; 2 = ran regexp check, no changes made, go on
if ($result == 0) $deletable[] = $item['Attribute']['id'];
else {
// Until now this wasn't checked and all attributes were resaved, no matter if they were changed...
if ($result == 1) {
$this->Attribute->save($item);
$modifications++;
}
}
}
}