Fixed #233 -- Fixed middleware crash on invalid IP address in REMOTE_ADDR.

felixxm · web-flow · commit 55d596d4a641 · 2021-12-20T20:21:03.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,10 @@
 
 * Confirms support for Python 3.9.
 
+### Bug Fixes
+
+* Fixes middleware crash on invalid IP addresses in ``REMOTE_ADDR``.
+
 ## 1.5.6.
 
 ### Breaking
diff --git a/request/middleware.py b/request/middleware.py
@@ -1,3 +1,4 @@
+from django.core.exceptions import ValidationError
 from django.utils.deprecation import MiddlewareMixin
 
 from . import settings
@@ -33,6 +34,11 @@ def process_response(self, request, response):
                 return response
 
         r = Request()
-        r.from_http_request(request, response)
-
+        try:
+            r.from_http_request(request, response, commit=False)
+            r.full_clean()
+        except ValidationError:
+            pass
+        else:
+            r.save()
         return response
diff --git a/tests/test_middlewares.py b/tests/test_middlewares.py
@@ -133,6 +133,12 @@ def test_dont_record_ignored_ips(self):
         self.middleware(request)
         self.assertEqual(1, Request.objects.count())
 
+    def test_invalid_addr(self):
+        request = self.factory.get('/foo')
+        request.META['REMOTE_ADDR'] = 'invalid-addr'
+        self.middleware(request)
+        self.assertEqual(Request.objects.count(), 0)
+
     @mock.patch('request.middleware.settings.IGNORE_USER_AGENTS',
                 (r'^.*Foo.*$',))
     def test_dont_record_ignored_user_agents(self):
