diff options
author | Benjamin Peterson <benjamin@python.org> | 2015-05-23 10:46:25 -0500 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2015-05-23 10:46:25 -0500 |
commit | 871f40d4792e490a17cb0f45cc4af7b10a1f40d0 (patch) | |
tree | 78ba5bcfcdbc2e9a0a862558bf4fd8d2fe2c419d | |
parent | ec44a1be4d9412383c0a32e02228cc4a2f05fe0e (diff) | |
download | cpython-871f40d4792e490a17cb0f45cc4af7b10a1f40d0.tar.gz |
allow square brackets in cookie values (#22931)
-rw-r--r-- | Lib/Cookie.py | 7 | ||||
-rw-r--r-- | Lib/test/test_cookie.py | 14 | ||||
-rw-r--r-- | Misc/NEWS | 11 |
3 files changed, 29 insertions, 3 deletions
diff --git a/Lib/Cookie.py b/Lib/Cookie.py index 0b15531196..b1704d98cc 100644 --- a/Lib/Cookie.py +++ b/Lib/Cookie.py @@ -528,12 +528,13 @@ class Morsel(dict): # result, the parsing rules here are less strict. # -_LegalCharsPatt = r"[\w\d!#%&'~_`><@,:/\$\*\+\-\.\^\|\)\(\?\}\{\=]" +_LegalKeyChars = r"\w\d!#%&'~_`><@,:/\$\*\+\-\.\^\|\)\(\?\}\{\=" +_LegalValueChars = _LegalKeyChars + r"\[\]" _CookiePattern = re.compile( r"(?x)" # This is a Verbose pattern r"\s*" # Optional whitespace at start of cookie r"(?P<key>" # Start of group 'key' - ""+ _LegalCharsPatt +"+?" # Any word of at least one letter, nongreedy + "["+ _LegalKeyChars +"]+?" # Any word of at least one letter, nongreedy r")" # End of group 'key' r"(" # Optional group: there may not be a value. r"\s*=\s*" # Equal Sign @@ -542,7 +543,7 @@ _CookiePattern = re.compile( r"|" # or r"\w{3},\s[\s\w\d-]{9,11}\s[\d:]{8}\sGMT" # Special case for "expires" attr r"|" # or - ""+ _LegalCharsPatt +"*" # Any word or empty string + "["+ _LegalValueChars +"]*" # Any word or empty string r")" # End of group 'val' r")?" # End of optional value group r"\s*" # Any number of spaces. diff --git a/Lib/test/test_cookie.py b/Lib/test/test_cookie.py index 36cd52e58f..404190123f 100644 --- a/Lib/test/test_cookie.py +++ b/Lib/test/test_cookie.py @@ -27,6 +27,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' + )) } ] @@ -2,6 +2,17 @@ Python News +++++++++++ +What's New in Python 2.7.10? +============================ + +*Release date: 2015-05-23* + +Library +------- + +- Issue #22931: Allow '[' and ']' in cookie values. + + What's New in Python 2.7.10 release candidate 1? ================================================ |