Merge pull request #845 from simonLeary42/literal-eval-syntax-error

catch SyntaxError from literal_eval

Author: aebruno

coldfront/core/allocation/models.py

@@ -478,18 +478,24 @@ def clean(self):
 
         expected_value_type = self.allocation_attribute_type.attribute_type.name.strip()
 
-        if expected_value_type == "Int" and not isinstance(literal_eval(self.value), int):
-            raise ValidationError(
-                'Invalid Value "%s" for "%s". Value must be an integer.'
-                % (self.value, self.allocation_attribute_type.name)
-            )
-        elif expected_value_type == "Float" and not (
-            isinstance(literal_eval(self.value), float) or isinstance(literal_eval(self.value), int)
-        ):
-            raise ValidationError(
-                'Invalid Value "%s" for "%s". Value must be a float.'
-                % (self.value, self.allocation_attribute_type.name)
-            )
+        if expected_value_type == "Int":
+            try:
+                if not isinstance(literal_eval(self.value), int):
+                    raise TypeError
+            except (ValueError, TypeError, SyntaxError, MemoryError, RecursionError) as e:
+                raise ValidationError(
+                    'Invalid Value "%s" for "%s". Value must be an integer.'
+                    % (self.value, self.allocation_attribute_type.name)
+                ) from e
+        elif expected_value_type == "Float":
+            try:
+                if not (isinstance(literal_eval(self.value), int) or isinstance(literal_eval(self.value), float)):
+                    raise TypeError
+            except (ValueError, TypeError, SyntaxError, MemoryError, RecursionError) as e:
+                raise ValidationError(
+                    'Invalid Value "%s" for "%s". Value must be a float.'
+                    % (self.value, self.allocation_attribute_type.name)
+                ) from e
         elif expected_value_type == "Yes/No" and self.value not in ["Yes", "No"]:
             raise ValidationError(
                 'Invalid Value "%s" for "%s". Allowed inputs are "Yes" or "No".'

coldfront/core/allocation/tests/test_models.py

@@ -5,6 +5,7 @@
 """Unit tests for the allocation models"""
 
 import datetime
+import sys
 from unittest.mock import patch
 
 from django.contrib.auth.models import User
@@ -18,6 +19,9 @@
 )
 from coldfront.core.project.models import Project
 from coldfront.core.test_helpers.factories import (
+    AAttributeTypeFactory,
+    AllocationAttributeFactory,
+    AllocationAttributeTypeFactory,
     AllocationFactory,
     AllocationStatusChoiceFactory,
     ProjectFactory,
@@ -145,6 +149,55 @@ def test_status_is_active_and_start_date_equals_end_date_no_error(self):
         actual_allocation.full_clean()
 
 
+class AllocationAttributeModelCleanMethodTests(TestCase):
+    def _test_clean(
+        self, allocation_attribute_type_name: str, allocation_attribute_values: list, expect_validation_error: bool
+    ):
+        attribute_type = AAttributeTypeFactory(name=allocation_attribute_type_name)
+        allocation_attribute_type = AllocationAttributeTypeFactory(attribute_type=attribute_type)
+        allocation_attribute = AllocationAttributeFactory(allocation_attribute_type=allocation_attribute_type)
+        for value in allocation_attribute_values:
+            with self.subTest(value=value):
+                if not isinstance(value, str):
+                    raise TypeError("allocation attribute value must be a string")
+                allocation_attribute.value = value
+                if expect_validation_error:
+                    with self.assertRaises(ValidationError):
+                        allocation_attribute.clean()
+                else:
+                    allocation_attribute.clean()
+
+    def test_expect_int_given_int(self):
+        self._test_clean("Int", ["-1", "0", "1", str(sys.maxsize)], False)
+
+    def test_expect_int_given_float(self):
+        self._test_clean("Int", ["-1.0", "0.0", "1.0", "2e30"], True)
+
+    def test_expect_int_given_garbage(self):
+        self._test_clean("Int", ["foobar", "", " ", "\0", "1j"], True)
+
+    def test_expect_float_given_int(self):
+        self._test_clean("Float", ["-1", "0", "1", str(sys.maxsize)], False)
+
+    def test_expect_float_given_float(self):
+        self._test_clean("Float", ["-1.0", "0.0", "1.0", "2e30"], False)
+
+    def test_expect_float_given_garbage(self):
+        self._test_clean("Float", ["foobar", "", " ", "\0", "1j"], True)
+
+    def test_expect_yes_no_given_yes_no(self):
+        self._test_clean("Yes/No", ["Yes", "No"], False)
+
+    def test_expect_yes_no_given_garbage(self):
+        self._test_clean("Yes/No", ["foobar", "", " ", "\0", "1", "1.0", "2e30", "1j", "yes", "no", "YES", "NO"], True)
+
+    def test_expect_date_given_date(self):
+        self._test_clean("Date", ["1970-01-01"], False)
+
+    def test_expect_date_given_garbage(self):
+        self._test_clean("Date", ["foobar", "", " ", "\0", "1", "1.0", "2e30", "1j"], True)
+
+
 class AllocationModelStrTests(TestCase):
     """Tests for Allocation.__str__"""