Fixed #6045 -- Validate IP address on toolbar IP check (#6046)

lgandras · czpython · commit 2013321a1470 · 2017-10-29T12:53:33.000+01:00
diff --git a/cms/middleware/toolbar.py b/cms/middleware/toolbar.py
@@ -2,7 +2,9 @@
 """
 Edit Toolbar middleware
 """
+from django import forms
 from django.contrib.admin.models import LogEntry, ADDITION, CHANGE
+from django.core.exceptions import ValidationError
 from django.core.urlresolvers import resolve
 
 from cms.toolbar.toolbar import CMSToolbar
@@ -26,8 +28,13 @@ def is_cms_request(self, request):
 
         if internal_ips:
             client_ip = get_request_ip(request)
-            if client_ip not in internal_ips:
+            try:
+                client_ip = forms.GenericIPAddressField().clean(client_ip)
+            except ValidationError:
                 return False
+            else:
+                if client_ip not in internal_ips:
+                    return False
 
         if not toolbar_hide:
             return True
