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

chg: [internal] Ensure that UUID is always lowecase and real UUID

pull/6272/head
Jakub Onderka 2020-09-01 19:05:06 +02:00
parent 9dca20367d
commit 0e916bd364
9 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Model/Attribute.php
View File

@ -547,7 +547,7 @@ class Attribute extends AppModel
),
'uuid' => array(
'uuid' => array(
'rule' => array('custom', '/^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/'),
'rule' => 'uuid',
'message' => 'Please provide a valid UUID'
),
'unique' => array(
@ -870,6 +870,8 @@ class Attribute extends AppModel
// generate UUID if it doesn't exist
if (empty($this->data['Attribute']['uuid'])) {
$this->data['Attribute']['uuid'] = CakeText::uuid();
} else {
$this->data['Attribute']['uuid'] = strtolower($this->data['Attribute']['uuid']);
}
// generate timestamp if it doesn't exist
if (empty($this->data['Attribute']['timestamp'])) {

2
app/Model/Dashboard.php
View File

@ -14,7 +14,7 @@ class Dashboard extends AppModel
'role_id' => 'numeric',
'uuid' => array(
'uuid' => array(
'rule' => array('custom', '/^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/'),
'rule' => array('uuid'),
'message' => 'Please provide a valid UUID'
),
)

10
app/Model/Event.php
View File

@ -242,7 +242,6 @@ class Event extends AppModel
'message' => 'Options : 1, 2, 3, 4 (for High, Medium, Low, Undefined)',
'required' => true
),
'distribution' => array(
'not_empty_if_sg' => array(
'rule' => array('inList', array('0', '1', '2', '3', '4')),
@ -253,7 +252,6 @@ class Event extends AppModel
//'on' => 'create', // Limit validation to 'create' or 'update' operations
)
),
'sharing_group_id' => array(
'rule' => array('sharingGroupRequired'),
'message' => 'If the distribution is set to "Sharing Group", a sharing group has to be selected.',
@ -292,13 +290,13 @@ class Event extends AppModel
),
'uuid' => array(
'uuid' => array(
'rule' => array('custom', '/^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/'),
'rule' => 'uuid',
'message' => 'Please provide a valid UUID'
),
),
'extends_uuid' => array(
'uuid' => array(
'rule' => array('custom', '/^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/'),
'rule' => 'uuid',
'message' => 'Please provide a valid UUID',
'allowEmpty' => true
)
@ -577,6 +575,8 @@ class Event extends AppModel
// generate UUID if it doesn't exist
if (empty($this->data['Event']['uuid'])) {
$this->data['Event']['uuid'] = CakeText::uuid();
} else {
$this->data['Event']['uuid'] = strtolower($this->data['Event']['uuid'] );
}
// Convert event ID to uuid if needed
@ -591,6 +591,8 @@ class Event extends AppModel
} else {
$this->data['Event']['extends_uuid'] = $extended_event['Event']['uuid'];
}
} else if (!empty($this->data['Event']['extends_uuid'])) {
$this->data['Event']['extends_uuid'] = strtolower($this->data['Event']['extends_uuid']);
}
// generate timestamp if it doesn't exist

2
app/Model/MispObject.php
View File

@ -59,7 +59,7 @@ class MispObject extends AppModel
public $validate = array(
'uuid' => array(
'uuid' => array(
'rule' => array('custom', '/^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/'),
'rule' => 'uuid',
'message' => 'Please provide a valid UUID'
),
'unique' => array(

2
app/Model/OrgBlocklist.php
View File

@ -24,7 +24,7 @@ class OrgBlocklist extends AppModel
'message' => 'Organisation already blocklisted.'
),
'uuid' => array(
'rule' => array('custom', '/^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/'),
'rule' => 'uuid',
'message' => 'Please provide a valid UUID'
),
)

6
app/Model/Organisation.php
View File

@ -33,8 +33,8 @@ class Organisation extends AppModel
'rule' => 'isUnique',
'message' => 'An organisation with this UUID already exists.'
),
'simpleuuid' => array(
'rule' => array('custom', '/^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/'),
'uuid' => array(
'rule' => 'uuid',
'message' => 'Please provide a valid UUID',
'allowEmpty' => true
),
@ -88,7 +88,7 @@ class Organisation extends AppModel
if (empty($this->data['Organisation']['uuid'])) {
$this->data['Organisation']['uuid'] = CakeText::uuid();
} else {
$this->data['Organisation']['uuid'] = trim($this->data['Organisation']['uuid']);
$this->data['Organisation']['uuid'] = strtolower(trim($this->data['Organisation']['uuid']));
}
$date = date('Y-m-d H:i:s');
if (!empty($this->data['Organisation']['restricted_to_domain'])) {

4
app/Model/ShadowAttribute.php
View File

@ -128,7 +128,7 @@ class ShadowAttribute extends AppModel
),
'uuid' => array(
'uuid' => array(
'rule' => array('custom', '/^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/'),
'rule' => 'uuid',
'message' => 'Please provide a valid UUID'
),
),
@ -331,6 +331,8 @@ class ShadowAttribute extends AppModel
// generate UUID if it doesn't exist
if (empty($this->data['ShadowAttribute']['uuid'])) {
$this->data['ShadowAttribute']['uuid'] = CakeText::uuid();
} else {
$this->data['ShadowAttribute']['uuid'] = strtolower($this->data['ShadowAttribute']['uuid']);
}
if (!empty($this->data['ShadowAttribute']['type']) && empty($this->data['ShadowAttribute']['category'])) {

4
app/Model/SharingGroup.php
View File

@ -24,7 +24,7 @@ class SharingGroup extends AppModel
),
'uuid' => array(
'uuid' => array(
'rule' => array('custom', '/^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/'),
'rule' => array('uuid'),
'message' => 'Please provide a valid UUID'
),
)
@ -65,6 +65,8 @@ class SharingGroup extends AppModel
parent::beforeValidate();
if (empty($this->data['SharingGroup']['uuid'])) {
$this->data['SharingGroup']['uuid'] = CakeText::uuid();
} else {
$this->data['SharingGroup']['uuid'] = strtolower($this->data['SharingGroup']['uuid']);
}
$date = date('Y-m-d H:i:s');
if (empty($this->data['SharingGroup']['created'])) {

10
app/Model/TagCollection.php
View File

@ -42,7 +42,13 @@ class TagCollection extends AppModel
'rule' => 'isUnique',
'message' => 'A similar name already exists.',
),
)
),
'uuid' => array(
'uuid' => array(
'rule' => 'uuid',
'message' => 'Please provide a valid UUID'
),
),
);
public function beforeValidate($options = array())
@ -51,6 +57,8 @@ class TagCollection extends AppModel
// generate UUID if it doesn't exist
if (empty($this->data['TagCollection']['uuid'])) {
$this->data['TagCollection']['uuid'] = CakeText::uuid();
} else {
$this->data['TagCollection']['uuid'] = strtolower($this->data['TagCollection']['uuid']);
}
return true;
}