Compare commits
No commits in common. "imports/c8-beta/python-urllib3-1.24.2-2.el8" and "c8" have entirely different histories.
imports/c8
...
c8
|
@ -1 +0,0 @@
|
||||||
02f5f10287e42a0e9d8666bbec9c51c4aec5bfc7 SOURCES/urllib3-1.24.2.tar.gz
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
diff --git a/src/urllib3/connection.py b/src/urllib3/connection.py
|
||||||
|
index 02b3665..1ab1890 100644
|
||||||
|
--- a/src/urllib3/connection.py
|
||||||
|
+++ b/src/urllib3/connection.py
|
||||||
|
@@ -1,4 +1,5 @@
|
||||||
|
from __future__ import absolute_import
|
||||||
|
+import re
|
||||||
|
import datetime
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
@@ -61,6 +62,8 @@ port_by_scheme = {
|
||||||
|
# after 2016-01-01 (today - 2 years) AND before 2017-07-01 (today - 6 months)
|
||||||
|
RECENT_DATE = datetime.date(2017, 6, 30)
|
||||||
|
|
||||||
|
+_CONTAINS_CONTROL_CHAR_RE = re.compile(r"[^-!#$%&'*+.^_`|~0-9a-zA-Z]")
|
||||||
|
+
|
||||||
|
|
||||||
|
class DummyConnection(object):
|
||||||
|
"""Used to detect a failed ConnectionCls import."""
|
||||||
|
@@ -181,6 +184,17 @@ class HTTPConnection(_HTTPConnection, object):
|
||||||
|
conn = self._new_conn()
|
||||||
|
self._prepare_conn(conn)
|
||||||
|
|
||||||
|
+ def putrequest(self, method, url, *args, **kwargs):
|
||||||
|
+ """Send a request to the server"""
|
||||||
|
+ match = _CONTAINS_CONTROL_CHAR_RE.search(method)
|
||||||
|
+ if match:
|
||||||
|
+ raise ValueError(
|
||||||
|
+ "Method cannot contain non-token characters %r (found at least %r)"
|
||||||
|
+ % (method, match.group())
|
||||||
|
+ )
|
||||||
|
+
|
||||||
|
+ return _HTTPConnection.putrequest(self, method, url, *args, **kwargs)
|
||||||
|
+
|
||||||
|
def request_chunked(self, method, url, body=None, headers=None):
|
||||||
|
"""
|
||||||
|
Alternative to the common request method, which sends the
|
|
@ -0,0 +1,39 @@
|
||||||
|
From 24603488c43a7cbaffcff7e69a72ad9bb4604acf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Lumir Balhar <lbalhar@redhat.com>
|
||||||
|
Date: Thu, 12 Oct 2023 14:08:31 +0200
|
||||||
|
Subject: [PATCH] CVE-2023-43804
|
||||||
|
|
||||||
|
---
|
||||||
|
src/urllib3/util/retry.py | 2 +-
|
||||||
|
test/test_retry.py | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/urllib3/util/retry.py b/src/urllib3/util/retry.py
|
||||||
|
index 02429ee..c4a687c 100644
|
||||||
|
--- a/src/urllib3/util/retry.py
|
||||||
|
+++ b/src/urllib3/util/retry.py
|
||||||
|
@@ -151,7 +151,7 @@ class Retry(object):
|
||||||
|
|
||||||
|
RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])
|
||||||
|
|
||||||
|
- DEFAULT_REDIRECT_HEADERS_BLACKLIST = frozenset(['Authorization'])
|
||||||
|
+ DEFAULT_REDIRECT_HEADERS_BLACKLIST = frozenset(['Cookie', 'Authorization'])
|
||||||
|
|
||||||
|
#: Maximum backoff time.
|
||||||
|
BACKOFF_MAX = 120
|
||||||
|
diff --git a/test/test_retry.py b/test/test_retry.py
|
||||||
|
index 7546c43..b6d52bf 100644
|
||||||
|
--- a/test/test_retry.py
|
||||||
|
+++ b/test/test_retry.py
|
||||||
|
@@ -253,7 +253,7 @@ class TestRetry(object):
|
||||||
|
def test_retry_default_remove_headers_on_redirect(self):
|
||||||
|
retry = Retry()
|
||||||
|
|
||||||
|
- assert list(retry.remove_headers_on_redirect) == ['authorization']
|
||||||
|
+ assert retry.remove_headers_on_redirect == {'authorization', 'cookie'}
|
||||||
|
|
||||||
|
def test_retry_set_remove_headers_on_redirect(self):
|
||||||
|
retry = Retry(remove_headers_on_redirect=['x-api-secret'])
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -0,0 +1,94 @@
|
||||||
|
From 6f6011442b255b6c135c294500cf4d404f594d8a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Lumir Balhar <lbalhar@redhat.com>
|
||||||
|
Date: Tue, 12 Dec 2023 10:21:34 +0100
|
||||||
|
Subject: [PATCH] Security fix for CVE-2023-45803
|
||||||
|
|
||||||
|
---
|
||||||
|
src/urllib3/_collections.py | 18 ++++++++++++++++++
|
||||||
|
src/urllib3/connectionpool.py | 5 +++++
|
||||||
|
src/urllib3/poolmanager.py | 7 +++++--
|
||||||
|
3 files changed, 28 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/urllib3/_collections.py b/src/urllib3/_collections.py
|
||||||
|
index 34f2381..86fc900 100644
|
||||||
|
--- a/src/urllib3/_collections.py
|
||||||
|
+++ b/src/urllib3/_collections.py
|
||||||
|
@@ -260,6 +260,24 @@ class HTTPHeaderDict(MutableMapping):
|
||||||
|
else:
|
||||||
|
return vals[1:]
|
||||||
|
|
||||||
|
+ def _prepare_for_method_change(self):
|
||||||
|
+ """
|
||||||
|
+ Remove content-specific header fields before changing the request
|
||||||
|
+ method to GET or HEAD according to RFC 9110, Section 15.4.
|
||||||
|
+ """
|
||||||
|
+ content_specific_headers = [
|
||||||
|
+ "Content-Encoding",
|
||||||
|
+ "Content-Language",
|
||||||
|
+ "Content-Location",
|
||||||
|
+ "Content-Type",
|
||||||
|
+ "Content-Length",
|
||||||
|
+ "Digest",
|
||||||
|
+ "Last-Modified",
|
||||||
|
+ ]
|
||||||
|
+ for header in content_specific_headers:
|
||||||
|
+ self.discard(header)
|
||||||
|
+ return self
|
||||||
|
+
|
||||||
|
# Backwards compatibility for httplib
|
||||||
|
getheaders = getlist
|
||||||
|
getallmatchingheaders = getlist
|
||||||
|
diff --git a/src/urllib3/connectionpool.py b/src/urllib3/connectionpool.py
|
||||||
|
index f7a8f19..ad6303c 100644
|
||||||
|
--- a/src/urllib3/connectionpool.py
|
||||||
|
+++ b/src/urllib3/connectionpool.py
|
||||||
|
@@ -32,6 +32,7 @@ from .connection import (
|
||||||
|
HTTPConnection, HTTPSConnection, VerifiedHTTPSConnection,
|
||||||
|
HTTPException, BaseSSLError,
|
||||||
|
)
|
||||||
|
+from ._collections import HTTPHeaderDict
|
||||||
|
from .request import RequestMethods
|
||||||
|
from .response import HTTPResponse
|
||||||
|
|
||||||
|
@@ -679,7 +680,11 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
|
||||||
|
redirect_location = redirect and response.get_redirect_location()
|
||||||
|
if redirect_location:
|
||||||
|
if response.status == 303:
|
||||||
|
+ # Change the method according to RFC 9110, Section 15.4.4.
|
||||||
|
method = 'GET'
|
||||||
|
+ # And lose the body not to transfer anything sensitive.
|
||||||
|
+ body = None
|
||||||
|
+ headers = HTTPHeaderDict(headers)._prepare_for_method_change()
|
||||||
|
|
||||||
|
try:
|
||||||
|
retries = retries.increment(method, url, response=response, _pool=self)
|
||||||
|
diff --git a/src/urllib3/poolmanager.py b/src/urllib3/poolmanager.py
|
||||||
|
index 32bd973..37557f9 100644
|
||||||
|
--- a/src/urllib3/poolmanager.py
|
||||||
|
+++ b/src/urllib3/poolmanager.py
|
||||||
|
@@ -3,7 +3,7 @@ import collections
|
||||||
|
import functools
|
||||||
|
import logging
|
||||||
|
|
||||||
|
-from ._collections import RecentlyUsedContainer
|
||||||
|
+from ._collections import HTTPHeaderDict, RecentlyUsedContainer
|
||||||
|
from .connectionpool import HTTPConnectionPool, HTTPSConnectionPool
|
||||||
|
from .connectionpool import port_by_scheme
|
||||||
|
from .exceptions import LocationValueError, MaxRetryError, ProxySchemeUnknown
|
||||||
|
@@ -330,9 +330,12 @@ class PoolManager(RequestMethods):
|
||||||
|
# Support relative URLs for redirecting.
|
||||||
|
redirect_location = urljoin(url, redirect_location)
|
||||||
|
|
||||||
|
- # RFC 7231, Section 6.4.4
|
||||||
|
if response.status == 303:
|
||||||
|
+ # Change the method according to RFC 9110, Section 15.4.4.
|
||||||
|
method = 'GET'
|
||||||
|
+ # And lose the body not to transfer anything sensitive.
|
||||||
|
+ kw["body"] = None
|
||||||
|
+ kw["headers"] = HTTPHeaderDict(kw["headers"])._prepare_for_method_change()
|
||||||
|
|
||||||
|
retries = kw.get('retries')
|
||||||
|
if not isinstance(retries, Retry):
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
|
@ -0,0 +1,56 @@
|
||||||
|
From c9ed53c284a6747f17366eab71ba8922e33910e2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Lumir Balhar <lbalhar@redhat.com>
|
||||||
|
Date: Wed, 28 Aug 2019 14:55:26 +0200
|
||||||
|
Subject: [PATCH] Backported patch from:
|
||||||
|
https://github.com/urllib3/urllib3/commit/6a626be4ff623c25270e20db9002705bf4504e4e
|
||||||
|
|
||||||
|
Enable TLS 1.3 post-handshake authentication
|
||||||
|
---
|
||||||
|
src/urllib3/util/ssl_.py | 7 +++++++
|
||||||
|
test/test_ssl.py | 15 +++++++++++++++
|
||||||
|
2 files changed, 22 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/urllib3/util/ssl_.py b/src/urllib3/util/ssl_.py
|
||||||
|
index 5ae4358..7dc4a5a 100644
|
||||||
|
--- a/src/urllib3/util/ssl_.py
|
||||||
|
+++ b/src/urllib3/util/ssl_.py
|
||||||
|
@@ -280,6 +280,13 @@ def create_urllib3_context(ssl_version=None, cert_reqs=None,
|
||||||
|
|
||||||
|
context.options |= options
|
||||||
|
|
||||||
|
+ # Enable post-handshake authentication for TLS 1.3, see GH #1634. PHA is
|
||||||
|
+ # necessary for conditional client cert authentication with TLS 1.3.
|
||||||
|
+ # The attribute is None for OpenSSL <= 1.1.0 or does not exist in older
|
||||||
|
+ # versions of Python.
|
||||||
|
+ if getattr(context, "post_handshake_auth", None) is not None:
|
||||||
|
+ context.post_handshake_auth = True
|
||||||
|
+
|
||||||
|
context.verify_mode = cert_reqs
|
||||||
|
if getattr(context, 'check_hostname', None) is not None: # Platform-specific: Python 3.2
|
||||||
|
# We do our own verification, including fingerprints and alternative
|
||||||
|
diff --git a/test/test_ssl.py b/test/test_ssl.py
|
||||||
|
index 6a46b4f..3a99522 100644
|
||||||
|
--- a/test/test_ssl.py
|
||||||
|
+++ b/test/test_ssl.py
|
||||||
|
@@ -125,3 +125,18 @@ def test_wrap_socket_default_loads_default_certs(monkeypatch):
|
||||||
|
ssl_.ssl_wrap_socket(sock)
|
||||||
|
|
||||||
|
context.load_default_certs.assert_called_with()
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+@pytest.mark.parametrize(
|
||||||
|
+ ["pha", "expected_pha"], [(None, None), (False, True), (True, True)]
|
||||||
|
+)
|
||||||
|
+def test_create_urllib3_context_pha(monkeypatch, pha, expected_pha):
|
||||||
|
+ context = mock.create_autospec(ssl_.SSLContext)
|
||||||
|
+ context.set_ciphers = mock.Mock()
|
||||||
|
+ context.options = 0
|
||||||
|
+ context.post_handshake_auth = pha
|
||||||
|
+ monkeypatch.setattr(ssl_, "SSLContext", lambda *_, **__: context)
|
||||||
|
+
|
||||||
|
+ assert ssl_.create_urllib3_context() is context
|
||||||
|
+
|
||||||
|
+ assert context.post_handshake_auth == expected_pha
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Name: python-%{srcname}
|
Name: python-%{srcname}
|
||||||
Version: 1.24.2
|
Version: 1.24.2
|
||||||
Release: 2%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: Python HTTP library with thread-safe connection pooling and file post
|
Summary: Python HTTP library with thread-safe connection pooling and file post
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
|
@ -22,6 +22,31 @@ BuildArch: noarch
|
||||||
# * https://github.com/urllib3/urllib3/pull/1593
|
# * https://github.com/urllib3/urllib3/pull/1593
|
||||||
Patch1: CVE-2019-11236.patch
|
Patch1: CVE-2019-11236.patch
|
||||||
|
|
||||||
|
# Enable post-handshake authentication for TLS 1.3
|
||||||
|
# - https://github.com/urllib3/urllib3/issues/1634
|
||||||
|
# - https://bugzilla.redhat.com/show_bug.cgi?id=1726743
|
||||||
|
Patch2: Enable_TLS_1.3_post-handshake_authentication.patch
|
||||||
|
|
||||||
|
# CVE-2020-26137
|
||||||
|
# CRLF injection via HTTP request method
|
||||||
|
# Resolved upstream: https://github.com/urllib3/urllib3/pull/1800
|
||||||
|
Patch3: CVE-2020-26137.patch
|
||||||
|
|
||||||
|
# CVE-2023-43804
|
||||||
|
# Added the `Cookie` 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`.
|
||||||
|
# Tests backported only partially as we don't use the whole part of
|
||||||
|
# testing with dummyserver.
|
||||||
|
# Tracking bug: https://bugzilla.redhat.com/show_bug.cgi?id=2242493
|
||||||
|
# Upstream fix: https://github.com/urllib3/urllib3/commit/01220354d389cd05474713f8c982d05c9b17aafb
|
||||||
|
Patch4: CVE-2023-43804.patch
|
||||||
|
|
||||||
|
# CVE-2023-45803
|
||||||
|
# Remove HTTP request body when request method is changed.
|
||||||
|
# Tracking bug: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2023-45803
|
||||||
|
# Upstream fix: https://github.com/urllib3/urllib3/commit/4e98d57809dacab1cbe625fddeec1a290c478ea9
|
||||||
|
Patch5: CVE-2023-45803.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Python HTTP module with connection pooling and file POST abilities.
|
Python HTTP module with connection pooling and file POST abilities.
|
||||||
|
@ -50,6 +75,30 @@ Python3 HTTP module with connection pooling and file POST abilities.
|
||||||
%setup -q -n %{srcname}-%{version}
|
%setup -q -n %{srcname}-%{version}
|
||||||
|
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
%patch5 -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
|
||||||
|
|
||||||
|
|
||||||
# Drop the dummyserver tests in koji.
|
# Drop the dummyserver tests in koji.
|
||||||
# These require tornado, a Web framework otherwise unused in the distro.
|
# These require tornado, a Web framework otherwise unused in the distro.
|
||||||
|
@ -105,6 +154,27 @@ popd
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 12 2023 Lumír Balhar <lbalhar@redhat.com> - 1.24.2-7
|
||||||
|
- Security fix for CVE-2023-45803
|
||||||
|
Resolves: RHEL-16872
|
||||||
|
|
||||||
|
* Thu Oct 12 2023 Lumír Balhar <lbalhar@redhat.com> - 1.24.2-6
|
||||||
|
- Security fix for CVE-2023-43804
|
||||||
|
Resolves: RHEL-11992
|
||||||
|
|
||||||
|
* Mon Nov 09 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.24.2-5
|
||||||
|
- Security fix for CVE-2020-26137
|
||||||
|
Resolves: rhbz#1883889
|
||||||
|
|
||||||
|
* Wed Oct 30 2019 Anna Khaitovich <akhaitov@redhat.com> - 1.24.2-4
|
||||||
|
- Update RECENT_DATE dynamically
|
||||||
|
Resolves: rhbz#1761380
|
||||||
|
|
||||||
|
* Wed Aug 28 2019 Lumír Balhar <lbalhar@redhat.com> - 1.24.2-3
|
||||||
|
- Enable TLS 1.3 post-handshake authentication
|
||||||
|
- Adjust RECENT_DATE variable according to rules
|
||||||
|
Resolves: rhbz#1726743
|
||||||
|
|
||||||
* Wed May 22 2019 Tomas Orsava <torsava@redhat.com> - 1.24.2-2
|
* Wed May 22 2019 Tomas Orsava <torsava@redhat.com> - 1.24.2-2
|
||||||
- Rebuilding after gating was enabled
|
- Rebuilding after gating was enabled
|
||||||
- Resolves: rhbz#1703361 rhbz#1706026
|
- Resolves: rhbz#1703361 rhbz#1706026
|
||||||
|
|
Loading…
Reference in New Issue