Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python312 for openSUSE:Factory checked in at 2023-08-04 15:03:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python312 (Old) and /work/SRC/openSUSE:Factory/.python312.new.22712 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python312" Fri Aug 4 15:03:45 2023 rev:5 rq:1102238 version:3.12.0b4 Changes: -------- --- /work/SRC/openSUSE:Factory/python312/python312.changes 2023-07-15 23:15:19.339572317 +0200 +++ /work/SRC/openSUSE:Factory/.python312.new.22712/python312.changes 2023-08-04 15:03:52.636450301 +0200 @@ -1,0 +2,8 @@ +Thu Aug 3 14:13:30 UTC 2023 - Matej Cepl <[email protected]> + +- IT MEANS THAT bsc#1210638 STILL HAS NOT BEEN FIXED! +- Add Revert-gh105127-left-tests.patch (gh#python/cpython!106941) + partially reverting CVE-2023-27043-email-parsing-errors.patch, + because of the regression in gh#python/cpython#106669. + +------------------------------------------------------------------- New: ---- Revert-gh105127-left-tests.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python312.spec ++++++ --- /var/tmp/diff_new_pack.gU5RE7/_old 2023-08-04 15:03:53.568456110 +0200 +++ /var/tmp/diff_new_pack.gU5RE7/_new 2023-08-04 15:03:53.572456135 +0200 @@ -162,7 +162,9 @@ # PATCH-FIX-SLE fix_configure_rst.patch bpo#43774 [email protected] # remove duplicate link targets and make documentation with old Sphinx in SLE Patch35: fix_configure_rst.patch - +# PATCH-FIX-UPSTREAM Revert-gh105127-left-tests.patch bsc#1210638 [email protected] +# Partially revert previous patch +Patch41: Revert-gh105127-left-tests.patch BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: fdupes @@ -431,6 +433,7 @@ %patch34 -p1 # %%endif %patch35 -p1 +%patch41 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac ++++++ Revert-gh105127-left-tests.patch ++++++ >From 4288c623d62cf90d8e4444facb3379fb06d01140 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" <[email protected]> Date: Thu, 20 Jul 2023 20:30:52 -0700 Subject: [PATCH] [3.12] gh-106669: Revert "gh-102988: Detect email address parsing errors ... (GH-105127)" (GH-106733) This reverts commit 18dfbd035775c15533d13a98e56b1d2bf5c65f00. Adds a regression test from the issue. See https://github.com/python/cpython/issues/106669.. (cherry picked from commit a31dea1feb61793e48fa9aa5014f358352205c1d) Co-authored-by: Gregory P. Smith <[email protected]> --- Doc/library/email.utils.rst | 26 -- Doc/whatsnew/3.12.rst | 8 Lib/email/utils.py | 63 ------ Lib/test/test_email/test_email.py | 96 +--------- Misc/NEWS.d/next/Security/2023-06-13-20-52-24.gh-issue-102988.Kei7Vf.rst | 4 5 files changed, 30 insertions(+), 167 deletions(-) create mode 100644 Misc/NEWS.d/next/Security/2023-06-13-20-52-24.gh-issue-102988.Kei7Vf.rst Index: Python-3.12.0b4/Doc/library/email.utils.rst =================================================================== --- Python-3.12.0b4.orig/Doc/library/email.utils.rst +++ Python-3.12.0b4/Doc/library/email.utils.rst @@ -65,11 +65,6 @@ of the new API. *email address* parts. Returns a tuple of that information, unless the parse fails, in which case a 2-tuple of ``('', '')`` is returned. - .. versionchanged:: 3.12 - For security reasons, addresses that were ambiguous and could parse into - multiple different addresses now cause ``('', '')`` to be returned - instead of only one of the *potential* addresses. - .. function:: formataddr(pair, charset='utf-8') @@ -92,7 +87,7 @@ of the new API. This method returns a list of 2-tuples of the form returned by ``parseaddr()``. *fieldvalues* is a sequence of header field values as might be returned by :meth:`Message.get_all <email.message.Message.get_all>`. Here's a simple - example that gets all the recipients of a message: + example that gets all the recipients of a message:: from email.utils import getaddresses @@ -102,25 +97,6 @@ of the new API. resent_ccs = msg.get_all('resent-cc', []) all_recipients = getaddresses(tos + ccs + resent_tos + resent_ccs) - When parsing fails for a single fieldvalue, a 2-tuple of ``('', '')`` - is returned in its place. Other errors in parsing the list of - addresses such as a fieldvalue seemingly parsing into multiple - addresses may result in a list containing a single empty 2-tuple - ``[('', '')]`` being returned rather than returning potentially - invalid output. - - Example malformed input parsing: - - .. doctest:: - - >>> from email.utils import getaddresses - >>> getaddresses(['[email protected] <[email protected]>', '[email protected]']) - [('', '')] - - .. versionchanged:: 3.12 - The 2-tuple of ``('', '')`` in the returned values when parsing - fails were added as to address a security issue. - .. function:: parsedate(date) Index: Python-3.12.0b4/Doc/whatsnew/3.12.rst =================================================================== --- Python-3.12.0b4.orig/Doc/whatsnew/3.12.rst +++ Python-3.12.0b4/Doc/whatsnew/3.12.rst @@ -570,14 +570,6 @@ dis :data:`~dis.hasarg` collection instead. (Contributed by Irit Katriel in :gh:`94216`.) -email ------ - -* :func:`email.utils.getaddresses` and :func:`email.utils.parseaddr` now return - ``('', '')`` 2-tuples in more situations where invalid email addresses are - encountered instead of potentially inaccurate values. - (Contributed by Thomas Dwyer for :gh:`102988` to ameliorate CVE-2023-27043.) - fractions --------- Index: Python-3.12.0b4/Lib/email/utils.py =================================================================== --- Python-3.12.0b4.orig/Lib/email/utils.py +++ Python-3.12.0b4/Lib/email/utils.py @@ -106,54 +106,12 @@ def formataddr(pair, charset='utf-8'): return address -def _pre_parse_validation(email_header_fields): - accepted_values = [] - for v in email_header_fields: - s = v.replace('\\(', '').replace('\\)', '') - if s.count('(') != s.count(')'): - v = "('', '')" - accepted_values.append(v) - - return accepted_values - - -def _post_parse_validation(parsed_email_header_tuples): - accepted_values = [] - # The parser would have parsed a correctly formatted domain-literal - # The existence of an [ after parsing indicates a parsing failure - for v in parsed_email_header_tuples: - if '[' in v[1]: - v = ('', '') - accepted_values.append(v) - - return accepted_values - def getaddresses(fieldvalues): - """Return a list of (REALNAME, EMAIL) or ('','') for each fieldvalue. - - When parsing fails for a fieldvalue, a 2-tuple of ('', '') is returned in - its place. - - If the resulting list of parsed address is not the same as the number of - fieldvalues in the input list a parsing error has occurred. A list - containing a single empty 2-tuple [('', '')] is returned in its place. - This is done to avoid invalid output. - """ - fieldvalues = [str(v) for v in fieldvalues] - fieldvalues = _pre_parse_validation(fieldvalues) - all = COMMASPACE.join(v for v in fieldvalues) + """Return a list of (REALNAME, EMAIL) for each fieldvalue.""" + all = COMMASPACE.join(str(v) for v in fieldvalues) a = _AddressList(all) - result = _post_parse_validation(a.addresslist) - - n = 0 - for v in fieldvalues: - n += v.count(',') + 1 - - if len(result) != n: - return [('', '')] - - return result + return a.addresslist def _format_timetuple_and_zone(timetuple, zone): @@ -254,18 +212,9 @@ def parseaddr(addr): Return a tuple of realname and email address, unless the parse fails, in which case return a 2-tuple of ('', ''). """ - if isinstance(addr, list): - addr = addr[0] - - if not isinstance(addr, str): - return ('', '') - - addr = _pre_parse_validation([addr])[0] - addrs = _post_parse_validation(_AddressList(addr).addresslist) - - if not addrs or len(addrs) > 1: - return ('', '') - + addrs = _AddressList(addr).addresslist + if not addrs: + return '', '' return addrs[0] Index: Python-3.12.0b4/Lib/test/test_email/test_email.py =================================================================== --- Python-3.12.0b4.orig/Lib/test/test_email/test_email.py +++ Python-3.12.0b4/Lib/test/test_email/test_email.py @@ -3319,90 +3319,32 @@ Foo [('Al Person', '[email protected]'), ('Bud Person', '[email protected]')]) - def test_getaddresses_parsing_errors(self): - """Test for parsing errors from CVE-2023-27043""" - eq = self.assertEqual - eq(utils.getaddresses(['[email protected](<[email protected]>']), - [('', '')]) - eq(utils.getaddresses(['[email protected])<[email protected]>']), - [('', '')]) - eq(utils.getaddresses(['[email protected]<<[email protected]>']), - [('', '')]) - eq(utils.getaddresses(['[email protected]><[email protected]>']), - [('', '')]) - eq(utils.getaddresses(['[email protected]@<[email protected]>']), - [('', '')]) - eq(utils.getaddresses(['[email protected],<[email protected]>']), - [('', '[email protected]'), ('', '[email protected]')]) - eq(utils.getaddresses(['[email protected];<[email protected]>']), - [('', '')]) - eq(utils.getaddresses(['[email protected]:<[email protected]>']), - [('', '')]) - eq(utils.getaddresses(['[email protected].<[email protected]>']), - [('', '')]) - eq(utils.getaddresses(['[email protected]"<[email protected]>']), - [('', '')]) - eq(utils.getaddresses(['[email protected][<[email protected]>']), - [('', '')]) - eq(utils.getaddresses(['[email protected]]<[email protected]>']), - [('', '')]) - - def test_parseaddr_parsing_errors(self): - """Test for parsing errors from CVE-2023-27043""" - eq = self.assertEqual - eq(utils.parseaddr(['[email protected](<[email protected]>']), - ('', '')) - eq(utils.parseaddr(['[email protected])<[email protected]>']), - ('', '')) - eq(utils.parseaddr(['[email protected]<<[email protected]>']), - ('', '')) - eq(utils.parseaddr(['[email protected]><[email protected]>']), - ('', '')) - eq(utils.parseaddr(['[email protected]@<[email protected]>']), - ('', '')) - eq(utils.parseaddr(['[email protected],<[email protected]>']), - ('', '')) - eq(utils.parseaddr(['[email protected];<[email protected]>']), - ('', '')) - eq(utils.parseaddr(['[email protected]:<[email protected]>']), - ('', '')) - eq(utils.parseaddr(['[email protected].<[email protected]>']), - ('', '')) - eq(utils.parseaddr(['[email protected]"<[email protected]>']), - ('', '')) - eq(utils.parseaddr(['[email protected][<[email protected]>']), - ('', '')) - eq(utils.parseaddr(['[email protected]]<[email protected]>']), - ('', '')) + def test_getaddresses_comma_in_name(self): + """GH-106669 regression test.""" + self.assertEqual( + utils.getaddresses( + [ + '"Bud, Person" <[email protected]>', + '[email protected] (Al Person)', + '"Mariusz Felisiak" <[email protected]>', + ] + ), + [ + ('Bud, Person', '[email protected]'), + ('Al Person', '[email protected]'), + ('Mariusz Felisiak', '[email protected]'), + ], + ) def test_getaddresses_nasty(self): eq = self.assertEqual eq(utils.getaddresses(['foo: ;']), [('', '')]) - eq(utils.getaddresses(['[]*-- =~$']), [('', '')]) + eq(utils.getaddresses( + ['[]*-- =~$']), + [('', ''), ('', ''), ('', '*--')]) eq(utils.getaddresses( ['foo: ;', '"Jason R. Mastaler" <[email protected]>']), [('', ''), ('Jason R. Mastaler', '[email protected]')]) - eq(utils.getaddresses( - [r'Pete(A nice \) chap) <pete(his account)@silly.test(his host)>']), - [('Pete (A nice ) chap his account his host)', '[email protected]')]) - eq(utils.getaddresses( - ['(Empty list)(start)Undisclosed recipients :(nobody(I know))']), - [('', '')]) - eq(utils.getaddresses( - ['Mary <@machine.tld:[email protected]>, , jdoe@test . example']), - [('Mary', '[email protected]'), ('', ''), ('', '[email protected]')]) - eq(utils.getaddresses( - ['John Doe <jdoe@machine(comment). example>']), - [('John Doe (comment)', '[email protected]')]) - eq(utils.getaddresses( - ['"Mary Smith: Personal Account" <[email protected]>']), - [('Mary Smith: Personal Account', '[email protected]')]) - eq(utils.getaddresses( - ['Undisclosed recipients:;']), - [('', '')]) - eq(utils.getaddresses( - [r'<[email protected]>, "Giant; \"Big\" Box" <[email protected]>']), - [('', '[email protected]'), ('Giant; "Big" Box', '[email protected]')]) def test_getaddresses_embedded_comment(self): """Test proper handling of a nested comment""" Index: Python-3.12.0b4/Misc/NEWS.d/next/Security/2023-06-13-20-52-24.gh-issue-102988.Kei7Vf.rst =================================================================== --- /dev/null +++ Python-3.12.0b4/Misc/NEWS.d/next/Security/2023-06-13-20-52-24.gh-issue-102988.Kei7Vf.rst @@ -0,0 +1,4 @@ +Reverted the :mod:`email.utils` security improvement change released in +3.12beta4 that unintentionally caused :mod:`email.utils.getaddresses` to fail +to parse email addresses with a comma in the quoted name field. +See :gh:`106669`.
