commit
96ad31ad42
@ -0,0 +1 @@
|
|||||||
|
SOURCES/urllib3-1.26.18.tar.gz
|
@ -0,0 +1 @@
|
|||||||
|
bffc545083d4fe74a6ce953599c0c2c7012b1833 SOURCES/urllib3-1.26.18.tar.gz
|
@ -0,0 +1,66 @@
|
|||||||
|
From 18163d7efbc35b488e6c829a5cf73846d75ef330 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Quentin Pradet <quentin.pradet@gmail.com>
|
||||||
|
Date: Thu, 26 Sep 2024 12:55:43 +0200
|
||||||
|
Subject: [PATCH] Merge pull request from GHSA-34jh-p97f-mpxf
|
||||||
|
|
||||||
|
* [1.26] Strip Proxy-Authorization header on redirects
|
||||||
|
|
||||||
|
* Set release date
|
||||||
|
---
|
||||||
|
src/urllib3/util/retry.py | 4 +++-
|
||||||
|
test/test_retry.py | 6 +++++-
|
||||||
|
test/test_retry_deprecated.py | 6 +++++-
|
||||||
|
3 files changed, 13 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/urllib3/util/retry.py b/src/urllib3/util/retry.py
|
||||||
|
index 60ef6c4..9a1e90d 100644
|
||||||
|
--- a/src/urllib3/util/retry.py
|
||||||
|
+++ b/src/urllib3/util/retry.py
|
||||||
|
@@ -235,7 +235,9 @@ class Retry(object):
|
||||||
|
RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])
|
||||||
|
|
||||||
|
#: Default headers to be used for ``remove_headers_on_redirect``
|
||||||
|
- DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"])
|
||||||
|
+ DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(
|
||||||
|
+ ["Cookie", "Authorization", "Proxy-Authorization"]
|
||||||
|
+ )
|
||||||
|
|
||||||
|
#: Maximum backoff time.
|
||||||
|
DEFAULT_BACKOFF_MAX = 120
|
||||||
|
diff --git a/test/test_retry.py b/test/test_retry.py
|
||||||
|
index 471d2e3..75660b4 100644
|
||||||
|
--- a/test/test_retry.py
|
||||||
|
+++ b/test/test_retry.py
|
||||||
|
@@ -293,7 +293,11 @@ class TestRetry(object):
|
||||||
|
def test_retry_default_remove_headers_on_redirect(self):
|
||||||
|
retry = Retry()
|
||||||
|
|
||||||
|
- assert retry.remove_headers_on_redirect == {"authorization", "cookie"}
|
||||||
|
+ assert retry.remove_headers_on_redirect == {
|
||||||
|
+ "authorization",
|
||||||
|
+ "proxy-authorization",
|
||||||
|
+ "cookie",
|
||||||
|
+ }
|
||||||
|
|
||||||
|
def test_retry_set_remove_headers_on_redirect(self):
|
||||||
|
retry = Retry(remove_headers_on_redirect=["X-API-Secret"])
|
||||||
|
diff --git a/test/test_retry_deprecated.py b/test/test_retry_deprecated.py
|
||||||
|
index d7905cd..0d22b0a 100644
|
||||||
|
--- a/test/test_retry_deprecated.py
|
||||||
|
+++ b/test/test_retry_deprecated.py
|
||||||
|
@@ -295,7 +295,11 @@ class TestRetry(object):
|
||||||
|
def test_retry_default_remove_headers_on_redirect(self):
|
||||||
|
retry = Retry()
|
||||||
|
|
||||||
|
- assert retry.remove_headers_on_redirect == {"authorization", "cookie"}
|
||||||
|
+ assert retry.remove_headers_on_redirect == {
|
||||||
|
+ "authorization",
|
||||||
|
+ "proxy-authorization",
|
||||||
|
+ "cookie",
|
||||||
|
+ }
|
||||||
|
|
||||||
|
def test_retry_set_remove_headers_on_redirect(self):
|
||||||
|
retry = Retry(remove_headers_on_redirect=["X-API-Secret"])
|
||||||
|
--
|
||||||
|
2.46.0
|
||||||
|
|
@ -0,0 +1,173 @@
|
|||||||
|
%global __python3 /usr/bin/python3.12
|
||||||
|
%global python3_pkgversion 3.12
|
||||||
|
|
||||||
|
# RHEL does not include the test dependencies
|
||||||
|
%bcond_with tests
|
||||||
|
|
||||||
|
Name: python%{python3_pkgversion}-urllib3
|
||||||
|
Version: 1.26.18
|
||||||
|
Release: 2%{?dist}.1
|
||||||
|
Summary: HTTP library with thread-safe connection pooling, file post, and more
|
||||||
|
|
||||||
|
# SPDX
|
||||||
|
License: MIT
|
||||||
|
URL: https://github.com/urllib3/urllib3
|
||||||
|
Source: %{url}/archive/%{version}/urllib3-%{version}.tar.gz
|
||||||
|
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
# CVE-2024-37891
|
||||||
|
# Proxy-authorization request header is not stripped during cross-origin redirects.
|
||||||
|
# Tracking bug: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2024-37891
|
||||||
|
# Upstream fix: https://github.com/urllib3/urllib3/commit/40b6d1605814dd1db0a46e202d6e56f2e4c9a468
|
||||||
|
Patch: CVE-2024-37891.patch
|
||||||
|
|
||||||
|
BuildRequires: python%{python3_pkgversion}-devel
|
||||||
|
BuildRequires: python%{python3_pkgversion}-rpm-macros
|
||||||
|
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||||
|
|
||||||
|
%if %{with tests}
|
||||||
|
# Test dependencies are listed only in dev-requirements.txt. Because there are
|
||||||
|
# linters and coverage tools mixed in, and exact versions are pinned, we resort
|
||||||
|
# to manual listing.
|
||||||
|
# mock==3.0.5: patched out in %%prep
|
||||||
|
# coverage~=6.0;python_version>="3.6": omitted linter/coverage tool
|
||||||
|
# tornado==6.1.0;python_version>="3.6"
|
||||||
|
BuildRequires: python%{python3_pkgversion}-tornado >= 6.1
|
||||||
|
# PySocks==1.7.1
|
||||||
|
BuildRequires: python%{python3_pkgversion}-PySocks >= 1.7.1
|
||||||
|
# win-inet-pton==1.1.0: Windows-only workaround
|
||||||
|
# pytest==6.2.4; python_version>="3.10"
|
||||||
|
BuildRequires: python%{python3_pkgversion}-pytest >= 6.2.4
|
||||||
|
# pytest-timeout==1.4.2
|
||||||
|
BuildRequires: python%{python3_pkgversion}-pytest-timeout >= 1.4.2
|
||||||
|
# pytest-freezegun==0.4.2
|
||||||
|
BuildRequires: python%{python3_pkgversion}-pytest-freezegun >= 0.4.2
|
||||||
|
# flaky==3.7.0: not really required
|
||||||
|
# trustme==0.7.0
|
||||||
|
BuildRequires: python%{python3_pkgversion}-trustme >= 0.7
|
||||||
|
# cryptography==38.0.3;python_version>="3.6": associated with the deprecated
|
||||||
|
# “secure” extra
|
||||||
|
# python-dateutil==2.8.1
|
||||||
|
BuildRequires: python%{python3_pkgversion}-python-dateutil >= 2.8.1
|
||||||
|
# gcp-devrel-py-tools==0.0.16: not used in offline testing
|
||||||
|
%endif
|
||||||
|
|
||||||
|
BuildRequires: ca-certificates
|
||||||
|
Requires: ca-certificates
|
||||||
|
|
||||||
|
# There has historically been a manual hard dependency on python3-idna.
|
||||||
|
BuildRequires: python%{python3_pkgversion}-idna
|
||||||
|
Requires: python%{python3_pkgversion}-idna
|
||||||
|
|
||||||
|
# grep __version__ src/urllib3/packages/six.py
|
||||||
|
Provides: bundled(python%{python3_pkgversion}dist(six)) = 1.16.0
|
||||||
|
|
||||||
|
%description
|
||||||
|
urllib3 is a powerful, user-friendly HTTP client for Python. urllib3 brings
|
||||||
|
many critical features that are missing from the Python standard libraries:
|
||||||
|
|
||||||
|
• Thread safety.
|
||||||
|
• Connection pooling.
|
||||||
|
• Client-side SSL/TLS verification.
|
||||||
|
• File uploads with multipart encoding.
|
||||||
|
• Helpers for retrying requests and dealing with HTTP redirects.
|
||||||
|
• Support for gzip, deflate, brotli, and zstd encoding.
|
||||||
|
• Proxy support for HTTP and SOCKS.
|
||||||
|
• 100% test coverage.}
|
||||||
|
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -n urllib3-%{version} -p1
|
||||||
|
# Make sure that the RECENT_DATE value doesn't get too far behind what the current date is.
|
||||||
|
# RECENT_DATE must not be older that 2 years from the build time, or else test_recent_date
|
||||||
|
# (from test/test_connection.py) would fail. However, it shouldn't be to close to the build time either,
|
||||||
|
# since a user's system time could be set to a little in the past from what build time is (because of timezones,
|
||||||
|
# corner cases, etc). As stated in the comment in src/urllib3/connection.py:
|
||||||
|
# When updating RECENT_DATE, move it to within two years of the current date,
|
||||||
|
# and not less than 6 months ago.
|
||||||
|
# Example: if Today is 2018-01-01, then RECENT_DATE should be any date on or
|
||||||
|
# after 2016-01-01 (today - 2 years) AND before 2017-07-01 (today - 6 months)
|
||||||
|
# There is also a test_ssl_wrong_system_time test (from test/with_dummyserver/test_https.py) that tests if
|
||||||
|
# user's system time isn't set as too far in the past, because it could lead to SSL verification errors.
|
||||||
|
# That is why we need RECENT_DATE to be set at most 2 years ago (or else test_ssl_wrong_system_time would
|
||||||
|
# result in false positive), but before at least 6 month ago (so this test could tolerate user's system time being
|
||||||
|
# set to some time in the past, but not to far away from the present).
|
||||||
|
# Next few lines update RECENT_DATE dynamically.
|
||||||
|
recent_date=$(date --date "7 month ago" +"%Y, %_m, %_d")
|
||||||
|
sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_date)/" src/urllib3/connection.py
|
||||||
|
|
||||||
|
# Use the standard library instead of a backport
|
||||||
|
sed -i -e 's/^import mock/from unittest import mock/' \
|
||||||
|
-e 's/^from mock import /from unittest.mock import /' \
|
||||||
|
test/*.py docs/conf.py
|
||||||
|
|
||||||
|
|
||||||
|
%build
|
||||||
|
%py3_build
|
||||||
|
|
||||||
|
|
||||||
|
%install
|
||||||
|
%py3_install
|
||||||
|
|
||||||
|
|
||||||
|
%check
|
||||||
|
%if %{with tests}
|
||||||
|
# Drop the dummyserver tests in koji. They fail there in real builds, but not
|
||||||
|
# in scratch builds (weird).
|
||||||
|
ignore="${ignore-} --ignore=test/with_dummyserver/"
|
||||||
|
# Don't run the Google App Engine tests
|
||||||
|
ignore="${ignore-} --ignore=test/appengine/"
|
||||||
|
# Lots of these tests started failing, even for old versions, so it has something
|
||||||
|
# to do with Fedora in particular. They don't fail in upstream build infrastructure
|
||||||
|
ignore="${ignore-} --ignore=test/contrib/"
|
||||||
|
# Tests for Python built without SSL, but Fedora builds with SSL. These tests
|
||||||
|
# fail when combined with the unbundling of backports-ssl_match_hostname
|
||||||
|
ignore="${ignore-} --ignore=test/test_no_ssl.py"
|
||||||
|
%pytest -v ${ignore-}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
%files -n python%{python3_pkgversion}-urllib3
|
||||||
|
%license LICENSE.txt
|
||||||
|
%doc CHANGES.rst README.rst
|
||||||
|
%{python3_sitelib}/urllib3/
|
||||||
|
%{python3_sitelib}/urllib3-*.egg-info/
|
||||||
|
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Thu Sep 26 2024 Lumír Balhar <lbalhar@redhat.com> - 1.26.18-2.1
|
||||||
|
- Security fix for CVE-2024-37891
|
||||||
|
Resolves: RHEL-59997
|
||||||
|
|
||||||
|
* Tue Jan 23 2024 Miro Hrončok <mhroncok@redhat.com> - 1.26.18-2
|
||||||
|
- Rebuilt for timestamp .pyc invalidation mode
|
||||||
|
|
||||||
|
* Mon Oct 23 2023 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.26.18-1
|
||||||
|
- Initial package
|
||||||
|
- Fedora contributions by
|
||||||
|
Adam Williamson <awilliam@redhat.com>
|
||||||
|
Anna Khaitovich <akhaitov@redhat.com>
|
||||||
|
Arun S A G <sagarun@gmail.com>
|
||||||
|
Benjamin A. Beasley <code@musicinmybrain.net>
|
||||||
|
Carl George <carl@george.computer>
|
||||||
|
Charalampos Stratakis <cstratak@redhat.com>
|
||||||
|
Dennis Gilmore <dennis@ausil.us>
|
||||||
|
Haikel Guemar <hguemar@fedoraproject.org>
|
||||||
|
Iryna Shcherbina <shcherbina.iryna@gmail.com>
|
||||||
|
Jeremy Cline <jeremy@jcline.org>
|
||||||
|
Karolina Surma <ksurma@redhat.com>
|
||||||
|
Kevin Fenzi <kevin@scrye.com>
|
||||||
|
Lukas Slebodnik <lslebodn@redhat.com>
|
||||||
|
Lumir Balhar <lbalhar@redhat.com>
|
||||||
|
Maxwell G <maxwell@gtmx.me>
|
||||||
|
Miro Hrončok <miro@hroncok.cz>
|
||||||
|
Ralph Bean <rbean@redhat.com>
|
||||||
|
Robert Kuska <rkuska@redhat.com>
|
||||||
|
Slavek Kabrda <bkabrda@redhat.com>
|
||||||
|
Tomas Hoger <thoger@redhat.com>
|
||||||
|
Tomáš Hrnčiar <thrnciar@redhat.com>
|
||||||
|
Tom Callaway <spot@fedoraproject.org>
|
||||||
|
Toshio Kuratomi <toshio@fedoraproject.org>
|
||||||
|
Yaakov Selkowitz <yselkowi@redhat.com>
|
||||||
|
yatinkarel <ykarel@redhat.com>
|
Loading…
Reference in new issue