Match lang param with regex, update unit tests

qgis · Jul 30, 2024 · 1e58dd0 · 1e58dd0
1 parent b129ea4
commit 1e58dd0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/qgisfeedproject/qgisfeed/tests.py b/qgisfeedproject/qgisfeed/tests.py
@@ -127,6 +127,12 @@ def test_lang_filter(self):
         self.assertTrue("Null Island QGIS Meeting" in titles)
         self.assertTrue("QGIS acquired by ESRI" in titles)
 
+        response = c.get('/?lang=en_US')
+        data = json.loads(response.content)
+        titles = [d['title'] for d in data]
+        self.assertTrue("Null Island QGIS Meeting" in titles)
+        self.assertTrue("QGIS acquired by ESRI" in titles)
+
     def test_lat_lon_filter(self):
         c = Client(HTTP_USER_AGENT='Mozilla/5.0 QGIS/32400/Fedora '
                                    'Linux (Workstation Edition)')
@@ -175,6 +181,8 @@ def test_invalid_parameters(self):
         self.assertEqual(response.status_code, 400)
         response = c.get('/?lang=KK')
         self.assertEqual(response.status_code, 400)
+        response = c.get('/?lang=english')
+        self.assertEqual(response.status_code, 400)
 
     def test_image_link(self):
         c = Client(HTTP_USER_AGENT='Mozilla/5.0 QGIS/32400/Fedora '

diff --git a/qgisfeedproject/qgisfeed/views.py b/qgisfeedproject/qgisfeed/views.py
@@ -37,6 +37,8 @@
 from user_visit.models import UserVisit
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 
+import re
+
 
 QGISFEED_MAX_RECORDS=getattr(settings, 'QGISFEED_MAX_RECORDS', 20)
 
@@ -66,8 +68,15 @@ def get_filters(self, request):
         """
         filters = {}
         if request.GET.get('lang'):
-            lang = str(request.GET.get('lang'))[:2]
-            if lang not in LANGUAGE_KEYS:
+            lang = request.GET.get('lang')
+            # Define the regular expression pattern for 'xx' or 'xx_XX'
+            pattern = re.compile(r'^[a-z]{2}(_[A-Z]{2})?$')
+            if pattern.match(lang):
+                # Get the first two letters of the language code
+                lang = lang[:2]
+                if lang not in LANGUAGE_KEYS:
+                    raise BadRequestException("Invalid language parameter.")
+            else:
                 raise BadRequestException("Invalid language parameter.")
             filters['lang'] = lang
         if request.GET.get('lat') and request.GET.get('lon'):