import CS python3.9-3.9.25-9.el9
This commit is contained in:
parent
ed5f99f713
commit
338b339c43
123
SOURCES/00478-cve-2026-4519.patch
Normal file
123
SOURCES/00478-cve-2026-4519.patch
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: tomcruiseqi <tom33qi@gmail.com>
|
||||||
|
Date: Wed, 25 Mar 2026 02:23:45 +0800
|
||||||
|
Subject: 00478: CVE-2026-4519
|
||||||
|
|
||||||
|
Reject leading dashes in webbrowser URLs (GH-143931) (GH-146359)
|
||||||
|
|
||||||
|
Cherry-picked from Python 3.10: ad4d5ba32af4d80b0dfa2ba9d8203bfb219e60a5
|
||||||
|
|
||||||
|
(cherry picked from commit 82a24a4442312bdcfc4c799885e8b3e00990f02b)
|
||||||
|
|
||||||
|
Co-authored-by: Seth Michael Larson <seth@python.org>
|
||||||
|
---
|
||||||
|
Lib/test/test_webbrowser.py | 5 +++++
|
||||||
|
Lib/webbrowser.py | 14 ++++++++++++++
|
||||||
|
.../2026-01-16-12-04-49.gh-issue-143930.zYC5x3.rst | 1 +
|
||||||
|
3 files changed, 20 insertions(+)
|
||||||
|
create mode 100644 Misc/NEWS.d/next/Security/2026-01-16-12-04-49.gh-issue-143930.zYC5x3.rst
|
||||||
|
|
||||||
|
diff --git a/Lib/test/test_webbrowser.py b/Lib/test/test_webbrowser.py
|
||||||
|
index 519a9432ab..f8e9234db8 100644
|
||||||
|
--- a/Lib/test/test_webbrowser.py
|
||||||
|
+++ b/Lib/test/test_webbrowser.py
|
||||||
|
@@ -55,6 +55,11 @@ class GenericBrowserCommandTest(CommandTestMixin, unittest.TestCase):
|
||||||
|
options=[],
|
||||||
|
arguments=[URL])
|
||||||
|
|
||||||
|
+ def test_reject_dash_prefixes(self):
|
||||||
|
+ browser = self.browser_class(name=CMD_NAME)
|
||||||
|
+ with self.assertRaises(ValueError):
|
||||||
|
+ browser.open(f"--key=val {URL}")
|
||||||
|
+
|
||||||
|
|
||||||
|
class BackgroundBrowserCommandTest(CommandTestMixin, unittest.TestCase):
|
||||||
|
|
||||||
|
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
|
||||||
|
index 6023c1e138..f5349dbce5 100755
|
||||||
|
--- a/Lib/webbrowser.py
|
||||||
|
+++ b/Lib/webbrowser.py
|
||||||
|
@@ -154,6 +154,12 @@ class BaseBrowser(object):
|
||||||
|
def open_new_tab(self, url):
|
||||||
|
return self.open(url, 2)
|
||||||
|
|
||||||
|
+ @staticmethod
|
||||||
|
+ def _check_url(url):
|
||||||
|
+ """Ensures that the URL is safe to pass to subprocesses as a parameter"""
|
||||||
|
+ if url and url.lstrip().startswith("-"):
|
||||||
|
+ raise ValueError(f"Invalid URL: {url}")
|
||||||
|
+
|
||||||
|
|
||||||
|
class GenericBrowser(BaseBrowser):
|
||||||
|
"""Class for all browsers started with a command
|
||||||
|
@@ -171,6 +177,7 @@ class GenericBrowser(BaseBrowser):
|
||||||
|
|
||||||
|
def open(self, url, new=0, autoraise=True):
|
||||||
|
sys.audit("webbrowser.open", url)
|
||||||
|
+ self._check_url(url)
|
||||||
|
cmdline = [self.name] + [arg.replace("%s", url)
|
||||||
|
for arg in self.args]
|
||||||
|
try:
|
||||||
|
@@ -191,6 +198,7 @@ class BackgroundBrowser(GenericBrowser):
|
||||||
|
cmdline = [self.name] + [arg.replace("%s", url)
|
||||||
|
for arg in self.args]
|
||||||
|
sys.audit("webbrowser.open", url)
|
||||||
|
+ self._check_url(url)
|
||||||
|
try:
|
||||||
|
if sys.platform[:3] == 'win':
|
||||||
|
p = subprocess.Popen(cmdline)
|
||||||
|
@@ -256,6 +264,7 @@ class UnixBrowser(BaseBrowser):
|
||||||
|
|
||||||
|
def open(self, url, new=0, autoraise=True):
|
||||||
|
sys.audit("webbrowser.open", url)
|
||||||
|
+ self._check_url(url)
|
||||||
|
if new == 0:
|
||||||
|
action = self.remote_action
|
||||||
|
elif new == 1:
|
||||||
|
@@ -357,6 +366,7 @@ class Konqueror(BaseBrowser):
|
||||||
|
|
||||||
|
def open(self, url, new=0, autoraise=True):
|
||||||
|
sys.audit("webbrowser.open", url)
|
||||||
|
+ self._check_url(url)
|
||||||
|
# XXX Currently I know no way to prevent KFM from opening a new win.
|
||||||
|
if new == 2:
|
||||||
|
action = "newTab"
|
||||||
|
@@ -441,6 +451,7 @@ class Grail(BaseBrowser):
|
||||||
|
|
||||||
|
def open(self, url, new=0, autoraise=True):
|
||||||
|
sys.audit("webbrowser.open", url)
|
||||||
|
+ self._check_url(url)
|
||||||
|
if new:
|
||||||
|
ok = self._remote("LOADNEW " + url)
|
||||||
|
else:
|
||||||
|
@@ -599,6 +610,7 @@ if sys.platform[:3] == "win":
|
||||||
|
class WindowsDefault(BaseBrowser):
|
||||||
|
def open(self, url, new=0, autoraise=True):
|
||||||
|
sys.audit("webbrowser.open", url)
|
||||||
|
+ self._check_url(url)
|
||||||
|
try:
|
||||||
|
os.startfile(url)
|
||||||
|
except OSError:
|
||||||
|
@@ -629,6 +641,7 @@ if sys.platform == 'darwin':
|
||||||
|
|
||||||
|
def open(self, url, new=0, autoraise=True):
|
||||||
|
sys.audit("webbrowser.open", url)
|
||||||
|
+ self._check_url(url)
|
||||||
|
assert "'" not in url
|
||||||
|
# hack for local urls
|
||||||
|
if not ':' in url:
|
||||||
|
@@ -666,6 +679,7 @@ if sys.platform == 'darwin':
|
||||||
|
self._name = name
|
||||||
|
|
||||||
|
def open(self, url, new=0, autoraise=True):
|
||||||
|
+ self._check_url(url)
|
||||||
|
if self._name == 'default':
|
||||||
|
script = 'open location "%s"' % url.replace('"', '%22') # opens in default browser
|
||||||
|
else:
|
||||||
|
diff --git a/Misc/NEWS.d/next/Security/2026-01-16-12-04-49.gh-issue-143930.zYC5x3.rst b/Misc/NEWS.d/next/Security/2026-01-16-12-04-49.gh-issue-143930.zYC5x3.rst
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..0f27eae99a
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Misc/NEWS.d/next/Security/2026-01-16-12-04-49.gh-issue-143930.zYC5x3.rst
|
||||||
|
@@ -0,0 +1 @@
|
||||||
|
+Reject leading dashes in URLs passed to :func:`webbrowser.open`
|
||||||
63
SOURCES/00480-cve-2026-4786.patch
Normal file
63
SOURCES/00480-cve-2026-4786.patch
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stan Ulbrych <stan@python.org>
|
||||||
|
Date: Mon, 13 Apr 2026 22:41:53 +0100
|
||||||
|
Subject: 00480: CVE-2026-4786
|
||||||
|
|
||||||
|
Fix webbrowser `%action` substitution bypass of dash-prefix check
|
||||||
|
---
|
||||||
|
Lib/test/test_webbrowser.py | 8 ++++++++
|
||||||
|
Lib/webbrowser.py | 5 +++--
|
||||||
|
.../2026-03-31-09-15-51.gh-issue-148169.EZJzz2.rst | 2 ++
|
||||||
|
3 files changed, 13 insertions(+), 2 deletions(-)
|
||||||
|
create mode 100644 Misc/NEWS.d/next/Security/2026-03-31-09-15-51.gh-issue-148169.EZJzz2.rst
|
||||||
|
|
||||||
|
diff --git a/Lib/test/test_webbrowser.py b/Lib/test/test_webbrowser.py
|
||||||
|
index f8e9234db8..9156ceec60 100644
|
||||||
|
--- a/Lib/test/test_webbrowser.py
|
||||||
|
+++ b/Lib/test/test_webbrowser.py
|
||||||
|
@@ -95,6 +95,14 @@ class ChromeCommandTest(CommandTestMixin, unittest.TestCase):
|
||||||
|
options=[],
|
||||||
|
arguments=[URL])
|
||||||
|
|
||||||
|
+ def test_reject_action_dash_prefixes(self):
|
||||||
|
+ browser = self.browser_class(name=CMD_NAME)
|
||||||
|
+ with self.assertRaises(ValueError):
|
||||||
|
+ browser.open('%action--incognito')
|
||||||
|
+ # new=1: action is "--new-window", so "%action" itself expands to
|
||||||
|
+ # a dash-prefixed flag even with no dash in the original URL.
|
||||||
|
+ with self.assertRaises(ValueError):
|
||||||
|
+ browser.open('%action', new=1)
|
||||||
|
|
||||||
|
class MozillaCommandTest(CommandTestMixin, unittest.TestCase):
|
||||||
|
|
||||||
|
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
|
||||||
|
index f5349dbce5..43ccddf330 100755
|
||||||
|
--- a/Lib/webbrowser.py
|
||||||
|
+++ b/Lib/webbrowser.py
|
||||||
|
@@ -264,7 +264,6 @@ class UnixBrowser(BaseBrowser):
|
||||||
|
|
||||||
|
def open(self, url, new=0, autoraise=True):
|
||||||
|
sys.audit("webbrowser.open", url)
|
||||||
|
- self._check_url(url)
|
||||||
|
if new == 0:
|
||||||
|
action = self.remote_action
|
||||||
|
elif new == 1:
|
||||||
|
@@ -278,7 +277,9 @@ class UnixBrowser(BaseBrowser):
|
||||||
|
raise Error("Bad 'new' parameter to open(); " +
|
||||||
|
"expected 0, 1, or 2, got %s" % new)
|
||||||
|
|
||||||
|
- args = [arg.replace("%s", url).replace("%action", action)
|
||||||
|
+ self._check_url(url.replace("%action", action))
|
||||||
|
+
|
||||||
|
+ args = [arg.replace("%action", action).replace("%s", url)
|
||||||
|
for arg in self.remote_args]
|
||||||
|
args = [arg for arg in args if arg]
|
||||||
|
success = self._invoke(args, True, autoraise, url)
|
||||||
|
diff --git a/Misc/NEWS.d/next/Security/2026-03-31-09-15-51.gh-issue-148169.EZJzz2.rst b/Misc/NEWS.d/next/Security/2026-03-31-09-15-51.gh-issue-148169.EZJzz2.rst
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..45cdeebe1b
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Misc/NEWS.d/next/Security/2026-03-31-09-15-51.gh-issue-148169.EZJzz2.rst
|
||||||
|
@@ -0,0 +1,2 @@
|
||||||
|
+A bypass in :mod:`webbrowser` allowed URLs prefixed with ``%action`` to pass
|
||||||
|
+the dash-prefix safety check.
|
||||||
48
SOURCES/00482-cve-2026-6100.patch
Normal file
48
SOURCES/00482-cve-2026-6100.patch
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stan Ulbrych <stan@python.org>
|
||||||
|
Date: Mon, 13 Apr 2026 22:42:24 +0100
|
||||||
|
Subject: 00482: CVE-2026-6100
|
||||||
|
|
||||||
|
Fix a possible UAF in {LZMA,BZ2,_Zlib}Decompressor
|
||||||
|
---
|
||||||
|
.../Security/2026-04-10-16-28-21.gh-issue-148395.kfzm0G.rst | 5 +++++
|
||||||
|
Modules/_bz2module.c | 1 +
|
||||||
|
Modules/_lzmamodule.c | 1 +
|
||||||
|
3 files changed, 7 insertions(+)
|
||||||
|
create mode 100644 Misc/NEWS.d/next/Security/2026-04-10-16-28-21.gh-issue-148395.kfzm0G.rst
|
||||||
|
|
||||||
|
diff --git a/Misc/NEWS.d/next/Security/2026-04-10-16-28-21.gh-issue-148395.kfzm0G.rst b/Misc/NEWS.d/next/Security/2026-04-10-16-28-21.gh-issue-148395.kfzm0G.rst
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..b095329bd9
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Misc/NEWS.d/next/Security/2026-04-10-16-28-21.gh-issue-148395.kfzm0G.rst
|
||||||
|
@@ -0,0 +1,5 @@
|
||||||
|
+Fix a dangling input pointer in :class:`lzma.LZMADecompressor`,
|
||||||
|
+:class:`bz2.BZ2Decompressor`
|
||||||
|
+when memory allocation fails with :exc:`MemoryError`, which could let a
|
||||||
|
+subsequent :meth:`!decompress` call read or write through a stale pointer to
|
||||||
|
+the already-released caller buffer.
|
||||||
|
diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c
|
||||||
|
index 880632c623..9b17341e49 100644
|
||||||
|
--- a/Modules/_bz2module.c
|
||||||
|
+++ b/Modules/_bz2module.c
|
||||||
|
@@ -559,6 +559,7 @@ decompress(BZ2Decompressor *d, char *data, size_t len, Py_ssize_t max_length)
|
||||||
|
return result;
|
||||||
|
|
||||||
|
error:
|
||||||
|
+ bzs->next_in = NULL;
|
||||||
|
Py_XDECREF(result);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
diff --git a/Modules/_lzmamodule.c b/Modules/_lzmamodule.c
|
||||||
|
index 2a62a68356..dde81238ef 100644
|
||||||
|
--- a/Modules/_lzmamodule.c
|
||||||
|
+++ b/Modules/_lzmamodule.c
|
||||||
|
@@ -1039,6 +1039,7 @@ decompress(Decompressor *d, uint8_t *data, size_t len, Py_ssize_t max_length)
|
||||||
|
return result;
|
||||||
|
|
||||||
|
error:
|
||||||
|
+ lzs->next_in = NULL;
|
||||||
|
Py_XDECREF(result);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
75
SOURCES/00489-openssl-3.5.7.patch
Normal file
75
SOURCES/00489-openssl-3.5.7.patch
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Benjamin <davidben@google.com>
|
||||||
|
Date: Fri, 24 Mar 2023 09:04:30 -0400
|
||||||
|
Subject: 00489: Use BIO_eof to detect EOF for SSL_FILETYPE_ASN1
|
||||||
|
|
||||||
|
In PEM, we need to parse until error and then suppress `PEM_R_NO_START_LINE`, because PEM allows arbitrary leading and trailing data. DER, however, does not. Parsing until error and suppressing `ASN1_R_HEADER_TOO_LONG` doesn't quite work because that error also covers some cases that should be rejected.
|
||||||
|
|
||||||
|
Instead, check `BIO_eof` early and stop the loop that way.
|
||||||
|
|
||||||
|
This fixes https://github.com/python/cpython/issues/151504 and adds compatibility with OpenSSL 3.5.7+
|
||||||
|
|
||||||
|
(cherry-picked from commit acfe02f3b05436658d92add6b168538b30f357f0)
|
||||||
|
---
|
||||||
|
Lib/test/test_ssl.py | 2 ++
|
||||||
|
.../2022-12-20-10-55-14.gh-issue-100372.utfP65.rst | 2 ++
|
||||||
|
Modules/_ssl.c | 10 ++++++----
|
||||||
|
3 files changed, 10 insertions(+), 4 deletions(-)
|
||||||
|
create mode 100644 Misc/NEWS.d/next/Library/2022-12-20-10-55-14.gh-issue-100372.utfP65.rst
|
||||||
|
|
||||||
|
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
|
||||||
|
index a2e771ed7f..8eaf9bf22f 100644
|
||||||
|
--- a/Lib/test/test_ssl.py
|
||||||
|
+++ b/Lib/test/test_ssl.py
|
||||||
|
@@ -1512,6 +1512,8 @@ class ContextTests(unittest.TestCase):
|
||||||
|
"not enough data: cadata does not contain a certificate"
|
||||||
|
):
|
||||||
|
ctx.load_verify_locations(cadata=b"broken")
|
||||||
|
+ with self.assertRaises(ssl.SSLError):
|
||||||
|
+ ctx.load_verify_locations(cadata=cacert_der + b"A")
|
||||||
|
|
||||||
|
@unittest.skipIf(Py_DEBUG_WIN32, "Avoid mixing debug/release CRT on Windows")
|
||||||
|
def test_load_dh_params(self):
|
||||||
|
diff --git a/Misc/NEWS.d/next/Library/2022-12-20-10-55-14.gh-issue-100372.utfP65.rst b/Misc/NEWS.d/next/Library/2022-12-20-10-55-14.gh-issue-100372.utfP65.rst
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..ec37aff509
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Misc/NEWS.d/next/Library/2022-12-20-10-55-14.gh-issue-100372.utfP65.rst
|
||||||
|
@@ -0,0 +1,2 @@
|
||||||
|
+:meth:`ssl.SSLContext.load_verify_locations` no longer incorrectly accepts
|
||||||
|
+some cases of trailing data when parsing DER.
|
||||||
|
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
|
||||||
|
index 5e0be34d6f..a6d72056b0 100644
|
||||||
|
--- a/Modules/_ssl.c
|
||||||
|
+++ b/Modules/_ssl.c
|
||||||
|
@@ -4113,7 +4113,7 @@ _add_ca_certs(PySSLContext *self, const void *data, Py_ssize_t len,
|
||||||
|
{
|
||||||
|
BIO *biobuf = NULL;
|
||||||
|
X509_STORE *store;
|
||||||
|
- int retval = -1, err, loaded = 0;
|
||||||
|
+ int retval = -1, err, loaded = 0, was_bio_eof = 0;
|
||||||
|
|
||||||
|
assert(filetype == SSL_FILETYPE_ASN1 || filetype == SSL_FILETYPE_PEM);
|
||||||
|
|
||||||
|
@@ -4141,6 +4141,10 @@ _add_ca_certs(PySSLContext *self, const void *data, Py_ssize_t len,
|
||||||
|
int r;
|
||||||
|
|
||||||
|
if (filetype == SSL_FILETYPE_ASN1) {
|
||||||
|
+ if (BIO_eof(biobuf)) {
|
||||||
|
+ was_bio_eof = 1;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
cert = d2i_X509_bio(biobuf, NULL);
|
||||||
|
} else {
|
||||||
|
cert = PEM_read_bio_X509(biobuf, NULL,
|
||||||
|
@@ -4176,9 +4180,7 @@ _add_ca_certs(PySSLContext *self, const void *data, Py_ssize_t len,
|
||||||
|
}
|
||||||
|
_setSSLError(msg, 0, __FILE__, __LINE__);
|
||||||
|
retval = -1;
|
||||||
|
- } else if ((filetype == SSL_FILETYPE_ASN1) &&
|
||||||
|
- (ERR_GET_LIB(err) == ERR_LIB_ASN1) &&
|
||||||
|
- (ERR_GET_REASON(err) == ASN1_R_HEADER_TOO_LONG)) {
|
||||||
|
+ } else if ((filetype == SSL_FILETYPE_ASN1) && was_bio_eof) {
|
||||||
|
/* EOF ASN1 file, not an error */
|
||||||
|
ERR_clear_error();
|
||||||
|
retval = 0;
|
||||||
113
SOURCES/00490-cve-2026-15308.patch
Normal file
113
SOURCES/00490-cve-2026-15308.patch
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
From 0765ae4d3728db1e7d0870185d42e0025db6d2c5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Serhiy Storchaka <storchaka@gmail.com>
|
||||||
|
Date: Sat, 4 Jul 2026 20:40:22 +0300
|
||||||
|
Subject: [PATCH] gh-153030: Fix quadratic complexity in incremental parsing in
|
||||||
|
HTMLParser (GH-153031)
|
||||||
|
|
||||||
|
When an unterminated construct (e.g. a tag or comment) spanned many
|
||||||
|
feed() calls, rescanning the growing buffer and concatenating new data
|
||||||
|
onto it were both quadratic. New data is now accumulated in a list and
|
||||||
|
only joined and parsed once enough has piled up.
|
||||||
|
|
||||||
|
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
|
||||||
|
(cherry picked from commit bcf98ddbc40ec9b3ee87da0124a5660b19b7e606)
|
||||||
|
---
|
||||||
|
Lib/html/parser.py | 32 +++++++++++++++++--
|
||||||
|
Lib/test/test_htmlparser.py | 20 ++++++++++++
|
||||||
|
...-07-04-17-00-00.gh-issue-153030.RovkP6.rst | 3 ++
|
||||||
|
3 files changed, 53 insertions(+), 2 deletions(-)
|
||||||
|
create mode 100644 Misc/NEWS.d/next/Security/2026-07-04-17-00-00.gh-issue-153030.RovkP6.rst
|
||||||
|
|
||||||
|
diff --git a/Lib/html/parser.py b/Lib/html/parser.py
|
||||||
|
index 62134d376e16549..a11e50982b92050 100644
|
||||||
|
--- a/Lib/html/parser.py
|
||||||
|
+++ b/Lib/html/parser.py
|
||||||
|
@@ -137,6 +137,9 @@ def reset(self):
|
||||||
|
self.cdata_elem = None
|
||||||
|
self._support_cdata = True
|
||||||
|
self._escapable = True
|
||||||
|
+ self._pending = []
|
||||||
|
+ self._pending_len = 0
|
||||||
|
+ self._parse_threshold = 1
|
||||||
|
_markupbase.ParserBase.reset(self)
|
||||||
|
|
||||||
|
def feed(self, data):
|
||||||
|
@@ -145,11 +148,36 @@ def feed(self, data):
|
||||||
|
Call this as often as you want, with as little or as much text
|
||||||
|
as you want (may include '\n').
|
||||||
|
"""
|
||||||
|
- self.rawdata = self.rawdata + data
|
||||||
|
- self.goahead(0)
|
||||||
|
+ # Accumulate new data in a list and only join and parse it once
|
||||||
|
+ # enough has piled up. Rescanning an unparsed buffer (e.g. an
|
||||||
|
+ # unterminated tag) and concatenating onto it on every call would
|
||||||
|
+ # both be quadratic in the input size.
|
||||||
|
+ self._pending_len += len(data)
|
||||||
|
+ if self._pending_len < self._parse_threshold:
|
||||||
|
+ self._pending.append(data)
|
||||||
|
+ else:
|
||||||
|
+ if not self._pending:
|
||||||
|
+ self.rawdata += data
|
||||||
|
+ else:
|
||||||
|
+ self._pending.append(data)
|
||||||
|
+ self.rawdata += ''.join(self._pending)
|
||||||
|
+ self._pending.clear()
|
||||||
|
+ self._pending_len = 0
|
||||||
|
+ n = len(self.rawdata)
|
||||||
|
+ self.goahead(0)
|
||||||
|
+ if len(self.rawdata) < n:
|
||||||
|
+ # Some data was parsed; resume on the next call.
|
||||||
|
+ self._parse_threshold = 1
|
||||||
|
+ else:
|
||||||
|
+ # Nothing was parsed; wait until the buffer doubles.
|
||||||
|
+ self._parse_threshold = len(self.rawdata)
|
||||||
|
|
||||||
|
def close(self):
|
||||||
|
"""Handle any buffered data."""
|
||||||
|
+ if self._pending:
|
||||||
|
+ self.rawdata += ''.join(self._pending)
|
||||||
|
+ self._pending.clear()
|
||||||
|
+ self._pending_len = 0
|
||||||
|
self.goahead(1)
|
||||||
|
|
||||||
|
__starttag_text = None
|
||||||
|
diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py
|
||||||
|
index 1c1be3ff476886c..c4b3da81bdfb7ee 100644
|
||||||
|
--- a/Lib/test/test_htmlparser.py
|
||||||
|
+++ b/Lib/test/test_htmlparser.py
|
||||||
|
@@ -929,6 +929,26 @@ def check(source):
|
||||||
|
check("<![CDATA[" * 9 * n)
|
||||||
|
check("<!doctype" * 35 * n)
|
||||||
|
|
||||||
|
+ @support.requires_resource('cpu')
|
||||||
|
+ def test_incremental_no_quadratic_complexity(self):
|
||||||
|
+ # An unterminated construct fed in many small chunks used to take
|
||||||
|
+ # quadratic time, both to rescan and to concatenate the buffer.
|
||||||
|
+ # Now it takes a fraction of a second.
|
||||||
|
+ def check(prefix, chunk, suffix):
|
||||||
|
+ parser = html.parser.HTMLParser()
|
||||||
|
+ parser.feed(prefix)
|
||||||
|
+ for _ in range(200_000):
|
||||||
|
+ parser.feed(chunk)
|
||||||
|
+ parser.feed(suffix)
|
||||||
|
+ parser.close()
|
||||||
|
+ chunk = "a" * 64
|
||||||
|
+ check("<!--", chunk, "-->") # comment
|
||||||
|
+ check("<?", chunk, ">") # processing instruction
|
||||||
|
+ check("<!doctype ", chunk, ">") # doctype
|
||||||
|
+ check("<![CDATA[", chunk, "]]>") # CDATA section
|
||||||
|
+ check("<a href='", chunk, "'>") # start tag
|
||||||
|
+ check("<script>", chunk, "</script>") # RAWTEXT element
|
||||||
|
+
|
||||||
|
|
||||||
|
class AttributesTestCase(TestCaseBase):
|
||||||
|
|
||||||
|
diff --git a/Misc/NEWS.d/next/Security/2026-07-04-17-00-00.gh-issue-153030.RovkP6.rst b/Misc/NEWS.d/next/Security/2026-07-04-17-00-00.gh-issue-153030.RovkP6.rst
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000000000..d1d60593f4ba7d2
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Misc/NEWS.d/next/Security/2026-07-04-17-00-00.gh-issue-153030.RovkP6.rst
|
||||||
|
@@ -0,0 +1,3 @@
|
||||||
|
+Fixed quadratic complexity in incremental parsing of long unterminated
|
||||||
|
+constructs (such as tags or comments) in :class:`html.parser.HTMLParser`,
|
||||||
|
+which could be exploited for a denial of service.
|
||||||
@ -17,7 +17,7 @@ URL: https://www.python.org/
|
|||||||
#global prerel ...
|
#global prerel ...
|
||||||
%global upstream_version %{general_version}%{?prerel}
|
%global upstream_version %{general_version}%{?prerel}
|
||||||
Version: %{general_version}%{?prerel:~%{prerel}}
|
Version: %{general_version}%{?prerel:~%{prerel}}
|
||||||
Release: 5%{?dist}
|
Release: 9%{?dist}
|
||||||
License: Python
|
License: Python
|
||||||
|
|
||||||
|
|
||||||
@ -476,6 +476,49 @@ Patch475: 00475-cve-2025-15367.patch
|
|||||||
# gh-144125: email: verify headers are sound in BytesGenerator
|
# gh-144125: email: verify headers are sound in BytesGenerator
|
||||||
Patch476: 00476-cve-2026-1299.patch
|
Patch476: 00476-cve-2026-1299.patch
|
||||||
|
|
||||||
|
# 00478 # 88bb1e37c971fd1d6bda82a68b5ad873ed099f08
|
||||||
|
# CVE-2026-4519
|
||||||
|
#
|
||||||
|
# Reject leading dashes in webbrowser URLs (GH-143931) (GH-146359)
|
||||||
|
#
|
||||||
|
# Cherry-picked from Python 3.10: ad4d5ba32af4d80b0dfa2ba9d8203bfb219e60a5
|
||||||
|
Patch478: 00478-cve-2026-4519.patch
|
||||||
|
|
||||||
|
# 00480 # 9f4b1483ecfbc8c08117133c239fba544fcb42e7
|
||||||
|
# CVE-2026-4786
|
||||||
|
#
|
||||||
|
# Fix webbrowser `%%action` substitution bypass of dash-prefix check
|
||||||
|
Patch480: 00480-cve-2026-4786.patch
|
||||||
|
|
||||||
|
# 00482 # 51e25e8a804257b707e2021655037d07dcfa9cd6
|
||||||
|
# CVE-2026-6100
|
||||||
|
#
|
||||||
|
# Fix a possible UAF in {LZMA,BZ2,_Zlib}Decompressor
|
||||||
|
Patch482: 00482-cve-2026-6100.patch
|
||||||
|
|
||||||
|
# 00489 # 67185f85f0bd506e1814a2a2f5580bad5b95ce45
|
||||||
|
# Use BIO_eof to detect EOF for SSL_FILETYPE_ASN1
|
||||||
|
#
|
||||||
|
# In PEM, we need to parse until error and then suppress `PEM_R_NO_START_LINE`, because PEM allows arbitrary leading and trailing data. DER, however, does not. Parsing until error and suppressing `ASN1_R_HEADER_TOO_LONG` doesn't quite work because that error also covers some cases that should be rejected.
|
||||||
|
#
|
||||||
|
# Instead, check `BIO_eof` early and stop the loop that way.
|
||||||
|
#
|
||||||
|
# This fixes https://github.com/python/cpython/issues/151504 and adds compatibility with OpenSSL 3.5.7+
|
||||||
|
#
|
||||||
|
# (cherry-picked from commit acfe02f3b05436658d92add6b168538b30f357f0)
|
||||||
|
Patch489: 00489-openssl-3.5.7.patch
|
||||||
|
|
||||||
|
# 00490 #
|
||||||
|
# CVE-2026-15308
|
||||||
|
#
|
||||||
|
# gh-153030: Fix quadratic complexity in incremental parsing in HTMLParser (GH-153031) (GH-153038)
|
||||||
|
#
|
||||||
|
# When an unterminated construct (e.g. a tag or comment) spanned many
|
||||||
|
# feed() calls, rescanning the growing buffer and concatenating new data
|
||||||
|
# onto it were both quadratic. New data is now accumulated in a list and
|
||||||
|
# only joined and parsed once enough has piled up.
|
||||||
|
Patch490: 00490-cve-2026-15308.patch
|
||||||
|
|
||||||
# (New patches go here ^^^)
|
# (New patches go here ^^^)
|
||||||
#
|
#
|
||||||
# When adding new patches to "python" and "python3" in Fedora, EL, etc.,
|
# When adding new patches to "python" and "python3" in Fedora, EL, etc.,
|
||||||
@ -1887,6 +1930,22 @@ CheckPython optimized
|
|||||||
# ======================================================
|
# ======================================================
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 13 2026 Lukáš Zachar <lzachar@redhat.com> - 3.9.25-9
|
||||||
|
- Security fix for CVE-2026-15308
|
||||||
|
Resolves: RHEL-193783
|
||||||
|
|
||||||
|
* Thu Jul 02 2026 Miro Hrončok <mhroncok@redhat.com> - 3.9.25-8
|
||||||
|
- Fix ssl.SSLError: [ASN1: NOT_ENOUGH_DATA] not enough data with OpenSSL 3.5.7+
|
||||||
|
Resolves: RHEL-191730
|
||||||
|
|
||||||
|
* Fri Apr 17 2026 Charalampos Stratakis <cstratak@redhat.com> - 3.9.25-7
|
||||||
|
- Security fixes for CVE-2026-4786 and CVE-2026-6100
|
||||||
|
Resolves: RHEL-167919, RHEL-168161
|
||||||
|
|
||||||
|
* Thu Mar 26 2026 Lumír Balhar <lbalhar@redhat.com> - 3.9.25-6
|
||||||
|
- Security fix for CVE-2026-4519
|
||||||
|
Resolves: RHEL-158117
|
||||||
|
|
||||||
* Mon Mar 09 2026 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.9.25-5
|
* Mon Mar 09 2026 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.9.25-5
|
||||||
- Rebuilding previous fixes for different build target
|
- Rebuilding previous fixes for different build target
|
||||||
Related: RHEL-143117, RHEL-143174, RHEL-144897
|
Related: RHEL-143117, RHEL-143174, RHEL-144897
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user