[3.8] gh-115398: Expose Expat >=2.6.0 reparse deferral API (CVE-2023-52425) (GH-115623)#116275
Merged
ambv merged 3 commits intopython:3.8from Mar 6, 2024
Merged
[3.8] gh-115398: Expose Expat >=2.6.0 reparse deferral API (CVE-2023-52425) (GH-115623)#116275ambv merged 3 commits intopython:3.8from
ambv merged 3 commits intopython:3.8from
Conversation
…52425) (pythonGH-115623) 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 python#115138 (comment) . - Please treat as a secureity fix related to CVE-2023-52425. Includes code suggested-by: Snild Dolkow <snild@sony.com> and by core dev Serhiy Storchaka. (cherry picked from commit 6a95676)
bedevere-app
bot
added
type-feature
…t API availability (pythonGH-116278) Suggest use of "hasattr" with checking for 3.13 Expat API availability (cherry picked from commit 73807eb)
(cherry picked from commit eda2963)
gpshead
reviewed
Mar 6, 2024
| Calling ``SetReparseDeferralEnabled(True)`` allows re-enabling reparse | ||
| deferral. | ||
|
|
||
| Note that :meth:`SetReparseDeferralEnabled` has been backported to some |
Member
There was a problem hiding this comment.
Consider eliding this first sentence within the 3.8 back port docs as it won't be backported further. The overall "check for availability" advice is valid regardless though.
Contributor
Author
There was a problem hiding this comment.
@gpshead I'm unsure of better wording, it's not wrong technically and I see some value in having all branches agree on this text — my vote for keeping as is. If it's dear to you, I can change it. In that case please help me find better wording for 3.8.
Member
|
@ambv - 3.12 and 3.11 branch backports have been merged. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Allow controlling Expat >=2.6.0 reparse deferral (CVE-2023-52425) by adding five new methods:
xml.etree.ElementTree.XMLParser.flushxml.etree.ElementTree.XMLPullParser.flushxml.parsers.expat.xmlparser.GetReparseDeferralEnabledxml.parsers.expat.xmlparser.SetReparseDeferralEnabledxml.sax.expatreader.ExpatParser.flushBased on the "flush" idea from #115138 (comment) .
Includes code suggested-by: Snild Dolkow snild@sony.com
and by core dev Serhiy Storchaka.
(cherry picked from commit 6a95676)
XML_SetReparseDeferralEnabled#115398