Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions tz_detect/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ def test_xhr_valid_timezone(self):
self.assertIn(TZ_SESSION_KEY, request.session)
self.assertEqual(request.session[TZ_SESSION_KEY], timezone_name)

def test_xhr_invalid_timezone_fallback(self):
timezone_name = "Etc/GMT 3"
request = self.factory.post("/abc", {"timezone": timezone_name, "offset": "-180"})
self.add_session(request)
response = SetOffsetView.as_view()(request)

self.assertEqual(response.status_code, 200)
self.assertIn(TZ_SESSION_KEY, request.session)
self.assertEqual(request.session[TZ_SESSION_KEY], -180)

def test_xhr_bad_method(self):
request = self.factory.get("/abc")
self.add_session(request)
Expand Down
12 changes: 12 additions & 0 deletions tz_detect/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,15 @@ def convert_header_name(django_header):
'HTTP_CUSTOM_CSRF' -> 'custom-csrf'
"""
return django_header.lower().replace("_", "-").split("http-")[-1]


def is_valid_timezone(timezone):
"""Check if a given string can be used as a timezone."""
if not timezone:
return False

try:
pytz.timezone(timezone)
return True
except pytz.exceptions.Error:
return False
4 changes: 2 additions & 2 deletions tz_detect/views.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
from django.http import HttpResponse
from django.views.generic import View


from .defaults import TZ_SESSION_KEY
from .utils import is_valid_timezone


class SetOffsetView(View):
http_method_names = ["post"]

def post(self, request, *args, **kwargs):
timezone = request.POST.get("timezone", None)
if timezone:
if is_valid_timezone(timezone):
request.session[TZ_SESSION_KEY] = timezone
else:
offset = request.POST.get("offset", None)
Expand Down