[change] Adds check for valid prefix in batch creation (Closes openwi…

…sp#365) * [change] Adds check to prevent invalid username in batch creation openwisp#365 * [change] Adds check for valid prefix in batch creation openwisp#365 Closes openwisp#365
dishantsethi · Feb 8, 2022 · e23afdc · e23afdc
1 parent 81cefaf
commit e23afdc
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/openwisp_radius/base/models.py b/openwisp_radius/base/models.py
@@ -3,6 +3,7 @@
 import json
 import logging
 import os
+import string
 from base64 import encodebytes
 from datetime import timedelta
 from hashlib import md5, sha1
@@ -893,6 +894,19 @@ def clean(self):
             raise ValidationError(
                 {'prefix': _('This field cannot be blank.')}, code='invalid'
             )
+        if self.strategy == 'prefix' and self.prefix:
+            valid_chars = string.ascii_letters + string.digits + "@.+-_"
+            for char in self.prefix:
+                if char not in valid_chars:
+                    raise ValidationError(
+                        {
+                            'prefix': _(
+                                'This value may contain only \
+                        letters, numbers, and @/./+/-/_ characters.'
+                            )
+                        },
+                        code='invalid',
+                    )
         if (
             self.strategy == 'csv'
             and self.prefix

diff --git a/openwisp_radius/tests/test_batch_add_users.py b/openwisp_radius/tests/test_batch_add_users.py
@@ -1,3 +1,5 @@
+from django.core.exceptions import ValidationError
+
 from ..utils import load_model
 from . import FileMixin
 from .mixins import BaseTestCase
@@ -79,3 +81,30 @@ def test_hashed_password(self):
         self.assertEqual(batch.users.all().count(), 1)
         user = batch.users.first()
         self.assertEqual(hashed_password, user.password)
+
+
+class TestPrefixUpload(FileMixin, BaseTestCase):
+    def test_invalid_username(self):
+        self.assertRaises(
+            ValidationError,
+            self._create_radius_batch,
+            name='test',
+            strategy='prefix',
+            prefix="Test#1",
+        )
+
+    def test_valid_username(self):
+        batch = self._create_radius_batch(
+            name='test', strategy='prefix', prefix='Test1'
+        )
+        batch.prefix_add('test-prefix16', 5)
+        self.assertEqual(RadiusBatch.objects.all().count(), 1)
+        self.assertEqual(batch.users.all().count(), 5)
+
+    def test_valid_username_special_char(self):
+        batch = self._create_radius_batch(
+            name='test', strategy='prefix', prefix='Test_@+-.'
+        )
+        batch.prefix_add('test-prefix16', 5)
+        self.assertEqual(RadiusBatch.objects.all().count(), 1)
+        self.assertEqual(batch.users.all().count(), 5)