From 5fa89c87f0389e2f02a6f8ab92da4ef1ac9b7747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 16 Jan 2023 16:23:31 +0000 Subject: [PATCH 1/7] Remove the non-shadow_stack option, it has not been used in years Backport of https://src.fedoraproject.org/rpms/pypy3.9/c/70c239aa7011b7fc5973bd54c8010321515efdaa For https://bugzilla.redhat.com/show_bug.cgi?id=2161329 --- pypy.spec | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/pypy.spec b/pypy.spec index 96dfd54..3608c30 100644 --- a/pypy.spec +++ b/pypy.spec @@ -132,10 +132,6 @@ ExcludeArch: %{ix86} # Easy way to enable/disable verbose logging: %global verbose_logs 0 -# Forcibly use the shadow-stack option for detecting GC roots, rather than -# relying on hacking up generated assembler with regexps: -%global shadow_stack 1 - # Easy way to turn off the selftests: %global run_selftests 1 @@ -502,7 +498,6 @@ BuildPyPy() { # How will we track garbage-collection roots in the generated code? # http://pypy.readthedocs.org/en/latest/config/translation.gcrootfinder.html -%if 0%{shadow_stack} # This is the most portable option, and avoids a reliance on non-guaranteed # behaviors within GCC's code generator: use an explicitly-maintained stack # of root pointers: @@ -510,27 +505,6 @@ BuildPyPy() { export CFLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/-g//') -%else - # Go with the default, which is "asmgcc" - - %global gcrootfinder_options %{nil} - - # https://bugzilla.redhat.com/show_bug.cgi?id=588941#c18 - # The generated Makefile compiles the .c files into assembler (.s), rather - # than direct to .o It then post-processes this assembler to locate - # garbage-collection roots (building .lbl.s and .gcmap files, and a - # "gcmaptable.s"). (The modified .lbl.s files have extra code injected - # within them). - # Unfortunately, the code to do this: - # pypy-1.4/pypy/translator/c/gcc/trackgcroot.py - # doesn't interract well with the results of using our standard build flags. - # For now, filter our CFLAGS of everything that could be conflicting with - # pypy. Need to check these and reenable ones that are okay later. - # Filed as https://bugzilla.redhat.com/show_bug.cgi?id=666966 - export CFLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//' -e 's/-fexceptions//' -e 's/-fstack-protector//' -e 's/--param=ssp-buffer-size=4//' -e 's/-O2//' -e 's/-fasynchronous-unwind-tables//' -e 's/-march=i686//' -e 's/-mtune=atom//') - -%endif - # The generated C code leads to many thousands of warnings of the form: # warning: variable 'l_v26003' set but not used [-Wunused-but-set-variable] # Suppress them: From 64d44f1f88fa997bdd21cad654215ff2e4194c08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 10:43:18 +0000 Subject: [PATCH 2/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pypy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pypy.spec b/pypy.spec index 3608c30..4da4afc 100644 --- a/pypy.spec +++ b/pypy.spec @@ -6,7 +6,7 @@ Name: pypy Version: %{basever}.11 %global pyversion 2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python implementation with a Just-In-Time compiler # PyPy is MIT @@ -867,6 +867,9 @@ CheckPyPy %{name}-c-stackless %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 7.3.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Dec 30 2022 Miro Hrončok - 7.3.11-1 - Update to 7.3.11 - Fixes: rhbz#2147521 From e78e06dbeef87dec6ba89a56fc89a9c2f669c63b Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Mon, 29 May 2023 18:54:49 +0200 Subject: [PATCH 3/7] Security fix for CVE-2023-24329 Resolves: rhbz#2174018 --- 399-cve-2023-24329.patch | 131 +++++++++++++++++++++++++++++++++++++++ pypy.spec | 18 +++++- 2 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 399-cve-2023-24329.patch diff --git a/399-cve-2023-24329.patch b/399-cve-2023-24329.patch new file mode 100644 index 0000000..3888de6 --- /dev/null +++ b/399-cve-2023-24329.patch @@ -0,0 +1,131 @@ +From 71b1e29f61ee1fa7d70a0b00bdbca5eddf107076 Mon Sep 17 00:00:00 2001 +From: Lumir Balhar +Date: Thu, 25 May 2023 10:03:57 +0200 +Subject: [PATCH] 00399-cve-2023-24329.patch + +00399 # + +* gh-102153: Start stripping C0 control and space chars in `urlsplit` (GH-102508) + +`urllib.parse.urlsplit` has already been respecting the WHATWG spec a bit GH-25595. + +This adds more sanitizing to respect the "Remove any leading C0 control or space from input" [rule](https://url.spec.whatwg.org/GH-url-parsing:~:text=Remove%20any%20leading%20and%20trailing%20C0%20control%20or%20space%20from%20input.) in response to [CVE-2023-24329](https://nvd.nist.gov/vuln/detail/CVE-2023-24329). + +Backported to Python 2 from Python 3.12. + +Co-authored-by: Illia Volochii +Co-authored-by: Gregory P. Smith [Google] +Co-authored-by: Lumir Balhar +--- + lib-python/2.7/test/test_urlparse.py | 59 ++++++++++++++++++++++++++++ + lib-python/2.7/urlparse.py | 10 +++++ + 2 files changed, 69 insertions(+) + +diff --git a/lib-python/2.7/test/test_urlparse.py b/lib-python/2.7/test/test_urlparse.py +index 9912fe2..94fe940 100644 +--- a/lib-python/2.7/test/test_urlparse.py ++++ b/lib-python/2.7/test/test_urlparse.py +@@ -572,6 +572,65 @@ class UrlParseTestCase(unittest.TestCase): + self.assertEqual(p.port, None) + self.assertEqual(p.geturl(), b"http://www.python.org/javascript:alert('msg')/#frag") + ++ def test_urlsplit_strip_url(self): ++ noise = "".join([chr(i) for i in range(0, 0x20 + 1)]) ++ base_url = "http://User:Pass@www.python.org:080/doc/?query=yes#frag" ++ ++ url = noise.decode("utf-8") + base_url ++ p = urlparse.urlsplit(url) ++ self.assertEqual(p.scheme, "http") ++ self.assertEqual(p.netloc, "User:Pass@www.python.org:080") ++ self.assertEqual(p.path, "/doc/") ++ self.assertEqual(p.query, "query=yes") ++ self.assertEqual(p.fragment, "frag") ++ self.assertEqual(p.username, "User") ++ self.assertEqual(p.password, "Pass") ++ self.assertEqual(p.hostname, "www.python.org") ++ self.assertEqual(p.port, 80) ++ self.assertEqual(p.geturl(), base_url) ++ ++ url = noise + base_url.encode("utf-8") ++ p = urlparse.urlsplit(url) ++ self.assertEqual(p.scheme, b"http") ++ self.assertEqual(p.netloc, b"User:Pass@www.python.org:080") ++ self.assertEqual(p.path, b"/doc/") ++ self.assertEqual(p.query, b"query=yes") ++ self.assertEqual(p.fragment, b"frag") ++ self.assertEqual(p.username, b"User") ++ self.assertEqual(p.password, b"Pass") ++ self.assertEqual(p.hostname, b"www.python.org") ++ self.assertEqual(p.port, 80) ++ self.assertEqual(p.geturl(), base_url.encode("utf-8")) ++ ++ # Test that trailing space is preserved as some applications rely on ++ # this within query strings. ++ query_spaces_url = "https://www.python.org:88/doc/?query= " ++ p = urlparse.urlsplit(noise.decode("utf-8") + query_spaces_url) ++ self.assertEqual(p.scheme, "https") ++ self.assertEqual(p.netloc, "www.python.org:88") ++ self.assertEqual(p.path, "/doc/") ++ self.assertEqual(p.query, "query= ") ++ self.assertEqual(p.port, 88) ++ self.assertEqual(p.geturl(), query_spaces_url) ++ ++ p = urlparse.urlsplit("www.pypi.org ") ++ # That "hostname" gets considered a "path" due to the ++ # trailing space and our existing logic... YUCK... ++ # and re-assembles via geturl aka unurlsplit into the original. ++ # django.core.validators.URLValidator (at least through v3.2) relies on ++ # this, for better or worse, to catch it in a ValidationError via its ++ # regular expressions. ++ # Here we test the basic round trip concept of such a trailing space. ++ self.assertEqual(urlparse.urlunsplit(p), "www.pypi.org ") ++ ++ # with scheme as cache-key ++ url = "//www.python.org/" ++ scheme = noise.decode("utf-8") + "https" + noise.decode("utf-8") ++ for _ in range(2): ++ p = urlparse.urlsplit(url, scheme=scheme) ++ self.assertEqual(p.scheme, "https") ++ self.assertEqual(p.geturl(), "https://www.python.org/") ++ + def test_attributes_bad_port(self): + """Check handling of non-integer ports.""" + p = urlparse.urlsplit("http://www.example.net:foo") +diff --git a/lib-python/2.7/urlparse.py b/lib-python/2.7/urlparse.py +index 6f6c435..5adf78d 100644 +--- a/lib-python/2.7/urlparse.py ++++ b/lib-python/2.7/urlparse.py +@@ -26,6 +26,10 @@ scenarios for parsing, and for backward compatibility purposes, some + parsing quirks from older RFCs are retained. The testcases in + test_urlparse.py provides a good indicator of parsing behavior. + ++The WHATWG URL Parser spec should also be considered. We are not compliant with ++it either due to existing user code API behavior expectations (Hyrum's Law). ++It serves as a useful guide when making changes. ++ + """ + + import re +@@ -62,6 +66,10 @@ scheme_chars = ('abcdefghijklmnopqrstuvwxyz' + '0123456789' + '+-.') + ++# Leading and trailing C0 control and space to be stripped per WHATWG spec. ++# == "".join([chr(i) for i in range(0, 0x20 + 1)]) ++_WHATWG_C0_CONTROL_OR_SPACE = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f ' ++ + # Unsafe bytes to be removed per WHATWG spec + _UNSAFE_URL_BYTES_TO_REMOVE = ['\t', '\r', '\n'] + +@@ -193,6 +201,8 @@ def urlsplit(url, scheme='', allow_fragments=True): + Return a 5-tuple: (scheme, netloc, path, query, fragment). + Note that we don't break the components up in smaller bits + (e.g. netloc is a single string) and we don't expand % escapes.""" ++ url = url.lstrip(_WHATWG_C0_CONTROL_OR_SPACE) ++ scheme = scheme.strip(_WHATWG_C0_CONTROL_OR_SPACE) + allow_fragments = bool(allow_fragments) + key = url, scheme, allow_fragments, type(url), type(scheme) + cached = _parse_cache.get(key, None) +-- +2.40.1 + diff --git a/pypy.spec b/pypy.spec index 4da4afc..7b3825a 100644 --- a/pypy.spec +++ b/pypy.spec @@ -6,7 +6,7 @@ Name: pypy Version: %{basever}.11 %global pyversion 2.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python implementation with a Just-In-Time compiler # PyPy is MIT @@ -188,6 +188,18 @@ Source189: 189-use-rpm-wheels.patch # Backported from python3. Patch382: 382-cve-2015-20107.patch +# 00399 # +# CVE-2023-24329 +# +# gh-102153: Start stripping C0 control and space chars in `urlsplit` (GH-102508) +# +# `urllib.parse.urlsplit` has already been respecting the WHATWG spec a bit GH-25595. +# +# This adds more sanitizing to respect the "Remove any leading C0 control or space from input" [rule](https://url.spec.whatwg.org/GH-url-parsing:~:text=Remove%%20any%%20leading%%20and%%20trailing%%20C0%%20control%%20or%%20space%%20from%%20input.) in response to [CVE-2023-24329](https://nvd.nist.gov/vuln/detail/CVE-2023-24329). +# +# Backported from Python 3.12 +Patch399: 399-cve-2023-24329.patch + # Build-time requirements: # pypy's can be rebuilt using itself, rather than with CPython; doing so @@ -867,6 +879,10 @@ CheckPyPy %{name}-c-stackless %changelog +* Mon May 29 2023 Charalampos Stratakis - 7.3.11-3 +- Security fix for CVE-2023-24329 +Resolves: rhbz#2174018 + * Fri Jan 20 2023 Fedora Release Engineering - 7.3.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From af86c9b3bd31af7c11b0711ab717896d1a15746b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 06:47:32 +0000 Subject: [PATCH 4/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pypy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pypy.spec b/pypy.spec index 7b3825a..8ea6e58 100644 --- a/pypy.spec +++ b/pypy.spec @@ -6,7 +6,7 @@ Name: pypy Version: %{basever}.11 %global pyversion 2.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python implementation with a Just-In-Time compiler # PyPy is MIT @@ -879,6 +879,9 @@ CheckPyPy %{name}-c-stackless %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 7.3.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon May 29 2023 Charalampos Stratakis - 7.3.11-3 - Security fix for CVE-2023-24329 Resolves: rhbz#2174018 From 7a2dc37ca225c5fae6145b005da6866a57dd9a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 26 Jul 2023 15:42:29 +0200 Subject: [PATCH 5/7] Update to 7.3.12 --- pypy.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pypy.spec b/pypy.spec index 8ea6e58..2d3c30f 100644 --- a/pypy.spec +++ b/pypy.spec @@ -4,9 +4,9 @@ # %%{_libdir}/pypy%%{pyversion} (see e.g. pypy3.7 or pypy3.8 for inspiration). %global basever 7.3 Name: pypy -Version: %{basever}.11 +Version: %{basever}.12 %global pyversion 2.7 -Release: 4%{?dist} +Release: 1%{?dist} Summary: Python implementation with a Just-In-Time compiler # PyPy is MIT @@ -367,7 +367,7 @@ Provides: bundled(python2dist(webencodings)) = 0.5.1 %endif # Find the version in lib_pypy/cffi/_pycparser/__init__.py -Provides: bundled(python2dist(pycparser)) = 2.20 +Provides: bundled(python2dist(pycparser)) = 2.21 # Find the version in lib_pypy/cffi/_pycparser/ply/__init__.py Provides: bundled(python2dist(ply)) = 3.9 @@ -879,6 +879,10 @@ CheckPyPy %{name}-c-stackless %changelog +* Wed Jul 26 2023 Miro Hrončok - 7.3.12-1 +- Update to 7.3.12 +- Fixes: rhbz#2203422 + * Fri Jul 21 2023 Fedora Release Engineering - 7.3.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index f4e26b4..076cd7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pypy2.7-v7.3.11-src.tar.bz2) = 31fd93fe3e761fd096ff52c2a0afa40f78e4df700deb911e221d1682b35e8374c9deac7ba19b474f7ca7a366d3ae9b36ebaf78e81c4ec8306431fd0873daea55 +SHA512 (pypy2.7-v7.3.12-src.tar.bz2) = 35ec35376f1e7c1a5dea9dc5bce6819a94c2df2645806c83185487587470b47ab529c25ecb8ca200505319f40789859a2919c61902b693421e2001313b46e5f4 From a8bd994e19d926806c71762e072a49eb2ea643cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 1 Aug 2023 18:27:31 +0200 Subject: [PATCH 6/7] Update the URL --- pypy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pypy.spec b/pypy.spec index 2d3c30f..50f4d86 100644 --- a/pypy.spec +++ b/pypy.spec @@ -20,7 +20,7 @@ Summary: Python implementation with a Just-In-Time compiler # before building). If we restore those we'll have to work out the new # licensing terms License: MIT and Python and UCD and BSD and (ASL 2.0 or BSD) -URL: http://pypy.org/ +URL: https://www.pypy.org/ # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval %if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 From 934d69db270fbf34051f14088d46b8e684691cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 1 Aug 2023 18:29:32 +0200 Subject: [PATCH 7/7] Remove outdated spec conditionals --- pypy.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/pypy.spec b/pypy.spec index 50f4d86..296c37e 100644 --- a/pypy.spec +++ b/pypy.spec @@ -23,9 +23,7 @@ License: MIT and Python and UCD and BSD and (ASL 2.0 or BSD) URL: https://www.pypy.org/ # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 ExcludeArch: %{ix86} -%endif # High-level configuration of the build: