Ticket #12470: 12670_messages_base64.diff

django/contrib/messages/storage/cookie.py

@@ -1 +1 @@
 import hmac
+import base64
 
 from django.conf import settings
 from django.utils.hashcompat import sha_hmac
@@ -114 +115 @@
         """
         if messages or encode_empty:
             encoder = MessageEncoder(separators=(',', ':'))
-            value = encoder.encode(messages)
+            value = base64.b64encode(encoder.encode(messages))
             return '%s$%s' % (self._hash(value), value)
 
     def _decode(self, data):
@@ -133 +134 @@
                 try:
                     # If we get here (and the JSON decode works), everything is
                     # good. In any other case, drop back and return None.
-                    return json.loads(value, cls=MessageDecoder)
+                    return json.loads(base64.b64decode(value),
+                                      cls=MessageDecoder)
                 except ValueError:
                     pass
         # Mark the data as used (so it gets removed) since something was wrong

django/contrib/messages/tests/cookie.py

@@ -70 +70 @@
         response = self.get_response()
 
         for i in range(5):
-            storage.add(constants.INFO, str(i) * 900)
+            # 1.33 = increase in size due to base64 encoding
+            # 4k = max cookie size
+            # 675 * 4 * 1.33 = 3591
+            # 675 * 5 * 1.33 = 4489
+            storage.add(constants.INFO, str(i) * 675)
         unstored_messages = storage.update(response)
 
         cookie_storing = self.stored_messages_count(storage, response)
         self.assertEqual(cookie_storing, 4)
 
         self.assertEqual(len(unstored_messages), 1)
-        self.assert_(unstored_messages[0].message == '0' * 900)
+        self.assert_(unstored_messages[0].message == '0' * 675)
 
     def test_json_encoder_decoder(self):
         """

django/contrib/messages/tests/fallback.py

@@ -148 +148 @@
         response = self.get_response()
 
         for i in range(5):
-            storage.add(constants.INFO, str(i) * 900)
+            # 1.33 = increase in size due to base64 encoding
+            # 4k = max cookie size
+            # 675 * 4 * 1.33 = 3591
+            # 675 * 5 * 1.33 = 4489
+            storage.add(constants.INFO, str(i) * 675)
         storage.update(response)
 
         cookie_storing = self.stored_cookie_messages_count(storage, response)