]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
[3.12] gh-115398: Expose Expat >=2.6.0 reparse deferral API (CVE-2023-52425) (GH...
authorSebastian Pipping <sebastian@pipping.org>
Wed, 6 Mar 2024 22:01:45 +0000 (23:01 +0100)
committerGitHub <noreply@github.com>
Wed, 6 Mar 2024 22:01:45 +0000 (22:01 +0000)
commit0a01ed6c2a116bd3e174fce33c21d84d650de569
tree4172262e4a616c388212b133b9840eafa7c12932
parent2528e46470162dd12a625ccb5dfe35fb7bcac1d3
[3.12] gh-115398: Expose Expat >=2.6.0 reparse deferral API (CVE-2023-52425) (GH-115623) (GH-116248)

Allow controlling Expat >=2.6.0 reparse deferral (CVE-2023-52425) by adding five new methods:

- `xml.etree.ElementTree.XMLParser.flush`
- `xml.etree.ElementTree.XMLPullParser.flush`
- `xml.parsers.expat.xmlparser.GetReparseDeferralEnabled`
- `xml.parsers.expat.xmlparser.SetReparseDeferralEnabled`
- `xml.sax.expatreader.ExpatParser.flush`

Based on the "flush" idea from https://github.com/python/cpython/pull/115138#issuecomment-1932444270 .

- Please treat as a security fix related to CVE-2023-52425.

(cherry picked from commit 6a95676bb526261434dd068d6c49927c44d24a9b)
(cherry picked from commit 73807eb634315f70a464a18feaae33d9e065de09)
(cherry picked from commit eda2963378a3c292cf6bb202bb00e94e46ee6d90)

---------

Includes code suggested-by: Snild Dolkow <snild@sony.com>
and by core dev Serhiy Storchaka.
Co-authored-by: Gregory P. Smith <greg@krypto.org>
15 files changed:
Doc/library/pyexpat.rst
Doc/library/xml.etree.elementtree.rst
Include/pyexpat.h
Lib/test/test_pyexpat.py
Lib/test/test_sax.py
Lib/test/test_xml_etree.py
Lib/xml/etree/ElementTree.py
Lib/xml/sax/expatreader.py
Misc/NEWS.d/next/Security/2024-02-18-03-14-40.gh-issue-115398.tzvxH8.rst [new file with mode: 0644]
Misc/sbom.spdx.json
Modules/_elementtree.c
Modules/clinic/_elementtree.c.h
Modules/clinic/pyexpat.c.h
Modules/expat/pyexpatns.h
Modules/pyexpat.c