Merge pull request #48 from ksonbol/master

Raise ValueError in get_db_prep_value() when value is of invalid length
dcramer · Jan 19, 2015 · a30a1eb · a30a1eb
2 parents 57f6e43 + f00f89d
commit a30a1eb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/uuidfield/fields.py b/uuidfield/fields.py
@@ -118,7 +118,8 @@ def get_db_prep_value(self, value, connection, prepared=False):
             value = str(value)
         if isinstance(value, str):
             if '-' in value:
-                return value.replace('-', '')
+                value = value.replace('-', '')
+            uuid.UUID(value) # raises ValueError with invalid UUID format
         return value
 
     def value_to_string(self, obj):

diff --git a/uuidfield/tests/tests.py b/uuidfield/tests/tests.py
@@ -33,6 +33,24 @@ def test_namespace(self):
         self.assertTrue(isinstance(obj.uuid, uuid.UUID))
         self.assertEquals(obj.uuid.version, 5)
 
+    def test_long_uuid(self):
+        invalid_uuid = "1" * 33
+        self.assertRaises(ValueError, AutoUUIDField.objects.get, uuid=invalid_uuid)
+        q = AutoUUIDField.objects.filter(uuid=invalid_uuid)
+        self.assertRaises(ValueError, list, q)
+
+    def test_short_uuid(self):
+        invalid_uuid = "1" * 31
+        self.assertRaises(ValueError, AutoUUIDField.objects.get, uuid=invalid_uuid)
+        q = AutoUUIDField.objects.filter(uuid=invalid_uuid)
+        self.assertRaises(ValueError, list, q)
+
+    def test_invalid_hex(self):
+        invalid_uuid = 'z' * 32
+        self.assertRaises(ValueError, AutoUUIDField.objects.get, uuid=invalid_uuid)
+        q = AutoUUIDField.objects.filter(uuid=invalid_uuid)
+        self.assertRaises(ValueError, list, q)
+
     def test_broken_namespace(self):
         self.assertRaises(ValueError, BrokenNamespaceUUIDField.objects.create)