Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Lib/email/_header_value_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -2253,7 +2253,9 @@ def parse_mime_version(value):
if not digits.isdigit():
mime_version.defects.append(errors.InvalidHeaderDefect(
"Expected MIME major version number but found {!r}".format(digits)))
mime_version.append(ValueTerminal(digits, 'xtext'))
xtext = ValueTerminal(digits, 'xtext')
_validate_xtext(xtext)
mime_version.append(xtext)
else:
mime_version.major = int(digits)
mime_version.append(ValueTerminal(digits, 'digits'))
Expand All @@ -2265,7 +2267,9 @@ def parse_mime_version(value):
mime_version.defects.append(errors.InvalidHeaderDefect(
"Incomplete MIME version; found only major number"))
if value:
mime_version.append(ValueTerminal(value, 'xtext'))
xtext = ValueTerminal(value, 'xtext')
_validate_xtext(xtext)
mime_version.append(xtext)
return mime_version
mime_version.append(ValueTerminal('.', 'version-separator'))
value = value[1:]
Expand All @@ -2284,7 +2288,9 @@ def parse_mime_version(value):
if not digits.isdigit():
mime_version.defects.append(errors.InvalidHeaderDefect(
"Expected MIME minor version number but found {!r}".format(digits)))
mime_version.append(ValueTerminal(digits, 'xtext'))
xtext = ValueTerminal(digits, 'xtext')
_validate_xtext(xtext)
mime_version.append(xtext)
else:
mime_version.minor = int(digits)
mime_version.append(ValueTerminal(digits, 'digits'))
Expand All @@ -2294,7 +2300,9 @@ def parse_mime_version(value):
if value:
mime_version.defects.append(errors.InvalidHeaderDefect(
"Excess non-CFWS text after MIME version"))
mime_version.append(ValueTerminal(value, 'xtext'))
xtext = ValueTerminal(value, 'xtext')
_validate_xtext(xtext)
mime_version.append(xtext)
return mime_version

def get_invalid_parameter(value):
Expand Down
43 changes: 43 additions & 0 deletions Lib/test/test_email/test_headerregistry.py
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,49 @@ def version_string_as_MIME_Version(self,
self.assertEqual(h.fold(policy=policy.default),
'MIME-Version:' + source + '\n')

def test_non_ascii_in_minor_version(self):
# gh-162080: a non-ASCII byte in the minor version must be
# refolded as an unknown-8bit encoded word instead of raising
# UnicodeEncodeError on as_bytes()/as_string().
source = ('1.\xe9'.encode('latin-1')
.decode('us-ascii', 'surrogateescape'))
h = self.make_header('MIME-Version', source)
self.assertEqual(h, '1.\ufffd')
self.assertEqual(h.version, None)
self.assertEqual(h.major, None)
self.assertEqual(h.minor, None)
self.assertDefectsEqual(h.defects, [errors.InvalidHeaderDefect,
errors.UndecodableBytesDefect])
self.assertEqual(h.fold(policy=policy.default),
'MIME-Version: 1.=?unknown-8bit?q?=E9?=\n')

def test_non_ascii_in_major_version(self):
# gh-162080
source = ('\xe9.0'.encode('latin-1')
.decode('us-ascii', 'surrogateescape'))
h = self.make_header('MIME-Version', source)
self.assertEqual(h, '\ufffd.0')
self.assertEqual(h.major, None)
self.assertEqual(h.minor, 0)
self.assertDefectsEqual(h.defects, [errors.InvalidHeaderDefect,
errors.UndecodableBytesDefect])
self.assertEqual(h.fold(policy=policy.default),
'MIME-Version: =?unknown-8bit?q?=E9?=.0\n')

def test_non_ascii_in_excess_text_after_version(self):
# gh-162080
source = ('1.0 \xe9'.encode('latin-1')
.decode('us-ascii', 'surrogateescape'))
h = self.make_header('MIME-Version', source)
self.assertEqual(h, '1.0 \ufffd')
self.assertEqual(h.version, '1.0')
self.assertEqual(h.major, 1)
self.assertEqual(h.minor, 0)
self.assertDefectsEqual(h.defects, [errors.InvalidHeaderDefect,
errors.UndecodableBytesDefect])
self.assertEqual(h.fold(policy=policy.default),
'MIME-Version: 1.0 =?unknown-8bit?q?=E9?=\n')

version_string_params = {

# Examples from the RFC.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Fix :meth:`email.message.Message.as_bytes` and
:meth:`email.message.Message.as_string` raising
:exc:`UnicodeEncodeError` for a ``MIME-Version`` header containing
non-ASCII bytes. Such headers are now refolded using the
``unknown-8bit`` charset, as for other structured headers.
Loading