Ticket #12130: 12130_r11706.diff

django/core/context_processors.py

@@ -47 +47 @@
     it has not been provided by either a view decorator or the middleware
     """
     def _get_val():
-        token = get_token(request)
-        if token is None:
-            # In order to be able to provide debugging info in the
-            # case of misconfiguration, we use a sentinel value
-            # instead of returning an empty dict.
-            return 'NOTPROVIDED'
-        else:
-            return token
+        return get_token(request)
     _get_val = lazy(_get_val, str)
 
     return {'csrf_token': _get_val() }

django/template/defaulttags.py

@@ -41 +41 @@
     def render(self, context):
         csrf_token = context.get('csrf_token', None)
         if csrf_token:
-            if csrf_token == 'NOTPROVIDED':
-                return mark_safe(u"")
-            else:
-                return mark_safe(u"<div style='display:none'><input type='hidden' name='csrfmiddlewaretoken' value='%s' /></div>" % (csrf_token))
+            return mark_safe(u"<div style='display:none'><input type='hidden' name='csrfmiddlewaretoken' value='%s' /></div>" % (csrf_token))
         else:
             # It's very probable that the token is missing because of
             # misconfiguration, so we raise a warning

django/middleware/csrf.py

@@ -50 +50 @@
     function lazily, as is done by the csrf context processor.
     """
     request.META["CSRF_COOKIE_USED"] = True
-    return request.META.get("CSRF_COOKIE", None)
+    try:
+        token = request.META["CSRF_COOKIE"]
+    except KeyError:
+        token = request.META["CSRF_COOKIE"] = _get_new_csrf_key()
+    return token
 
 class CsrfViewMiddleware(object):
     """

tests/regressiontests/csrf_tests/tests.py

@@ -268 +268 @@
         """
         req = self._get_GET_no_csrf_cookie_request()
         resp = token_view(req)
-        self.assertEquals(u"", resp.content)
+        self._check_token_present(resp, req.META["CSRF_COOKIE"])
 
     def test_token_node_with_csrf_cookie(self):
         """