Solves #6045 by not throwing an exception when an invalid ip address is specified

Andras Gyomrey · lgandras · commit 1e4a45f6a37d · 2017-09-09T15:54:12.000+02: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 django.http import HttpResponse
 
@@ -12,7 +14,6 @@
 from cms.utils.compat.dj import MiddlewareMixin
 from cms.utils.request_ip_resolvers import get_request_ip_resolver
 
-
 get_request_ip = get_request_ip_resolver()
 
 
@@ -27,8 +28,12 @@ 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:
+                return client_ip in internal_ips
 
         if not toolbar_hide:
             return True
