Ticket #7299: django_xview_middleware.diff

django/middleware/doc.py

@@ -12 +12 @@
         indicating the view function.  This is used by the documentation module
         to lookup the view function for an arbitrary page.
         """
-        if request.method == 'HEAD' and (request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS or (request.user.is_authenticated() and request.user.is_staff)):
+        if request.method == 'HEAD' and (request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS or (hasattr(request, 'user') and request.user.is_authenticated() and request.user.is_staff)):
             response = http.HttpResponse()
             response['X-View'] = "%s.%s" % (view_func.__module__, view_func.__name__)
             return response

tests/regressiontests/middleware/tests.py

@@ -3 +3 @@
 from django.test import TestCase
 from django.http import HttpRequest
 from django.middleware.common import CommonMiddleware
+from django.middleware.doc import XViewMiddleware
+from django.views.generic.simple import direct_to_template
 from django.conf import settings
+from django.conf import global_settings
 
 class CommonMiddlewareTest(TestCase):
     def _get_request(self, path):
@@ -89 +92 @@
         self.assertEquals(
             r['Location'],
             'http://testserver/middleware/needsquoting%23/')
+
+
+class XViewMiddlewareTest(TestCase):
+    def tearDown(self):
+        settings.INTERNAL_IPS = global_settings.INTERNAL_IPS
+
+    def test_internal_ips(self):
+        """
+        Tests that request method is HEAD and the IP is internal.
+        """
+        settings.INTERNAL_IPS = ('127.0.0.1',)
+        request = HttpRequest()
+        request.method, request.path = 'HEAD', "/middleware/xview"
+        
+        request.META = {
+            'SERVER_NAME': 'testserver',
+            'SERVER_PORT': 80,
+            'REMOTE_ADDR': settings.INTERNAL_IPS[0],
+        }
+        response = XViewMiddleware().process_view(request, direct_to_template, (), {})
+        self.assertEquals(response.status_code, 200)
+        self.assertEquals(response['X-View'], 'django.views.generic.simple.direct_to_template')
+        
+        # No INTERNAL_IPS
+        request.META['REMOTE_ADDR'] = '127.0.0.2'
+        response = XViewMiddleware().process_view(request, direct_to_template, (), {})
+        self.assert_(response is None)