import python3x-pip-19.3.1-3.module+el8.5.0+11639+ea5b349d
This commit is contained in:
parent
ef730d76f3
commit
ad7c49971a
|
@ -0,0 +1,42 @@
|
|||
From 6d2dcef3427b96c36ddfebf217f774a2c5ecad38 Mon Sep 17 00:00:00 2001
|
||||
From: Lumir Balhar <lbalhar@redhat.com>
|
||||
Date: Wed, 30 Jun 2021 09:27:07 +0200
|
||||
Subject: [PATCH] CVE-2021-33503
|
||||
|
||||
---
|
||||
src/pip/_vendor/urllib3/util/url.py | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/pip/_vendor/urllib3/util/url.py b/src/pip/_vendor/urllib3/util/url.py
|
||||
index 5fe37a7..addaeb7 100644
|
||||
--- a/src/pip/_vendor/urllib3/util/url.py
|
||||
+++ b/src/pip/_vendor/urllib3/util/url.py
|
||||
@@ -63,12 +63,12 @@ IPV6_ADDRZ_RE = re.compile("^" + IPV6_ADDRZ_PAT + "$")
|
||||
BRACELESS_IPV6_ADDRZ_RE = re.compile("^" + IPV6_ADDRZ_PAT[2:-2] + "$")
|
||||
ZONE_ID_RE = re.compile("(" + ZONE_ID_PAT + r")\]$")
|
||||
|
||||
-SUBAUTHORITY_PAT = (u"^(?:(.*)@)?(%s|%s|%s)(?::([0-9]{0,5}))?$") % (
|
||||
+_HOST_PORT_PAT = ("^(%s|%s|%s)(?::([0-9]{0,5}))?$") % (
|
||||
REG_NAME_PAT,
|
||||
IPV4_PAT,
|
||||
IPV6_ADDRZ_PAT,
|
||||
)
|
||||
-SUBAUTHORITY_RE = re.compile(SUBAUTHORITY_PAT, re.UNICODE | re.DOTALL)
|
||||
+_HOST_PORT_RE = re.compile(_HOST_PORT_PAT, re.UNICODE | re.DOTALL)
|
||||
|
||||
UNRESERVED_CHARS = set(
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-~"
|
||||
@@ -374,7 +374,9 @@ def parse_url(url):
|
||||
scheme = scheme.lower()
|
||||
|
||||
if authority:
|
||||
- auth, host, port = SUBAUTHORITY_RE.match(authority).groups()
|
||||
+ auth, _, host_port = authority.rpartition("@")
|
||||
+ auth = auth or None
|
||||
+ host, port = _HOST_PORT_RE.match(host_port).groups()
|
||||
if auth and normalize_uri:
|
||||
auth = _encode_invalid_chars(auth, USERINFO_CHARS)
|
||||
if port == "":
|
||||
--
|
||||
2.31.1
|
||||
|
|
@ -16,7 +16,7 @@ Name: python3x-%{srcname}
|
|||
# When updating, update the bundled libraries versions bellow!
|
||||
# You can use vendor_meta.sh in the dist git repo
|
||||
Version: 19.3.1
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: A tool for installing and managing Python packages
|
||||
|
||||
# We bundle a lot of libraries with pip, which itself is under MIT license.
|
||||
|
@ -96,6 +96,11 @@ Patch5: network-tests.patch
|
|||
# Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1962856
|
||||
Patch6: CVE-2021-3572.patch
|
||||
|
||||
# CVE-2021-33503 Catastrophic backtracking in URL authority parser
|
||||
# Tracking bug: https://bugzilla.redhat.com/show_bug.cgi?id=1968074
|
||||
# Upstream fix: https://github.com/urllib3/urllib3/commit/2d4a3fee6de2fa45eb82169361918f759269b4ec
|
||||
Patch7: CVE-2021-33503.patch
|
||||
|
||||
# Downstream only patch
|
||||
# Users might have local installations of pip from using
|
||||
# `pip install --user --upgrade pip` on older/newer versions.
|
||||
|
@ -248,6 +253,7 @@ popd
|
|||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
|
||||
# this goes together with patch4
|
||||
rm src/pip/_vendor/certifi/*.pem
|
||||
|
@ -409,6 +415,10 @@ fi
|
|||
%{python_wheeldir}/%{python_wheelname}
|
||||
|
||||
%changelog
|
||||
* Wed Jun 30 2021 Lumír Balhar <lbalhar@redhat.com> - 19.3.1-3
|
||||
- Fix for CVE-2021-33503 Catastrophic backtracking in URL authority parser
|
||||
Resolves: rhbz#1968074
|
||||
|
||||
* Tue Jun 08 2021 Lumír Balhar <lbalhar@redhat.com> - 19.3.1-2
|
||||
- Fix for CVE-2021-3572 - pip incorrectly handled unicode separators in git references
|
||||
Resolves: rhbz#1962856
|
||||
|
|
Loading…
Reference in New Issue