Ticket #13283: 13283_r12936.diff

django/middleware/cache.py

@@ -113 +113 @@
         version if available.
         """
         if self.cache_anonymous_only:
+            # do all of our request.user access here, so we can reset
+            # request.session.accessed afterwards (to avoid
+            # SessionMiddleware setting Vary: Cookie)
+            assert hasattr(request, 'session'), "The Django cache middleware with CACHE_MIDDLEWARE_ANONYMOUS_ONLY=True requires both session middleware and authentication middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware' and 'django.contrib.auth.middleware.AuthenticationMiddleware' before the CacheMiddleware."
+            session_accessed = request.session.accessed
             assert hasattr(request, 'user'), "The Django cache middleware with CACHE_MIDDLEWARE_ANONYMOUS_ONLY=True requires authentication middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.auth.middleware.AuthenticationMiddleware' before the CacheMiddleware."
+            user_is_authenticated = request.user.is_authenticated()
+            request.session.accessed = session_accessed
 
         if not request.method in ('GET', 'HEAD') or request.GET:
             request._cache_update_cache = False
             return None # Don't bother checking the cache.
 
-        if self.cache_anonymous_only and request.user.is_authenticated():
+        if self.cache_anonymous_only and user_is_authenticated:
             request._cache_update_cache = False
             return None # Don't cache requests from authenticated users.
 

tests/regressiontests/cache/tests.py

@@ -18 +18 @@
 from django.utils import translation
 from django.utils.cache import patch_vary_headers, get_cache_key, learn_cache_key
 from django.utils.hashcompat import md5_constructor
+from django.test import TestCase
 from regressiontests.cache.models import Poll, expensive_calculation
 
 # functions/classes for complex data type tests
@@ -568 +569 @@
         get_cache_data = FetchFromCacheMiddleware().process_request(request)
         self.assertEqual(get_cache_data.content, es_message)
 
+class CacheMiddlewareTests(TestCase):
+    urls = 'regressiontests.cache.test_urls'
+    
+    def setUp(self):
+        self._orig_cache_middleware_anonymous_only = getattr(settings,
+                                                             'CACHE_MIDDLEWARE_ANONYMOUS_ONLY',
+                                                             False)
+        self._orig_middleware_classes = settings.MIDDLEWARE_CLASSES
+
+        settings.MIDDLEWARE_CLASSES = list(settings.MIDDLEWARE_CLASSES)
+        settings.MIDDLEWARE_CLASSES.insert(0, 'django.middleware.cache.UpdateCacheMiddleware')
+        settings.MIDDLEWARE_CLASSES += ['django.middleware.cache.FetchFromCacheMiddleware']
+
+    def tearDown(self):
+        settings.CACHE_MIDDLEWARE_ANONYMOUS_ONLY = self._orig_cache_middleware_anonymous_only
+        settings.MIDDLEWARE_CLASSES = self._orig_middleware_classes
+    
+    def test_cache_middleware_anonymous_only_does_not_cause_vary_cookie(self):
+        settings.CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
+
+        response = self.client.get('/')
+
+        self.failIf('Cookie' in response.get('Vary', ''))
+        
+        
+        
 if __name__ == '__main__':
     unittest.main()