* [PATCH v2] python3: Fix ptests with expat 2.6+
@ 2024-02-08 16:26 Khem Raj
0 siblings, 0 replies; 2+ messages in thread
From: Khem Raj @ 2024-02-08 16:26 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v2: Replace the patch with next version of the fix from upstream PR
...sts-for-XMLPullParser-with-Expat-2.6.patch | 110 ++++++++++++++++++
.../recipes-devtools/python/python3_3.12.1.bb | 1 +
2 files changed, 111 insertions(+)
create mode 100644 meta/recipes-devtools/python/python3/0001-gh-115133-Fix-tests-for-XMLPullParser-with-Expat-2.6.patch
diff --git a/meta/recipes-devtools/python/python3/0001-gh-115133-Fix-tests-for-XMLPullParser-with-Expat-2.6.patch b/meta/recipes-devtools/python/python3/0001-gh-115133-Fix-tests-for-XMLPullParser-with-Expat-2.6.patch
new file mode 100644
index 00000000000..baf7776963f
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-gh-115133-Fix-tests-for-XMLPullParser-with-Expat-2.6.patch
@@ -0,0 +1,110 @@
+From f329ff6286e19aedfefd306676fe2ab0b587db5a Mon Sep 17 00:00:00 2001
+From: Serhiy Storchaka <storchaka@gmail.com>
+Date: Thu, 8 Feb 2024 14:17:04 +0200
+Subject: [PATCH] gh-115133: Fix tests for XMLPullParser with Expat 2.6.0
+
+Feeding the parser by too small chunks defers parsing to prevent
+CVE-2023-52425. Future versions of Expat may be more reactive.
+
+Upstream-Status: Submitted [https://github.com/python/cpython/pull/115164]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Lib/test/test_xml_etree.py | 58 ++++++++++++-------
+ ...-02-08-14-21-28.gh-issue-115133.ycl4ko.rst | 2 +
+ 2 files changed, 38 insertions(+), 22 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst
+
+diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
+index 53a4e9f..d406235 100644
+--- a/Lib/test/test_xml_etree.py
++++ b/Lib/test/test_xml_etree.py
+@@ -13,6 +13,7 @@ import itertools
+ import operator
+ import os
+ import pickle
++import pyexpat
+ import sys
+ import textwrap
+ import types
+@@ -120,6 +121,10 @@ ATTLIST_XML = """\
+ </foo>
+ """
+
++fails_with_expat_2_6_0 = (unittest.expectedFailure
++ if pyexpat.version_info >= (2, 6, 0) else
++ lambda test: test)
++
+ def checkwarnings(*filters, quiet=False):
+ def decorator(test):
+ def newtest(*args, **kwargs):
+@@ -1398,28 +1403,37 @@ class XMLPullParserTest(unittest.TestCase):
+ self.assertEqual([(action, elem.tag) for action, elem in events],
+ expected)
+
+- def test_simple_xml(self):
+- for chunk_size in (None, 1, 5):
+- with self.subTest(chunk_size=chunk_size):
+- parser = ET.XMLPullParser()
+- self.assert_event_tags(parser, [])
+- self._feed(parser, "<!-- comment -->\n", chunk_size)
+- self.assert_event_tags(parser, [])
+- self._feed(parser,
+- "<root>\n <element key='value'>text</element",
+- chunk_size)
+- self.assert_event_tags(parser, [])
+- self._feed(parser, ">\n", chunk_size)
+- self.assert_event_tags(parser, [('end', 'element')])
+- self._feed(parser, "<element>text</element>tail\n", chunk_size)
+- self._feed(parser, "<empty-element/>\n", chunk_size)
+- self.assert_event_tags(parser, [
+- ('end', 'element'),
+- ('end', 'empty-element'),
+- ])
+- self._feed(parser, "</root>\n", chunk_size)
+- self.assert_event_tags(parser, [('end', 'root')])
+- self.assertIsNone(parser.close())
++ def test_simple_xml(self, chunk_size=None):
++ parser = ET.XMLPullParser()
++ self.assert_event_tags(parser, [])
++ self._feed(parser, "<!-- comment -->\n", chunk_size)
++ self.assert_event_tags(parser, [])
++ self._feed(parser,
++ "<root>\n <element key='value'>text</element",
++ chunk_size)
++ self.assert_event_tags(parser, [])
++ self._feed(parser, ">\n", chunk_size)
++ self.assert_event_tags(parser, [('end', 'element')])
++ self._feed(parser, "<element>text</element>tail\n", chunk_size)
++ self._feed(parser, "<empty-element/>\n", chunk_size)
++ self.assert_event_tags(parser, [
++ ('end', 'element'),
++ ('end', 'empty-element'),
++ ])
++ self._feed(parser, "</root>\n", chunk_size)
++ self.assert_event_tags(parser, [('end', 'root')])
++ self.assertIsNone(parser.close())
++
++ @fails_with_expat_2_6_0
++ def test_simple_xml_chunk_1(self):
++ self.test_simple_xml(chunk_size=1)
++
++ @fails_with_expat_2_6_0
++ def test_simple_xml_chunk_5(self):
++ self.test_simple_xml(chunk_size=5)
++
++ def test_simple_xml_chunk_8(self):
++ self.test_simple_xml(chunk_size=8)
+
+ def test_feed_while_iterating(self):
+ parser = ET.XMLPullParser()
+diff --git a/Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst b/Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst
+new file mode 100644
+index 0000000..6f10152
+--- /dev/null
++++ b/Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst
+@@ -0,0 +1,2 @@
++Fix tests for :class:`~xml.etree.ElementTree.XMLPullParser` with Expat
++2.6.0.
+--
+2.43.0
+
diff --git a/meta/recipes-devtools/python/python3_3.12.1.bb b/meta/recipes-devtools/python/python3_3.12.1.bb
index 1d3a4221c32..f67aa195e2b 100644
--- a/meta/recipes-devtools/python/python3_3.12.1.bb
+++ b/meta/recipes-devtools/python/python3_3.12.1.bb
@@ -30,6 +30,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \
file://0001-test_storlines-skip-due-to-load-variability.patch \
file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \
+ file://0001-gh-115133-Fix-tests-for-XMLPullParser-with-Expat-2.6.patch \
"
SRC_URI:append:class-native = " \
--
2.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2] python3: Fix ptests with expat 2.6+
@ 2024-02-07 22:19 Khem Raj
0 siblings, 0 replies; 2+ messages in thread
From: Khem Raj @ 2024-02-07 22:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v2: Put the patch in right directory
...y-Fix-for-Expat-2.6.0-with-reparse-d.patch | 57 +++++++++++++++++++
.../recipes-devtools/python/python3_3.12.1.bb | 1 +
2 files changed, 58 insertions(+)
create mode 100644 meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch
diff --git a/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch b/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch
new file mode 100644
index 00000000000..415db4bc5b8
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch
@@ -0,0 +1,57 @@
+From 51a048251c552d9ead29a2a3e4884c138fcf9c1c Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 7 Feb 2024 15:32:45 +0100
+Subject: [PATCH] test_xml_etree.py: Fix for Expat >=2.6.0 with reparse deferral
+
+Upstream-Status: Submitted [https://github.com/python/cpython/pull/115138]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Lib/test/test_xml_etree.py | 10 ++++++----
+ .../2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst | 1 +
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst
+
+diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
+index 53a4e9f..9a0119c 100644
+--- a/Lib/test/test_xml_etree.py
++++ b/Lib/test/test_xml_etree.py
+@@ -1401,6 +1401,7 @@ class XMLPullParserTest(unittest.TestCase):
+ def test_simple_xml(self):
+ for chunk_size in (None, 1, 5):
+ with self.subTest(chunk_size=chunk_size):
++ expected_events = []
+ parser = ET.XMLPullParser()
+ self.assert_event_tags(parser, [])
+ self._feed(parser, "<!-- comment -->\n", chunk_size)
+@@ -1410,16 +1411,17 @@ class XMLPullParserTest(unittest.TestCase):
+ chunk_size)
+ self.assert_event_tags(parser, [])
+ self._feed(parser, ">\n", chunk_size)
+- self.assert_event_tags(parser, [('end', 'element')])
++ expected_events += [('end', 'element')]
+ self._feed(parser, "<element>text</element>tail\n", chunk_size)
+ self._feed(parser, "<empty-element/>\n", chunk_size)
+- self.assert_event_tags(parser, [
++ expected_events += [
+ ('end', 'element'),
+ ('end', 'empty-element'),
+- ])
++ ]
+ self._feed(parser, "</root>\n", chunk_size)
+- self.assert_event_tags(parser, [('end', 'root')])
++ expected_events += [('end', 'root')]
+ self.assertIsNone(parser.close())
++ self.assert_event_tags(parser, expected_events)
+
+ def test_feed_while_iterating(self):
+ parser = ET.XMLPullParser()
+diff --git a/Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst b/Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst
+new file mode 100644
+index 0000000..4dc9c13
+--- /dev/null
++++ b/Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst
+@@ -0,0 +1 @@
++Fix etree XMLPullParser tests for Expat >=2.6.0 with reparse deferral
+--
+2.43.0
+
diff --git a/meta/recipes-devtools/python/python3_3.12.1.bb b/meta/recipes-devtools/python/python3_3.12.1.bb
index 1d3a4221c32..771902cd2c1 100644
--- a/meta/recipes-devtools/python/python3_3.12.1.bb
+++ b/meta/recipes-devtools/python/python3_3.12.1.bb
@@ -30,6 +30,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \
file://0001-test_storlines-skip-due-to-load-variability.patch \
file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \
+ file://0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch \
"
SRC_URI:append:class-native = " \
--
2.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-02-08 16:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-08 16:26 [PATCH v2] python3: Fix ptests with expat 2.6+ Khem Raj
-- strict thread matches above, loose matches on Subject: below --
2024-02-07 22:19 Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.