.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1 +1 @@
-SOURCES/urllib3-1.26.12.tar.gz
+/urllib3-1.26.12.tar.gz

.python3.11-urllib3.metadata

@@ -1 +0,0 @@
-56ba32ed882d18c787c5b0024c6fb7739aaafb02 SOURCES/urllib3-1.26.12.tar.gz

SOURCES/CVE-2023-43804.patch

@@ -1,53 +0,0 @@
-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
-

gating.yaml

@@ -0,0 +1,7 @@
+--- !Policy
+
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plan.fmf

@@ -0,0 +1,23 @@
+execute:
+  how: tmt
+discover:
+  how: shell
+  dist-git-source: true
+  tests:
+  - name: bundled tests
+    require:
+    - python3.11-pytest
+    - python3.11-pip
+    - python3.11-cryptography
+    - python3.11-pycparser
+    - python3.11-cffi
+    - python3.11-urllib3
+    test: |
+      pip3.11 install trustme==0.9.0 tornado==6.2 pytest-freezegun==0.4.2 &&
+      cd $(dirname $TMT_SOURCE_DIR/urllib3-*/test) &&
+      rm -rf test/appengine test/test_no_ssl.py &&
+      rm -rf test/with_dummyserver test/contrib &&
+      sed -i -e 's/^import mock/from unittest import mock/' \
+        -e 's/^from mock import /from unittest.mock import /' \
+        test/*.py docs/conf.py &&
+      pytest-3.11 test

python3.11-urllib3.spec

@@ -8,7 +8,7 @@
 
 Name:           python%{python3_pkgversion}-%{srcname}
 Version:        1.26.12
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Python HTTP library with thread-safe connection pooling and file post
 
 License:        MIT
@@ -16,15 +16,6 @@ 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
@@ -120,10 +111,6 @@ 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:

sources

@@ -0,0 +1 @@
+SHA512 (urllib3-1.26.12.tar.gz) = 71b4b14782d336a3fc187bb82197be02f06acfca06569e4ae2b73edb64cde2f30fded65eb36a9cbac6172e7c90a49f6d2283c6b9cb27f215e111ae49cf41850f