tinyproxy: patch CVE-2025-63938
PATCH 1/5 tinyproxy: patch CVE-2025-63938
Details: https://nvd.nist.gov/vuln/detail/CVE-2025-63938
Pick the patch that is referenced by the NVD advisory.
Signed-off-by Gyorgy Sarvari <[email protected]>
--- .../tinyproxy/tinyproxy/CVE-2025-63938.patch | 41 +++++++++++++++++++ .../tinyproxy/tinyproxy_1.11.0.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch
meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch new file +41 -0
@@ -0,0 +1,41 @@ +From 0e4906a4d4dd12f78870c418f0b68812a329a16a Mon Sep 17 00:00:00 2001 +From: rofl0r <[email protected]> +Date: Fri, 17 Oct 2025 22:57:39 +0000 +Subject: [PATCH] reqs: fix integer overflow in port number processing + +closes #586 + +CVE: CVE-2025-63938 +Upstream-Status: Backport [https://github.com/tinyproxy/tinyproxy/commit/3c0fde94981b025271ffa1788ae425257841bf5a] +Signed-off-by: Gyorgy Sarvari <[email protected]> +--- + src/reqs.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/reqs.c b/src/reqs.c +index cfa87ed..e4c0c77 100644 +--- a/src/reqs.c ++++ b/src/reqs.c +@@ -174,7 +174,7 @@ static int strip_return_port (char *host) + { + char *ptr1; + char *ptr2; +- int port; ++ unsigned port; + + ptr1 = strrchr (host, ':'); + if (ptr1 == NULL) +@@ -186,8 +186,11 @@ static int strip_return_port (char *host) + return 0; + + *ptr1++ = '\0'; +- if (sscanf (ptr1, "%d", &port) != 1) /* one conversion required */ +- return 0; ++ ++ port = atoi(ptr1); ++ /* check that port string is in the valid range 1-0xffff) */ ++ if(strlen(ptr1) > 5 || (port & 0xffff0000)) return 0; ++ + return port; + } +
meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb +1 -0
@@ -8,6 +8,7 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz file://tinyproxy.service \ file://tinyproxy.conf \ file://CVE-2022-40468.patch \ + file://CVE-2025-63938.patch \ " SRC_URI[md5sum] = "658db5558ffb849414341b756a546a99"
PATCH 2/5 python3-ipython: patch CVE-2023-24816
Details: https://nvd.nist.gov/vuln/detail/CVE-2023-24816
Pick the patch referenced by the NVD report.
Signed-off-by Gyorgy Sarvari <[email protected]>
--- .../python3-ipython/CVE-2023-24816.patch | 94 +++++++++++++++++++ .../python/python3-ipython_8.2.0.bb | 1 + 2 files changed, 95 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-ipython/CVE-2023-24816.patch
meta-python/recipes-devtools/python/python3-ipython/CVE-2023-24816.patch new file +94 -0
@@ -0,0 +1,94 @@ +From 06db417ff15192d73ddac4bf0e2f20579d47b2e0 Mon Sep 17 00:00:00 2001 +From: Konstantin Weddige <[email protected]> +Date: Sat, 3 Dec 2022 19:14:09 +0100 +Subject: [PATCH] Fix CVE-2023-24816 by removing legacy code. + +Remove legacy code that might trigger a CVE. + +Currently set_term_title is only called with (semi-)trusted input that +contain the current working directory of the current IPython session. If +an attacker can control directory names, and manage to get a user cd +into this directory the attacker can execute arbitrary commands +contained in the folder names. + +Example: + + - On a windows machine where python is built without _ctypes, create + a folder called && echo "pwn" > pwn.txt. This can be done by for + example cloning a git repository. + - call toggled_set_term_title(True), (or have the preference to + true) + - Open IPython and cd into this directory. + - the folder now contain a pwn.txt, with pwn as content, despite the + user not asking for any code execution. + +Workaround: + + Set the configuration option + c.TerminalInteractiveShell.term_title_format='IPython' (or to any + other fixed, safe string). + +CVE: CVE-2023-24816 +Upstream-Status: Backport [https://github.com/ipython/ipython/commit/385d69325319a5972ee9b5983638e3617f21cb1f] +Signed-off-by: Gyorgy Sarvari <[email protected]> +--- + IPython/__init__.py | 2 +- + IPython/utils/terminal.py | 32 ++++++++------------------------ + 2 files changed, 9 insertions(+), 25 deletions(-) + +diff --git a/IPython/__init__.py b/IPython/__init__.py +index e12da90..20e6e48 100644 +--- a/IPython/__init__.py ++++ b/IPython/__init__.py +@@ -62,7 +62,7 @@ __version__ = release.version + version_info = release.version_info + # list of CVEs that should have been patched in this release. + # this is informational and should not be relied upon. +-__patched_cves__ = {"CVE-2022-21699"} ++__patched_cves__ = {"CVE-2022-21699", "CVE-2023-24816"} + + + def embed_kernel(module=None, local_ns=None, **kwargs): +diff --git a/IPython/utils/terminal.py b/IPython/utils/terminal.py +index 49fd3fe..d884799 100644 +--- a/IPython/utils/terminal.py ++++ b/IPython/utils/terminal.py +@@ -79,30 +79,14 @@ if os.name == 'posix': + _set_term_title = _set_term_title_xterm + _restore_term_title = _restore_term_title_xterm + elif sys.platform == 'win32': +- try: +- import ctypes +- +- SetConsoleTitleW = ctypes.windll.kernel32.SetConsoleTitleW +- SetConsoleTitleW.argtypes = [ctypes.c_wchar_p] +- +- def _set_term_title(title): +- """Set terminal title using ctypes to access the Win32 APIs.""" +- SetConsoleTitleW(title) +- except ImportError: +- def _set_term_title(title): +- """Set terminal title using the 'title' command.""" +- global ignore_termtitle +- +- try: +- # Cannot be on network share when issuing system commands +- curr = os.getcwd() +- os.chdir("C:") +- ret = os.system("title " + title) +- finally: +- os.chdir(curr) +- if ret: +- # non-zero return code signals error, don't try again +- ignore_termtitle = True ++ import ctypes ++ ++ SetConsoleTitleW = ctypes.windll.kernel32.SetConsoleTitleW ++ SetConsoleTitleW.argtypes = [ctypes.c_wchar_p] ++ ++ def _set_term_title(title): ++ """Set terminal title using ctypes to access the Win32 APIs.""" ++ SetConsoleTitleW(title) + + + def set_term_title(title):
meta-python/recipes-devtools/python/python3-ipython_8.2.0.bb +1 -0
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" +SRC_URI += "file://CVE-2023-24816.patch" SRC_URI[sha256sum] = "70e5eb132cac594a34b5f799bd252589009905f05104728aea6a403ec2519dc1" RDEPENDS:${PN} = "\
PATCH 3/5 python3-joblib: upgrade 1.1.0 -> 1.1.1
In reply to Gyorgy SarvariThe only change is a fix for CVE-2022-21797
Signed-off-by Gyorgy Sarvari <[email protected]>
---
.../python/{python3-joblib_1.1.0.bb => python3-joblib_1.1.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-joblib_1.1.0.bb => python3-joblib_1.1.1.bb} (80%)meta-python/recipes-devtools/python/python3-joblib_1.1.1.bb renamed from meta-python/recipes-devtools/python/python3-joblib_1.1.0.bb +1 -1
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2e481820abf0a70a18011a30153df066" inherit setuptools3 pypi -SRC_URI[sha256sum] = "4158fcecd13733f8be669be0683b96ebdbbd38d23559f54dca7205aea1bf1e35" +SRC_URI[sha256sum] = "301f0375f49586a7effee3f6348c419d5765fca1c750186b20690a0d90b82900" RDEPENDS:${PN} += " \ python3-asyncio \
PATCH 4/5 python3-pyjwt: patch CVE-2022-29217
In reply to Gyorgy SarvariDetails: https://nvd.nist.gov/vuln/detail/CVE-2022-29217
Pick the patch referenced by the NVD advsory.
Signed-off-by Gyorgy Sarvari <[email protected]>
--- .../python/python3-pyjwt/CVE-2022-29217.patch | 295 ++++++++++++++++++ .../python/python3-pyjwt_2.3.0.bb | 1 + 2 files changed, 296 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-pyjwt/CVE-2022-29217.patch
meta-python/recipes-devtools/python/python3-pyjwt/CVE-2022-29217.patch new file +295 -0
@@ -0,0 +1,295 @@ +From 0ab93eb55a182f190dea55cc048dcb50bf97724c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <[email protected]> +Date: Thu, 12 May 2022 14:31:00 -0400 +Subject: [PATCH] Merge pull request from GHSA-ffqj-6fqr-9h24 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Co-authored-by: José Padilla <[email protected]> + +CVE: CVE-2022-29217 +Upstream-Status: Backport [https://github.com/jpadilla/pyjwt/commit/9c528670c455b8d948aff95ed50e22940d1ad3fc] +Signed-off-by: Gyorgy Sarvari <[email protected]> +--- + jwt/algorithms.py | 39 +++++++------- + jwt/utils.py | 61 ++++++++++++++++++++++ + tests/test_advisory.py | 109 +++++++++++++++++++++++++++++++++++++++ + tests/test_algorithms.py | 2 +- + 4 files changed, 189 insertions(+), 22 deletions(-) + create mode 100644 tests/test_advisory.py + +diff --git a/jwt/algorithms.py b/jwt/algorithms.py +index 1f8865a..1aa30ed 100644 +--- a/jwt/algorithms.py ++++ b/jwt/algorithms.py +@@ -9,6 +9,8 @@ from .utils import ( + der_to_raw_signature, + force_bytes, + from_base64url_uint, ++ is_pem_format, ++ is_ssh_key, + raw_to_der_signature, + to_base64url_uint, + ) +@@ -183,14 +185,7 @@ class HMACAlgorithm(Algorithm): + def prepare_key(self, key): + key = force_bytes(key) + +- invalid_strings = [ +- b"-----BEGIN PUBLIC KEY-----", +- b"-----BEGIN CERTIFICATE-----", +- b"-----BEGIN RSA PUBLIC KEY-----", +- b"ssh-rsa", +- ] +- +- if any(string_value in key for string_value in invalid_strings): ++ if is_pem_format(key) or is_ssh_key(key): + raise InvalidKeyError( + "The specified key is an asymmetric key or x509 certificate and" + " should not be used as an HMAC secret." +@@ -545,26 +540,28 @@ if has_crypto: + pass + + def prepare_key(self, key): +- +- if isinstance( +- key, +- (Ed25519PrivateKey, Ed25519PublicKey, Ed448PrivateKey, Ed448PublicKey), +- ): +- return key +- + if isinstance(key, (bytes, str)): + if isinstance(key, str): + key = key.encode("utf-8") + str_key = key.decode("utf-8") + + if "-----BEGIN PUBLIC" in str_key: +- return load_pem_public_key(key) +- if "-----BEGIN PRIVATE" in str_key: +- return load_pem_private_key(key, password=None) +- if str_key[0:4] == "ssh-": +- return load_ssh_public_key(key) ++ key = load_pem_public_key(key) ++ elif "-----BEGIN PRIVATE" in str_key: ++ key = load_pem_private_key(key, password=None) ++ elif str_key[0:4] == "ssh-": ++ key = load_ssh_public_key(key) ++ ++ # Explicit check the key to prevent confusing errors from cryptography ++ if not isinstance( ++ key, ++ (Ed25519PrivateKey, Ed25519PublicKey, Ed448PrivateKey, Ed448PublicKey), ++ ): ++ raise InvalidKeyError( ++ "Expecting a EllipticCurvePrivateKey/EllipticCurvePublicKey. Wrong key provided for EdDSA algorithms" ++ ) + +- raise TypeError("Expecting a PEM-formatted or OpenSSH key.") ++ return key + + def sign(self, msg, key): + """ +diff --git a/jwt/utils.py b/jwt/utils.py +index 9dde10c..8ab73b4 100644 +--- a/jwt/utils.py ++++ b/jwt/utils.py +@@ -1,5 +1,6 @@ + import base64 + import binascii ++import re + from typing import Any, Union + + try: +@@ -97,3 +98,63 @@ def raw_to_der_signature(raw_sig: bytes, curve: EllipticCurve) -> bytes: + s = bytes_to_number(raw_sig[num_bytes:]) + + return encode_dss_signature(r, s) ++ ++ ++# Based on https://github.com/hynek/pem/blob/7ad94db26b0bc21d10953f5dbad3acfdfacf57aa/src/pem/_core.py#L224-L252 ++_PEMS = { ++ b"CERTIFICATE", ++ b"TRUSTED CERTIFICATE", ++ b"PRIVATE KEY", ++ b"PUBLIC KEY", ++ b"ENCRYPTED PRIVATE KEY", ++ b"OPENSSH PRIVATE KEY", ++ b"DSA PRIVATE KEY", ++ b"RSA PRIVATE KEY", ++ b"RSA PUBLIC KEY", ++ b"EC PRIVATE KEY", ++ b"DH PARAMETERS", ++ b"NEW CERTIFICATE REQUEST", ++ b"CERTIFICATE REQUEST", ++ b"SSH2 PUBLIC KEY", ++ b"SSH2 ENCRYPTED PRIVATE KEY", ++ b"X509 CRL", ++} ++ ++_PEM_RE = re.compile( ++ b"----[- ]BEGIN (" ++ + b"|".join(_PEMS) ++ + b""")[- ]----\r? ++.+?\r? ++----[- ]END \\1[- ]----\r?\n?""", ++ re.DOTALL, ++) ++ ++ ++def is_pem_format(key: bytes) -> bool: ++ return bool(_PEM_RE.search(key)) ++ ++ ++# Based on https://github.com/pyca/cryptography/blob/bcb70852d577b3f490f015378c75cba74986297b/src/cryptography/hazmat/primitives/serialization/ssh.py#L40-L46 ++_CERT_SUFFIX = b"[email protected]" ++_SSH_PUBKEY_RC = re.compile(br"\A(\S+)[ \t]+(\S+)") ++_SSH_KEY_FORMATS = [ ++ b"ssh-ed25519", ++ b"ssh-rsa", ++ b"ssh-dss", ++ b"ecdsa-sha2-nistp256", ++ b"ecdsa-sha2-nistp384", ++ b"ecdsa-sha2-nistp521", ++] ++ ++ ++def is_ssh_key(key: bytes) -> bool: ++ if any(string_value in key for string_value in _SSH_KEY_FORMATS): ++ return True ++ ++ ssh_pubkey_match = _SSH_PUBKEY_RC.match(key) ++ if ssh_pubkey_match: ++ key_type = ssh_pubkey_match.group(1) ++ if _CERT_SUFFIX == key_type[-len(_CERT_SUFFIX) :]: ++ return True ++ ++ return False +diff --git a/tests/test_advisory.py b/tests/test_advisory.py +new file mode 100644 +index 0000000..f70f54b +--- /dev/null ++++ b/tests/test_advisory.py +@@ -0,0 +1,109 @@ ++import jwt ++import pytest ++from jwt.exceptions import InvalidKeyError ++ ++priv_key_bytes = b'''-----BEGIN PRIVATE KEY----- ++MC4CAQAwBQYDK2VwBCIEIIbBhdo2ah7X32i50GOzrCr4acZTe6BezUdRIixjTAdL ++-----END PRIVATE KEY-----''' ++ ++pub_key_bytes = b'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPL1I9oiq+B8crkmuV4YViiUnhdLjCp3hvy1bNGuGfNL' ++ ++ssh_priv_key_bytes = b"""-----BEGIN EC PRIVATE KEY----- ++MHcCAQEEIOWc7RbaNswMtNtc+n6WZDlUblMr2FBPo79fcGXsJlGQoAoGCCqGSM49 ++AwEHoUQDQgAElcy2RSSSgn2RA/xCGko79N+7FwoLZr3Z0ij/ENjow2XpUDwwKEKk ++Ak3TDXC9U8nipMlGcY7sDpXp2XyhHEM+Rw== ++-----END EC PRIVATE KEY-----""" ++ ++ssh_key_bytes = b"""ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJXMtkUkkoJ9kQP8QhpKO/TfuxcKC2a92dIo/xDY6MNl6VA8MChCpAJN0w1wvVPJ4qTJRnGO7A6V6dl8oRxDPkc=""" ++ ++ ++class TestAdvisory: ++ def test_ghsa_ffqj_6fqr_9h24(self): ++ # Generate ed25519 private key ++ # private_key = ed25519.Ed25519PrivateKey.generate() ++ ++ # Get private key bytes as they would be stored in a file ++ # priv_key_bytes = private_key.private_bytes( ++ # encoding=serialization.Encoding.PEM, ++ # format=serialization.PrivateFormat.PKCS8, ++ # encryption_algorithm=serialization.NoEncryption(), ++ # ) ++ ++ # Get public key bytes as they would be stored in a file ++ # pub_key_bytes = private_key.public_key().public_bytes( ++ # encoding=serialization.Encoding.OpenSSH, ++ # format=serialization.PublicFormat.OpenSSH, ++ # ) ++ ++ # Making a good jwt token that should work by signing it ++ # with the private key ++ # encoded_good = jwt.encode({"test": 1234}, priv_key_bytes, algorithm="EdDSA") ++ encoded_good = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJFZERTQSJ9.eyJ0ZXN0IjoxMjM0fQ.M5y1EEavZkHSlj9i8yi9nXKKyPBSAUhDRTOYZi3zZY11tZItDaR3qwAye8pc74_lZY3Ogt9KPNFbVOSGnUBHDg' ++ ++ # Using HMAC with the public key to trick the receiver to think that the ++ # public key is a HMAC secret ++ encoded_bad = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ0ZXN0IjoxMjM0fQ.6ulDpqSlbHmQ8bZXhZRLFko9SwcHrghCwh8d-exJEE4' ++ ++ # Both of the jwt tokens are validated as valid ++ jwt.decode( ++ encoded_good, ++ pub_key_bytes, ++ algorithms=jwt.algorithms.get_default_algorithms(), ++ ) ++ ++ with pytest.raises(InvalidKeyError): ++ jwt.decode( ++ encoded_bad, ++ pub_key_bytes, ++ algorithms=jwt.algorithms.get_default_algorithms(), ++ ) ++ ++ # Of course the receiver should specify ed25519 algorithm to be used if ++ # they specify ed25519 public key. However, if other algorithms are used, ++ # the POC does not work ++ # HMAC specifies illegal strings for the HMAC secret in jwt/algorithms.py ++ # ++ # invalid_str ings = [ ++ # b"-----BEGIN PUBLIC KEY-----", ++ # b"-----BEGIN CERTIFICATE-----", ++ # b"-----BEGIN RSA PUBLIC KEY-----", ++ # b"ssh-rsa", ++ # ] ++ # ++ # However, OKPAlgorithm (ed25519) accepts the following in jwt/algorithms.py: ++ # ++ # if "-----BEGIN PUBLIC" in str_key: ++ # return load_pem_public_key(key) ++ # if "-----BEGIN PRIVATE" in str_key: ++ # return load_pem_private_key(key, password=None) ++ # if str_key[0:4] == "ssh-": ++ # return load_ssh_public_key(key) ++ # ++ # These should most likely made to match each other to prevent this behavior ++ ++ # POC for the ecdsa-sha2-nistp256 format. ++ # openssl ecparam -genkey -name prime256v1 -noout -out ec256-key-priv.pem ++ # openssl ec -in ec256-key-priv.pem -pubout > ec256-key-pub.pem ++ # ssh-keygen -y -f ec256-key-priv.pem > ec256-key-ssh.pub ++ ++ # Making a good jwt token that should work by signing it with the private key ++ # encoded_good = jwt.encode({"test": 1234}, ssh_priv_key_bytes, algorithm="ES256") ++ encoded_good = "eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZXN0IjoxMjM0fQ.NX42mS8cNqYoL3FOW9ZcKw8Nfq2mb6GqJVADeMA1-kyHAclilYo_edhdM_5eav9tBRQTlL0XMeu_WFE_mz3OXg" ++ ++ # Using HMAC with the ssh public key to trick the receiver to think that the public key is a HMAC secret ++ # encoded_bad = jwt.encode({"test": 1234}, ssh_key_bytes, algorithm="HS256") ++ encoded_bad = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZXN0IjoxMjM0fQ.5eYfbrbeGYmWfypQ6rMWXNZ8bdHcqKng5GPr9MJZITU" ++ ++ # Both of the jwt tokens are validated as valid ++ jwt.decode( ++ encoded_good, ++ ssh_key_bytes, ++ algorithms=jwt.algorithms.get_default_algorithms() ++ ) ++ ++ with pytest.raises(InvalidKeyError): ++ jwt.decode( ++ encoded_bad, ++ ssh_key_bytes, ++ algorithms=jwt.algorithms.get_default_algorithms() ++ ) +diff --git a/tests/test_algorithms.py b/tests/test_algorithms.py +index b6a73fc..777c108 100644 +--- a/tests/test_algorithms.py ++++ b/tests/test_algorithms.py +@@ -669,7 +669,7 @@ class TestOKPAlgorithms: + def test_okp_ed25519_should_reject_non_string_key(self): + algo = OKPAlgorithm() + +- with pytest.raises(TypeError): ++ with pytest.raises(InvalidKeyError): + algo.prepare_key(None) + + with open(key_path("testkey_ed25519")) as keyfile:
meta-python/recipes-devtools/python/python3-pyjwt_2.3.0.bb +1 -0
@@ -5,6 +5,7 @@ HOMEPAGE = "http://github.com/jpadilla/pyjwt" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=68626705a7b513ca8d5f44a3e200ed0c" +SRC_URI += "file://CVE-2022-29217.patch" SRC_URI[sha256sum] = "b888b4d56f06f6dcd777210c334e69c737be74755d3e5e9ee3fe67dc18a0ee41" PYPI_PACKAGE = "PyJWT"
PATCH 5/5 python3-mpmath: patch CVE-2021-29063
In reply to Gyorgy SarvariDetails: https://nvd.nist.gov/vuln/detail/CVE-2021-29063
Pick the patch referenced by the NVD advisory.
Signed-off-by Gyorgy Sarvari <[email protected]>
--- .../python3-mpmath/CVE-2021-29063.patch | 51 +++++++++++++++++++ .../python/python3-mpmath_1.2.1.bb | 1 + 2 files changed, 52 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-mpmath/CVE-2021-29063.patch
meta-python/recipes-devtools/python/python3-mpmath/CVE-2021-29063.patch new file +51 -0
@@ -0,0 +1,51 @@ +From 2e196ba7e41a46b8cafa5971e559ca55171414dc Mon Sep 17 00:00:00 2001 +From: Vinzent Steinberg <[email protected]> +Date: Wed, 10 Feb 2021 16:45:04 +0100 +Subject: [PATCH] Fix ReDOS vulnerability + +Fixes #548, with the workaround suggested by @yetingli. + +CVE: CVE-2021-29063 +Upstream-Status: Backport [https://github.com/mpmath/mpmath/commit/46d44c3c8f3244017fe1eb102d564eb4ab8ef750] +Signed-off-by: Gyorgy Sarvari <[email protected]> +--- + mpmath/ctx_mp.py | 4 ++-- + mpmath/tests/test_convert.py | 10 ++++++++++ + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/mpmath/ctx_mp.py b/mpmath/ctx_mp.py +index 39fc941..93594dd 100644 +--- a/mpmath/ctx_mp.py ++++ b/mpmath/ctx_mp.py +@@ -42,8 +42,8 @@ + + new = object.__new__ + +-get_complex = re.compile(r'^\(?(?P<re>[\+\-]?\d*\.?\d*(e[\+\-]?\d+)?)??' +- r'(?P<im>[\+\-]?\d*\.?\d*(e[\+\-]?\d+)?j)?\)?$') ++get_complex = re.compile(r'^\(?(?P<re>[\+\-]?\d*(\.\d*)?(e[\+\-]?\d+)?)??' ++ r'(?P<im>[\+\-]?\d*(\.\d*)?(e[\+\-]?\d+)?j)?\)?$') + + if BACKEND == 'sage': + from sage.libs.mpmath.ext_main import Context as BaseMPContext +diff --git a/mpmath/tests/test_convert.py b/mpmath/tests/test_convert.py +index 3e2f555..cf1a91d 100644 +--- a/mpmath/tests/test_convert.py ++++ b/mpmath/tests/test_convert.py +@@ -194,6 +194,16 @@ def test_mpmathify(): + assert mpmathify('(1.2e-10 - 3.4e5j)') == mpc('1.2e-10', '-3.4e5') + assert mpmathify('1j') == mpc(1j) + ++def test_issue548(): ++ try: ++ # This expression is invalid, but may trigger the ReDOS vulnerability ++ # in the regular expression. ++ mpmathify('(' + '1' * 5000 + '!j') ++ except: ++ return ++ # The expression is invalid and should raise an exception. ++ assert False ++ + def test_compatibility(): + try: + import numpy as np
meta-python/recipes-devtools/python/python3-mpmath_1.2.1.bb +1 -0
@@ -6,6 +6,7 @@ HOMEPAGE = "https://pypi.org/project/mpmath/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=71970bd3749eebe1bfef9f1efff5b37a" +SRC_URI += "file://CVE-2021-29063.patch" SRC_URI[sha256sum] = "79ffb45cf9f4b101a807595bcb3e72e0396202e0b1d25d689134b48c4216a81a" inherit pypi setuptools3