mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpo-27931: Fix email address header parsing error (#5329) 

Correctly handle addresses whose username is an empty quoted string.
This commit is contained in:
jayyyin 2018-01-29 13:07:44 -05:00 committed by R. David Murray
parent e6d342156d
commit aa218d1649
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/email/_header_value_parser.py
View File

@ -430,7 +430,10 @@ def route(self):
def addr_spec(self): def addr_spec(self):
for x in self: for x in self:
if x.token_type == 'addr-spec': if x.token_type == 'addr-spec':
if x.local_part:
return x.addr_spec return x.addr_spec
else:
return quote_string(x.local_part) + x.addr_spec
else: else:
return '<>' return '<>'
@ -1164,6 +1167,9 @@ def get_bare_quoted_string(value):
"expected '\"' but found '{}'".format(value)) "expected '\"' but found '{}'".format(value))
bare_quoted_string = BareQuotedString() bare_quoted_string = BareQuotedString()
value = value[1:] value = value[1:]
if value[0] == '"':
token, value = get_qcontent(value)
bare_quoted_string.append(token)
while value and value[0] != '"': while value and value[0] != '"':
if value[0] in WSP: if value[0] in WSP:
token, value = get_fws(value) token, value = get_fws(value)

17
Lib/test/test_email/test__header_value_parser.py
View File

@ -490,6 +490,10 @@ def test_get_bare_quoted_string_must_start_with_dquote(self):
with self.assertRaises(errors.HeaderParseError): with self.assertRaises(errors.HeaderParseError):
parser.get_bare_quoted_string(' "foo"') parser.get_bare_quoted_string(' "foo"')
def test_get_bare_quoted_string_only_quotes(self):
self._test_get_x(parser.get_bare_quoted_string,
'""', '""', '', [], '')
def test_get_bare_quoted_string_following_wsp_preserved(self): def test_get_bare_quoted_string_following_wsp_preserved(self):
self._test_get_x(parser.get_bare_quoted_string, self._test_get_x(parser.get_bare_quoted_string,
'"foo"\t bar', '"foo"', 'foo', [], '\t bar') '"foo"\t bar', '"foo"', 'foo', [], '\t bar')
@ -1467,6 +1471,19 @@ def test_get_angle_addr_empty(self):
self.assertIsNone(angle_addr.route) self.assertIsNone(angle_addr.route)
self.assertEqual(angle_addr.addr_spec, '<>') self.assertEqual(angle_addr.addr_spec, '<>')
def test_get_angle_addr_qs_only_quotes(self):
angle_addr = self._test_get_x(parser.get_angle_addr,
'<""@example.com>',
'<""@example.com>',
'<""@example.com>',
[],
'')
self.assertEqual(angle_addr.token_type, 'angle-addr')
self.assertEqual(angle_addr.local_part, '')
self.assertEqual(angle_addr.domain, 'example.com')
self.assertIsNone(angle_addr.route)
self.assertEqual(angle_addr.addr_spec, '""@example.com')
def test_get_angle_addr_with_cfws(self): def test_get_angle_addr_with_cfws(self):
angle_addr = self._test_get_x(parser.get_angle_addr, angle_addr = self._test_get_x(parser.get_angle_addr,
' (foo) <dinsdale@example.com>(bar)', ' (foo) <dinsdale@example.com>(bar)',

1
Misc/NEWS.d/next/Library/2018-01-25-21-04-11.bpo-27931.e4r52t.rst Normal file
View File

@ -0,0 +1 @@
Fix email address header parsing error when the username is an empty quoted string. Patch by Xiang Zhang.