已开启
upgrade package to version 2.2.3 #111
kkzhs创建于 2024年9月20日
upgrade package to version 2.2.3 #111
已开启
从refs/pull/111/head合入到master
共 4 个文件变更+10-80
Binary files do not support preview
| @@ -1,72 +0,0 @@ | |||
| 1 | -From accff72ecc2f6cf5a76d9570198a93ac7c90270e Mon Sep 17 00:00:00 2001 | ||
| 2 | -From: Quentin Pradet <quentin.pradet@gmail.com> | ||
| 3 | -Date: Mon, 17 Jun 2024 11:09:06 +0400 | ||
| 4 | -Subject: [PATCH] Merge pull request from GHSA-34jh-p97f-mpxf | ||
| 5 | - | ||
| 6 | -* Strip Proxy-Authorization header on redirects | ||
| 7 | - | ||
| 8 | -* Fix test_retry_default_remove_headers_on_redirect | ||
| 9 | - | ||
| 10 | -* Set release date | ||
| 11 | - | ||
| 12 | -Conflict:test/with_dummyserver/test_poolmanager.py hsa not been modified | ||
| 13 | -because it has been deleted in the pre-phase of the spec file | ||
| 14 | -Reference:https://github.com/urllib3/urllib3/commit/accff72ecc2f6cf5a76d9570198a93ac7c90270e | ||
| 15 | - | ||
| 16 | ---- | ||
| 17 | - CHANGES.rst | 5 +++++ | ||
| 18 | - src/urllib3/util/retry.py | 4 +++- | ||
| 19 | - test/test_retry.py | 6 +++++- | ||
| 20 | - 3 files changed, 13 insertions(+), 2 deletions(-) | ||
| 21 | - | ||
| 22 | -diff --git a/CHANGES.rst b/CHANGES.rst | ||
| 23 | -index 3a0a4f0..eba0814 100644 | ||
| 24 | ---- a/CHANGES.rst | ||
| 25 | -+++ b/CHANGES.rst | ||
| 26 | - | ||
| 27 | - Changes | ||
| 28 | - ======= | ||
| 29 | - | ||
| 30 | -+2.2.2 (2024-06-17) | ||
| 31 | -+================== | ||
| 32 | -+ | ||
| 33 | -+- Added the ``Proxy-Authorization`` header to the list of headers to strip from requests when redirecting to a different host. As before, different headers can be set via ``Retry.remove_headers_on_redirect``. | ||
| 34 | -+ | ||
| 35 | - 1.26.18 (2023-10-17) | ||
| 36 | - -------------------- | ||
| 37 | - | ||
| 38 | -diff --git a/src/urllib3/util/retry.py b/src/urllib3/util/retry.py | ||
| 39 | -index 60ef6c4..9a1e90d 100644 | ||
| 40 | ---- a/src/urllib3/util/retry.py | ||
| 41 | -+++ b/src/urllib3/util/retry.py | ||
| 42 | - class Retry(object): | ||
| 43 | - RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503]) | ||
| 44 | - | ||
| 45 | - #: Default headers to be used for ``remove_headers_on_redirect`` | ||
| 46 | -- DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"]) | ||
| 47 | -+ DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset( | ||
| 48 | -+ ["Cookie", "Authorization", "Proxy-Authorization"] | ||
| 49 | -+ ) | ||
| 50 | - | ||
| 51 | - #: Maximum backoff time. | ||
| 52 | - DEFAULT_BACKOFF_MAX = 120 | ||
| 53 | -diff --git a/test/test_retry.py b/test/test_retry.py | ||
| 54 | -index 6475f2a..a0463e4 100644 | ||
| 55 | ---- a/test/test_retry.py | ||
| 56 | -+++ b/test/test_retry.py | ||
| 57 | - class TestRetry(object): | ||
| 58 | - def test_retry_default_remove_headers_on_redirect(self): | ||
| 59 | - retry = Retry() | ||
| 60 | - | ||
| 61 | -- assert retry.remove_headers_on_redirect == {"authorization", "cookie"} | ||
| 62 | -+ assert retry.remove_headers_on_redirect == { | ||
| 63 | -+ "authorization", | ||
| 64 | -+ "proxy-authorization", | ||
| 65 | -+ "cookie", | ||
| 66 | -+ } | ||
| 67 | - | ||
| 68 | - def test_retry_set_remove_headers_on_redirect(self): | ||
| 69 | - retry = Retry(remove_headers_on_redirect=["X-API-Secret"]) | ||
| 70 | --- | ||
| 71 | -2.33.0 | ||
| 72 | - | ||
| @@ -2,22 +2,18 @@ | |||
| 2 | %bcond_without tests | 2 | %bcond_without tests |
| 3 | 3 | ||
| 4 | Name: python-%{srcname} | 4 | Name: python-%{srcname} |
| 5 | -Version: 1.26.18 | 5 | +Version: 2.2.3 |
| 6 | -Release: 2 | 6 | +Release: 1 |
| 7 | Summary: Sanity-friendly HTTP client for Python | 7 | Summary: Sanity-friendly HTTP client for Python |
| 8 | License: MIT | 8 | License: MIT |
| 9 | URL: https://urllib3.readthedocs.io | 9 | URL: https://urllib3.readthedocs.io |
| 10 | Source0: https://github.com/urllib3/urllib3/archive/refs/tags/%{version}.tar.gz | 10 | Source0: https://github.com/urllib3/urllib3/archive/refs/tags/%{version}.tar.gz |
| 11 | Source1: ssl_match_hostname_py3.py | 11 | Source1: ssl_match_hostname_py3.py |
| 12 | 12 | ||
| 13 | -Patch0001: remove_mock.patch | ||
| 14 | - | ||
| 15 | -Patch6000: backport-CVE-2024-37891-Strip-Proxy-Authorization-header-on-redirects.patch | ||
| 16 | - | ||
| 17 | BuildArch: noarch | 13 | BuildArch: noarch |
| 18 | 14 | ||
| 19 | -%description | 15 | +%description |
| 20 | -HTTP library with thread-safe connection pooling, file post support, sanity friendly, and more. | 16 | +HTTP library with thread-safe connection pooling, file post support, sanity friendly, and more. |
| 21 | 17 | ||
| 22 | %package -n python3-%{srcname} | 18 | %package -n python3-%{srcname} |
| 23 | Summary: Python3 HTTP library with thread-safe connection pooling and file post | 19 | Summary: Python3 HTTP library with thread-safe connection pooling and file post |
| @@ -78,6 +74,12 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pyt | |||
| 78 | %{python3_sitelib}/urllib3-*.egg-info | 74 | %{python3_sitelib}/urllib3-*.egg-info |
| 79 | 75 | ||
| 80 | %changelog | 76 | %changelog |
| 77 | +* Fri Sep 20 2024 kkz <zhaoshuang@uniontech.com> - 2.2.3-2 | ||
| 78 | +- Upgrade to version 2.2.3 | ||
| 79 | + Added support for Python 3.13 | ||
| 80 | + Some bug fix | ||
| 81 | + HTTP/2 support is still in early development | ||
| 82 | + | ||
| 81 | * Tue Jun 25 2024 chengyechun <chengyechun1@huawei.com> - 1.26.18-2 | 83 | * Tue Jun 25 2024 chengyechun <chengyechun1@huawei.com> - 1.26.18-2 |
| 82 | - Type:CVE | 84 | - Type:CVE |
| 83 | - CVE:CVE-2024-37891 | 85 | - CVE:CVE-2024-37891 |