From bcea73c074484f08796140a2f6dbef5abcc7a7ef Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Wed, 27 Mar 2024 20:23:02 +0000
Subject: [PATCH] import CS python3.11-urllib3-1.26.12-2.el8

---
 SOURCES/CVE-2023-43804.patch  | 53 +++++++++++++++++++++++++++++++++++
 SPECS/python3.11-urllib3.spec | 15 +++++++++-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/CVE-2023-43804.patch

diff --git a/SOURCES/CVE-2023-43804.patch b/SOURCES/CVE-2023-43804.patch
new file mode 100644
index 0000000..8184d07
--- /dev/null
+++ b/SOURCES/CVE-2023-43804.patch
@@ -0,0 +1,53 @@
+From 85770966476bfdb668d52daef636bb299e76d991 Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Fri, 13 Oct 2023 09:29:29 +0200
+Subject: [PATCH] CVE-2023-43804
+
+---
+ src/urllib3/util/retry.py     | 2 +-
+ test/test_retry.py            | 2 +-
+ test/test_retry_deprecated.py | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/urllib3/util/retry.py b/src/urllib3/util/retry.py
+index 3398323..f727602 100644
+--- a/src/urllib3/util/retry.py
++++ b/src/urllib3/util/retry.py
+@@ -235,7 +235,7 @@ 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(["Authorization"])
++    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"])
+ 
+     #: Maximum backoff time.
+     DEFAULT_BACKOFF_MAX = 120
+diff --git a/test/test_retry.py b/test/test_retry.py
+index f170e57..d7c216b 100644
+--- a/test/test_retry.py
++++ b/test/test_retry.py
+@@ -293,7 +293,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"])
+diff --git a/test/test_retry_deprecated.py b/test/test_retry_deprecated.py
+index 20e9810..d7905cd 100644
+--- a/test/test_retry_deprecated.py
++++ b/test/test_retry_deprecated.py
+@@ -295,7 +295,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
+
diff --git a/SPECS/python3.11-urllib3.spec b/SPECS/python3.11-urllib3.spec
index c10d0f1..fddcb34 100644
--- a/SPECS/python3.11-urllib3.spec
+++ b/SPECS/python3.11-urllib3.spec
@@ -8,7 +8,7 @@
 
 Name:           python%{python3_pkgversion}-%{srcname}
 Version:        1.26.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python HTTP library with thread-safe connection pooling and file post
 
 License:        MIT
@@ -16,6 +16,15 @@ URL:            https://github.com/urllib3/urllib3
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildArch:      noarch
 
+# 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
+Patch1: CVE-2023-43804.patch
 
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-rpm-macros
@@ -111,6 +120,10 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \
 
 
 %changelog
+* Fri Oct 13 2023 Lumír Balhar <lbalhar@redhat.com> - 1.26.12-2
+- Security fix for CVE-2023-43804
+Resolves: RHEL-11996
+
 * Tue Nov 29 2022 Charalampos Stratakis <cstratak@redhat.com> - 1.26.12-1
 - Initial package
 - Fedora contributions by: