Performance optimization (GH-30)

Author: ArtyomVancyan

src/django_forbid/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.2"
+__version__ = "0.1.3"

src/django_forbid/middleware.py

@@ -1,3 +1,5 @@
+import re
+
 from .skills.forbid_device import ForbidDeviceMiddleware
 from .skills.forbid_location import ForbidLocationMiddleware
 from .skills.forbid_network import ForbidNetworkMiddleware
@@ -14,8 +16,11 @@ class ForbidMiddleware:
 
     def __init__(self, get_response):
         self.get_response = get_response
+        self.regex = re.compile(r"\w+/(?:html|xhtml\+xml|xml)")
 
     def __call__(self, request):
-        for skill in __skills__:
-            self.get_response = skill(self.get_response)
-        return self.get_response(request)
+        get_response = self.get_response
+        if self.regex.search(request.META.get("HTTP_ACCEPT")):
+            for skill in __skills__:
+                get_response = skill(get_response)
+        return get_response(request)

src/django_forbid/skills/forbid_location.py

@@ -20,6 +20,10 @@ def __call__(self, request):
         address = request.META.get("REMOTE_ADDR")
         address = request.META.get("HTTP_X_FORWARDED_FOR", address)
         client_ip = address.split(",")[0].strip()
+        verified_ip = request.session.get("VERIFIED_IP", "")
+
+        if verified_ip and verified_ip == client_ip:
+            return self.get_response(request)
 
         try:
             city = geoip.city(client_ip)
@@ -47,8 +51,12 @@ def __call__(self, request):
             request.session["GEOIP2_TZ"] = timezone
 
         if granted:
+            request.session["VERIFIED_IP"] = client_ip
             return self.get_response(request)
 
+        # Erases the timezone from the session.
+        request.session["VERIFIED_IP"] = ""
+
         # Redirects to the FORBIDDEN_LOC URL if set.
         if Settings.has("OPTIONS.URL.FORBIDDEN_LOC"):
             return redirect(Settings.get("OPTIONS.URL.FORBIDDEN_LOC"))

src/django_forbid/skills/forbid_network.py

@@ -1,5 +1,4 @@
 import json
-import re
 
 from django.http import HttpResponse
 from django.http import HttpResponseForbidden
@@ -31,20 +30,11 @@ def forbidden_page():
         geoip2_tz = request.session.get("GEOIP2_TZ")
         verified_tz = request.session.get("VERIFIED_TZ", "")
 
-        if any([
-            verified_tz == geoip2_tz,
-            # Checks if VPN is False or not set.
-            not Settings.get("OPTIONS.VPN", False),
-            # Checks if the request is an AJAX request.
-            not re.search(
-                r"\w+\/(?:html|xhtml\+xml|xml)",
-                request.META.get("HTTP_ACCEPT"),
-            ),
-        ]):
+        # Checks if the user's timezone match with the last accessed one.
+        if verified_tz == geoip2_tz or not Settings.get("OPTIONS.VPN", False):
             return self.get_response(request)
-
         # Checks if GEOIP2_TZ and VERIFIED_TZ don't exist.
-        if all([verified_tz, geoip2_tz != "N/A"]):
+        elif verified_tz and geoip2_tz != "N/A":
             return forbidden_page()
 
         if all(map(request.session.has_key, ("GEOIP2_TZ", *response_attributes))):

tests/test_network_middleware.py

@@ -6,8 +6,8 @@
 from tests import WSGIRequest
 
 
-def skips(get_response, ip_address, ajax=False):
-    detector = Detector(get_response, ajax=ajax)
+def skips(get_response, ip_address):
+    detector = Detector(get_response)
     response = detector.request_resource(ip_address)
     return response.status_code == 200
 
@@ -84,10 +84,3 @@ def test_should_allow_users_only_from_great_britain_with_shared_session(get_resp
     assert forbids_shared_session(detector, IP.ip_cobain)
     # Turn off VPN - back to London
     assert not forbids_shared_session(detector, IP.ip_london)
-
-
-@override_settings(DJANGO_FORBID={"OPTIONS": {"VPN": True}})
-def test_should_allow_ajax_requests(get_response):
-    """It should give access to the user when request is done by AJAX"""
-    for ip_address in IP.all:
-        assert skips(get_response, ip_address, True)

tests/test_primary_middleware.py

@@ -9,6 +9,14 @@
 request = wsgi.get()
 
 
+def skips_ajax(get_response, ip_address):
+    wsgi_ajax = WSGIRequest(True)
+    request_ajax = wsgi_ajax.get()
+    request_ajax.META["HTTP_X_FORWARDED_FOR"] = ip_address
+    response = ForbidMiddleware(get_response)(request_ajax)
+    return response.status_code == 200
+
+
 def forbids(get_response, request):
     response = ForbidMiddleware(get_response)(request)
     client_ip = request.META["HTTP_X_FORWARDED_FOR"]
@@ -80,3 +88,10 @@ def test_should_allow_users_only_from_great_britain_with_shared_session(get_resp
     # Turn off VPN - back to London
     request.META["HTTP_X_FORWARDED_FOR"] = IP.ip_london
     assert not forbids(get_response, request)
+
+
+@override_settings(DJANGO_FORBID={"OPTIONS": {"VPN": True}})
+def test_should_allow_ajax_requests(get_response):
+    """It should give access to the user when request is done by AJAX"""
+    for ip_address in IP.all:
+        assert skips_ajax(get_response, ip_address)