From 935437d1bc2cb1f1d6366d94eec936d10c85742f Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 18 Sep 2020 10:55:52 +0200
Subject: [PATCH] chg: [internal] Invalid message for UUID contains that UUID
 must be RFC 4122 compliant

---
 app/Model/Attribute.php       | 2 +-
 app/Model/Dashboard.php       | 4 ++--
 app/Model/Event.php           | 2 +-
 app/Model/EventBlocklist.php  | 4 ++--
 app/Model/MispObject.php      | 2 +-
 app/Model/OrgBlocklist.php    | 2 +-
 app/Model/Organisation.php    | 2 +-
 app/Model/ShadowAttribute.php | 2 +-
 app/Model/SharingGroup.php    | 4 ++--
 app/Model/TagCollection.php   | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 0d2d62af8..5b88465c3 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -548,7 +548,7 @@ class Attribute extends AppModel
         'uuid' => array(
             'uuid' => array(
                 'rule' => 'uuid',
-                'message' => 'Please provide a valid UUID'
+                'message' => 'Please provide a valid RFC 4122 UUID'
             ),
             'unique' => array(
                 'rule' => 'isUnique',
diff --git a/app/Model/Dashboard.php b/app/Model/Dashboard.php
index 7defaadff..48a68ba03 100644
--- a/app/Model/Dashboard.php
+++ b/app/Model/Dashboard.php
@@ -14,8 +14,8 @@ class Dashboard extends AppModel
         'role_id' => 'numeric',
         'uuid' => array(
             'uuid' => array(
-                'rule' => array('uuid'),
-                'message' => 'Please provide a valid UUID'
+                'rule' => 'uuid',
+                'message' => 'Please provide a valid RFC 4122 UUID'
             ),
         )
     );
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 491336a86..cbb8b2ab3 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -291,7 +291,7 @@ class Event extends AppModel
         'uuid' => array(
             'uuid' => array(
                 'rule' => 'uuid',
-                'message' => 'Please provide a valid UUID'
+                'message' => 'Please provide a valid RFC 4122 UUID'
             ),
         ),
         'extends_uuid' => array(
diff --git a/app/Model/EventBlocklist.php b/app/Model/EventBlocklist.php
index 9287cf2e6..401eb0fdc 100644
--- a/app/Model/EventBlocklist.php
+++ b/app/Model/EventBlocklist.php
@@ -25,8 +25,8 @@ class EventBlocklist extends AppModel
                             'message' => 'Event already blocklisted.'
                     ),
                     'uuid' => array(
-                            'rule' => array('uuid'),
-                            'message' => 'Please provide a valid UUID'
+                            'rule' => 'uuid',
+                            'message' => 'Please provide a valid RFC 4122 UUID'
                     ),
             )
     );
diff --git a/app/Model/MispObject.php b/app/Model/MispObject.php
index 5cc6cd126..f566c2f43 100644
--- a/app/Model/MispObject.php
+++ b/app/Model/MispObject.php
@@ -60,7 +60,7 @@ class MispObject extends AppModel
         'uuid' => array(
             'uuid' => array(
                 'rule' => 'uuid',
-                'message' => 'Please provide a valid UUID'
+                'message' => 'Please provide a valid RFC 4122 UUID'
             ),
             'unique' => array(
                 'rule' => 'isUnique',
diff --git a/app/Model/OrgBlocklist.php b/app/Model/OrgBlocklist.php
index 985102da7..a8dfa3df7 100644
--- a/app/Model/OrgBlocklist.php
+++ b/app/Model/OrgBlocklist.php
@@ -25,7 +25,7 @@ class OrgBlocklist extends AppModel
                     ),
                     'uuid' => array(
                         'rule' => 'uuid',
-                        'message' => 'Please provide a valid UUID'
+                        'message' => 'Please provide a valid RFC 4122 UUID'
                     ),
             )
     );
diff --git a/app/Model/Organisation.php b/app/Model/Organisation.php
index 20979f6e6..39031dadd 100644
--- a/app/Model/Organisation.php
+++ b/app/Model/Organisation.php
@@ -35,7 +35,7 @@ class Organisation extends AppModel
             ),
             'uuid' => array(
                 'rule' => 'uuid',
-                'message' => 'Please provide a valid UUID',
+                'message' => 'Please provide a valid RFC 4122 UUID',
                 'allowEmpty' => true
             ),
             'valueNotEmpty' => array(
diff --git a/app/Model/ShadowAttribute.php b/app/Model/ShadowAttribute.php
index 16b369bc2..5d1fbc391 100644
--- a/app/Model/ShadowAttribute.php
+++ b/app/Model/ShadowAttribute.php
@@ -129,7 +129,7 @@ class ShadowAttribute extends AppModel
         'uuid' => array(
             'uuid' => array(
                 'rule' => 'uuid',
-                'message' => 'Please provide a valid UUID'
+                'message' => 'Please provide a valid RFC 4122 UUID'
             ),
         ),
         'proposal_to_delete' => array(
diff --git a/app/Model/SharingGroup.php b/app/Model/SharingGroup.php
index 07562a39f..5719d1513 100644
--- a/app/Model/SharingGroup.php
+++ b/app/Model/SharingGroup.php
@@ -24,8 +24,8 @@ class SharingGroup extends AppModel
         ),
         'uuid' => array(
             'uuid' => array(
-                'rule' => array('uuid'),
-                'message' => 'Please provide a valid UUID'
+                'rule' => 'uuid',
+                'message' => 'Please provide a valid RFC 4122 UUID'
             ),
         )
     );
diff --git a/app/Model/TagCollection.php b/app/Model/TagCollection.php
index d55f587ff..86ad7d343 100644
--- a/app/Model/TagCollection.php
+++ b/app/Model/TagCollection.php
@@ -46,7 +46,7 @@ class TagCollection extends AppModel
         'uuid' => array(
             'uuid' => array(
                 'rule' => 'uuid',
-                'message' => 'Please provide a valid UUID'
+                'message' => 'Please provide a valid RFC 4122 UUID'
             ),
         ),
     );