[utils] Add error handling in csvfile validation #251

Fixes #251
1.Add try except blocks to catch the error
2.Add test for the same

Add test for checking invalid file format

Add dummy pdf file

django_freeradius/tests/base/test_utils.py

@@ -7,17 +7,24 @@
 class BaseTestUtils(object):
     def test_find_available_username(self):
         User = get_user_model()
-        User.objects.create(username='rohith', password='password')
-        self.assertEqual(find_available_username('rohith', []), 'rohith1')
-        User.objects.create(username='rohith1', password='password')
-        self.assertEqual(find_available_username('rohith', []), 'rohith2')
+        User.objects.create(username="rohith", password="password")
+        self.assertEqual(find_available_username("rohith", []), "rohith1")
+        User.objects.create(username="rohith1", password="password")
+        self.assertEqual(find_available_username("rohith", []), "rohith2")
 
     def test_validate_csvfile(self):
-        invalid_csv_path = self._get_path('static/test_batch_invalid.csv')
-        improper_csv_path = self._get_path('static/test_batch_improper.csv')
+        invalid_csv_path = self._get_path("static/test_batch_invalid.csv")
+        improper_csv_path = self._get_path("static/test_batch_improper.csv")
+        invalid_format_path = self._get_path("static/test_batch_invalid_format.pdf")
         with self.assertRaises(ValidationError) as error:
-            validate_csvfile(open(invalid_csv_path, 'rt'))
-        self.assertTrue('Enter a valid email address' in error.exception.message)
+            validate_csvfile(open(invalid_format_path, "rb"))
+        self.assertTrue(
+            "Incorrect file format has been uploaded. Please Try Again!"
+            in error.exception.message
+        )
         with self.assertRaises(ValidationError) as error:
-            validate_csvfile(open(improper_csv_path, 'rt'))
-        self.assertTrue('Improper CSV format' in error.exception.message)
+            validate_csvfile(open(invalid_csv_path, "rt"))
+        self.assertTrue("Enter a valid email address" in error.exception.message)
+        with self.assertRaises(ValidationError) as error:
+            validate_csvfile(open(improper_csv_path, "rt"))
+        self.assertTrue("Improper CSV format" in error.exception.message)

django_freeradius/utils.py

@@ -29,7 +29,10 @@ def find_available_username(username, users_list, prefix=False):
 
 def validate_csvfile(csvfile):
     csv_data = csvfile.read()
-    csv_data = csv_data.decode('utf-8') if isinstance(csv_data, bytes) else csv_data
+    try:
+        csv_data = csv_data.decode('utf-8') if isinstance(csv_data, bytes) else csv_data
+    except UnicodeDecodeError:
+        raise ValidationError("Incorrect file format has been uploaded. Please Try Again!")
     reader = csv.reader(StringIO(csv_data), delimiter=',')
     error_message = "The CSV contains a line with invalid data,\
                     line number {} triggered the following error: {}"