Merge pull request #198 from jasonkeene/internal_ips_issue

Toolbar Displays to External IPs (Fixed Issue #186)
jazzband · Aug 22, 2011 · 695e8c0 · 695e8c0
2 parents 6e3d9da + 490df5e
commit 695e8c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
@@ -69,10 +69,7 @@ def _show_toolbar(self, request):
             remote_addr = request.META.get('REMOTE_ADDR', None)
 
         # if not internal ip, and not DEBUG
-        if not (remote_addr in settings.INTERNAL_IPS or settings.DEBUG):
-            return False
-
-        return True
+        return remote_addr in settings.INTERNAL_IPS and bool(settings.DEBUG)
 
     def process_request(self, request):
         __traceback_hide__ = True

diff --git a/tests/tests.py b/tests/tests.py
@@ -55,23 +55,25 @@ def test_middleware(self):
     def test_show_toolbar_DEBUG(self):
         request = self.request
 
+        request.META = {'REMOTE_ADDR': '127.0.0.1'}
         middleware = DebugToolbarMiddleware()
 
-        with Settings(DEBUG=True):
+        with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True):
             self.assertTrue(middleware._show_toolbar(request))
 
-        with Settings(DEBUG=False):
+        with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=False):
             self.assertFalse(middleware._show_toolbar(request))
 
     def test_show_toolbar_TEST(self):
         request = self.request
 
+        request.META = {'REMOTE_ADDR': '127.0.0.1'}
         middleware = DebugToolbarMiddleware()
 
-        with Settings(TEST=True, DEBUG=True):
+        with Settings(INTERNAL_IPS=['127.0.0.1'], TEST=True, DEBUG=True):
             self.assertFalse(middleware._show_toolbar(request))
 
-        with Settings(TEST=False, DEBUG=True):
+        with Settings(INTERNAL_IPS=['127.0.0.1'], TEST=False, DEBUG=True):
             self.assertTrue(middleware._show_toolbar(request))
 
     def test_show_toolbar_INTERNAL_IPS(self):
@@ -80,10 +82,10 @@ def test_show_toolbar_INTERNAL_IPS(self):
         request.META = {'REMOTE_ADDR': '127.0.0.1'}
         middleware = DebugToolbarMiddleware()
 
-        with Settings(INTERNAL_IPS=['127.0.0.1']):
+        with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True):
             self.assertTrue(middleware._show_toolbar(request))
 
-        with Settings(INTERNAL_IPS=[]):
+        with Settings(INTERNAL_IPS=[], DEBUG=True):
             self.assertFalse(middleware._show_toolbar(request))
 
     def test_request_urlconf_string(self):
@@ -93,7 +95,7 @@ def test_request_urlconf_string(self):
         request.META = {'REMOTE_ADDR': '127.0.0.1'}
         middleware = DebugToolbarMiddleware()
 
-        with Settings(DEBUG=True):
+        with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True):
             middleware.process_request(request)
 
             self.assertFalse(isinstance(request.urlconf, basestring))
@@ -109,7 +111,7 @@ def test_request_urlconf_string_per_request(self):
         request.META = {'REMOTE_ADDR': '127.0.0.1'}
         middleware = DebugToolbarMiddleware()
 
-        with Settings(DEBUG=True):
+        with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True):
             middleware.process_request(request)
             request.urlconf = 'debug_toolbar.urls'
             middleware.process_request(request)
@@ -127,7 +129,7 @@ def test_request_urlconf_module(self):
         request.META = {'REMOTE_ADDR': '127.0.0.1'}
         middleware = DebugToolbarMiddleware()
 
-        with Settings(DEBUG=True):
+        with Settings(INTERNAL_IPS=['127.0.0.1'], DEBUG=True):
             middleware.process_request(request)
 
             self.assertFalse(isinstance(request.urlconf, basestring))