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

fix: [decaying:import] Force somes fields to be present while importing 

a decaying model
pull/5154/head
mokaddem 2019-09-12 18:52:00 +02:00
parent c0aec75a09
commit 3402318fa8
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Model/DecayingModel.php
View File

@ -51,6 +51,13 @@ class DecayingModel extends AppModel
public function beforeValidate($options = array()) {
parent::beforeValidate();
if (!isset($this->data['DecayingModel']['name'])) { // Model must have a name
return false;
}
if (!isset($this->data['DecayingModel']['all_orgs'])) { // visible to all orgs by default
$this->data['DecayingModel']['all_orgs'] = 1;
}
if (!isset($this->data['DecayingModel']['formula'])) { // default to polynomial
$this->data['DecayingModel']['formula'] = 'polynomial';
}
@ -73,8 +80,10 @@ class DecayingModel extends AppModel
}
}
if (!isset($this->data['DecayingModel']['parameters'])) {
$this->data['DecayingModel']['parameters'] = array('threshold' => 0, 'lifetime' => 0, 'decay_speed' => 0);
}
if (
isset($this->data['DecayingModel']['parameters']) &&
!empty($this->data['DecayingModel']['parameters']) &&
!is_array($this->data['DecayingModel']['parameters'])
) {
@ -84,11 +93,10 @@ class DecayingModel extends AppModel
}
$encoded = $this->__adjustParameters($encoded);
$this->data['DecayingModel']['parameters'] = json_encode($encoded);
return true;
} else {
$this->data['DecayingModel']['parameters'] = $this->__adjustParameters($this->data['DecayingModel']['parameters']);
return $this->data['DecayingModel']['parameters'];
}
return true;
}
public function beforeSave($options = array()) {