Fix CVE-2022-40898

This commit is contained in:
wk333 2023-12-08 11:04:53 +08:00
parent 7129643b53
commit c576c8ddb0
2 changed files with 30 additions and 1 deletions

25
CVE-2022-40898.patch Normal file
View File

@ -0,0 +1,25 @@
From 88f02bc335d5404991e532e7f3b0fc80437bf4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
Date: Thu, 20 Oct 2022 17:13:23 +0300
Subject: [PATCH] Fixed potential DoS attack via WHEEL_INFO_RE
Refer: https://github.com/pypa/wheel/issues/498
---
wheel/install.py | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/wheel/install.py b/wheel/install.py
index a0c9d2a5..b985774e 100644
--- a/wheel/install.py
+++ b/wheel/install.py
@@ -16,8 +16,8 @@
# Non-greedy matching of an optional build number may be too clever (more
# invalid wheel filenames will match). Separate regex for .dist-info?
WHEEL_INFO_RE = re.compile(
- r"""^(?P<namever>(?P<name>.+?)-(?P<ver>\d.*?))(-(?P<build>\d.*?))?
- -(?P<pyver>[a-z].+?)-(?P<abi>.+?)-(?P<plat>.+?)(\.whl|\.dist-info)$""",
+ r"""^(?P<namever>(?P<name>[^-]+?)-(?P<ver>\d[^-]*?))(-(?P<build>\d[^-]*?))?
+ -(?P<pyver>[a-z][^-]+?)-(?P<abi>[^-]+?)-(?P<plat>[^.]+?)(\.whl|\.dist-info)$""",
re.VERBOSE).match

View File

@ -1,7 +1,7 @@
%bcond_with bootstrap
Name: python-wheel
Version: 0.31.1
Release: 5
Release: 6
Epoch: 1
Summary: Built-package format for Python
License: MIT
@ -11,6 +11,7 @@ BuildArch: noarch
Patch0000: remove-keyrings.alt-dependency.patch
Patch0001: 0001-Enabled-Intersphinx-linking-to-Python-documentation.patch
Patch0002: CVE-2022-40898.patch
%description
A built-package format for Python.
@ -117,6 +118,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
%endif
%changelog
* Fri Dec 08 2023 wangkai <13474090681@163.com> - 1:0.31.1-6
- Fix CVE-2022-40898
* Mon Nov 27 2023 liubo <liubo1@xfusion.com> - 1:0.31.1-5
- Enabled Intersphinx linking to Python documentation