From 9bd476ea57e1f77c5d117577d721bff806137a09 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 23 May 2015 10:36:48 -0500
Subject: allow square brackets in cookie values (closes #22931)

---
 Lib/http/cookies.py           |  7 ++++---
 Lib/test/test_http_cookies.py | 14 ++++++++++++++
 Misc/NEWS                     |  5 +++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Lib/http/cookies.py b/Lib/http/cookies.py
index 28c1161..50aabd6 100644
--- a/Lib/http/cookies.py
+++ b/Lib/http/cookies.py
@@ -429,12 +429,13 @@ class Morsel(dict):
 # result, the parsing rules here are less strict.
 #
 
-_LegalCharsPatt  = r"[\w\d!#%&'~_`><@,:/\$\*\+\-\.\^\|\)\(\?\}\{\=]"
+_LegalKeyChars  = r"\w\d!#%&'~_`><@,:/\$\*\+\-\.\^\|\)\(\?\}\{\="
+_LegalValueChars = _LegalKeyChars + '\[\]'
 _CookiePattern = re.compile(r"""
     (?x)                           # This is a verbose pattern
     \s*                            # Optional whitespace at start of cookie
     (?P<key>                       # Start of group 'key'
-    """ + _LegalCharsPatt + r"""+?   # Any word of at least one letter
+    [""" + _LegalKeyChars + r"""]+?   # Any word of at least one letter
     )                              # End of group 'key'
     \s*=\s*                        # Equal Sign
     (?P<val>                       # Start of group 'val'
@@ -442,7 +443,7 @@ _CookiePattern = re.compile(r"""
     |                                # or
     \w{3},\s[\w\d\s-]{9,11}\s[\d:]{8}\sGMT  # Special case for "expires" attr
     |                                # or
-    """ + _LegalCharsPatt + r"""*    # Any word or empty string
+    [""" + _LegalValueChars + r"""]*    # Any word or empty string
     )                              # End of group 'val'
     \s*;?                          # Probably ending in a semi-colon
     """, re.ASCII)                 # May be removed if safe.
diff --git a/Lib/test/test_http_cookies.py b/Lib/test/test_http_cookies.py
index 30d4898..a0edcbf 100644
--- a/Lib/test/test_http_cookies.py
+++ b/Lib/test/test_http_cookies.py
@@ -34,6 +34,20 @@ class CookieTests(unittest.TestCase):
              'dict': {'keebler' : 'E=mc2'},
              'repr': "<SimpleCookie: keebler='E=mc2'>",
              'output': 'Set-Cookie: keebler=E=mc2'},
+
+            # issue22931 - Adding '[' and ']' as valid characters in cookie
+            # values as defined in RFC 6265
+            {
+                'data': 'a=b; c=[; d=r; f=h',
+                'dict': {'a':'b', 'c':'[', 'd':'r', 'f':'h'},
+                'repr': "<SimpleCookie: a='b' c='[' d='r' f='h'>",
+                'output': '\n'.join((
+                    'Set-Cookie: a=b',
+                    'Set-Cookie: c=[',
+                    'Set-Cookie: d=r',
+                    'Set-Cookie: f=h'
+                ))
+            }
         ]
 
         for case in cases:
diff --git a/Misc/NEWS b/Misc/NEWS
index 895ff67..b33c5a4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,11 @@ Core and Builtins
 - Issue #23055: Fixed a buffer overflow in PyUnicode_FromFormatV.  Analysis
   and fix by Guido Vranken.
 
+Library
+-------
+
+- Issue #22931: Allow '[' and ']' in cookie values.
+
 
 What's New in Python 3.2.6?
 ===========================
-- 
cgit v0.12