Commit 9bd476ea authored by Benjamin Peterson's avatar Benjamin Peterson

allow square brackets in cookie values (closes #22931)

parent 0823ffb2
...@@ -429,12 +429,13 @@ class Morsel(dict): ...@@ -429,12 +429,13 @@ class Morsel(dict):
# result, the parsing rules here are less strict. # result, the parsing rules here are less strict.
# #
_LegalCharsPatt = r"[\w\d!#%&'~_`><@,:/\$\*\+\-\.\^\|\)\(\?\}\{\=]" _LegalKeyChars = r"\w\d!#%&'~_`><@,:/\$\*\+\-\.\^\|\)\(\?\}\{\="
_LegalValueChars = _LegalKeyChars + '\[\]'
_CookiePattern = re.compile(r""" _CookiePattern = re.compile(r"""
(?x) # This is a verbose pattern (?x) # This is a verbose pattern
\s* # Optional whitespace at start of cookie \s* # Optional whitespace at start of cookie
(?P<key> # Start of group 'key' (?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' ) # End of group 'key'
\s*=\s* # Equal Sign \s*=\s* # Equal Sign
(?P<val> # Start of group 'val' (?P<val> # Start of group 'val'
...@@ -442,7 +443,7 @@ _CookiePattern = re.compile(r""" ...@@ -442,7 +443,7 @@ _CookiePattern = re.compile(r"""
| # or | # or
\w{3},\s[\w\d\s-]{9,11}\s[\d:]{8}\sGMT # Special case for "expires" attr \w{3},\s[\w\d\s-]{9,11}\s[\d:]{8}\sGMT # Special case for "expires" attr
| # or | # or
""" + _LegalCharsPatt + r"""* # Any word or empty string [""" + _LegalValueChars + r"""]* # Any word or empty string
) # End of group 'val' ) # End of group 'val'
\s*;? # Probably ending in a semi-colon \s*;? # Probably ending in a semi-colon
""", re.ASCII) # May be removed if safe. """, re.ASCII) # May be removed if safe.
......
...@@ -34,6 +34,20 @@ class CookieTests(unittest.TestCase): ...@@ -34,6 +34,20 @@ class CookieTests(unittest.TestCase):
'dict': {'keebler' : 'E=mc2'}, 'dict': {'keebler' : 'E=mc2'},
'repr': "<SimpleCookie: keebler='E=mc2'>", 'repr': "<SimpleCookie: keebler='E=mc2'>",
'output': 'Set-Cookie: 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: for case in cases:
......
...@@ -16,6 +16,11 @@ Core and Builtins ...@@ -16,6 +16,11 @@ Core and Builtins
- Issue #23055: Fixed a buffer overflow in PyUnicode_FromFormatV. Analysis - Issue #23055: Fixed a buffer overflow in PyUnicode_FromFormatV. Analysis
and fix by Guido Vranken. and fix by Guido Vranken.
Library
-------
- Issue #22931: Allow '[' and ']' in cookie values.
What's New in Python 3.2.6? What's New in Python 3.2.6?
=========================== ===========================
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment