rpms/python3.11-setuptools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

import CS python3.11-setuptools-65.5.1-3.el9

Browse Source
This commit is contained in:
eabdullin 2024-09-30 16:28:46 +00:00
parent d2d407b834
commit 13f5f10ab9
2 changed files with 205 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
SOURCES/CVE-2024-6345.patch Normal file
View File

@ -0,0 +1,163 @@
From 064c5a14690725a71565da63ccb688c0a63a6f57 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Wed, 24 Jul 2024 14:15:57 +0200
Subject: [PATCH] CVE-2024-6345
---
setuptools/package_index.py | 29 +++++++++------------------
setuptools/tests/test_packageindex.py | 28 +++++++++++++-------------
2 files changed, 23 insertions(+), 34 deletions(-)
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 362e26f..dfc591b 100644
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1,5 +1,6 @@
"""PyPI and direct package downloading."""
+import subprocess
import sys
import os
import re
@@ -874,7 +875,7 @@ class PackageIndex(Environment):
def _download_svn(self, url, filename):
warnings.warn("SVN download support is deprecated", UserWarning)
url = url.split('#', 1)[0] # remove any fragment for svn's sake
- creds = ''
+ creds = []
if url.lower().startswith('svn:') and '@' in url:
scheme, netloc, path, p, q, f = urllib.parse.urlparse(url)
if not netloc and path.startswith('//') and '/' in path[2:]:
@@ -883,14 +884,14 @@ class PackageIndex(Environment):
if auth:
if ':' in auth:
user, pw = auth.split(':', 1)
- creds = " --username=%s --password=%s" % (user, pw)
+ creds = [f"--username={user}", f"--password={pw}"]
else:
- creds = " --username=" + auth
+ creds = [f"--username={auth}"]
netloc = host
parts = scheme, netloc, url, p, q, f
url = urllib.parse.urlunparse(parts)
self.info("Doing subversion checkout from %s to %s", url, filename)
- os.system("svn checkout%s -q %s %s" % (creds, url, filename))
+ subprocess.check_call(["svn", "checkout"] + creds + ["-q", url, filename])
return filename
@staticmethod
@@ -916,17 +917,11 @@ class PackageIndex(Environment):
url, rev = self._vcs_split_rev_from_url(url, pop_prefix=True)
self.info("Doing git clone from %s to %s", url, filename)
- os.system("git clone --quiet %s %s" % (url, filename))
+ subprocess.check_call(["git", "clone", "--quiet", url, filename])
if rev is not None:
self.info("Checking out %s", rev)
- os.system(
- "git -C %s checkout --quiet %s"
- % (
- filename,
- rev,
- )
- )
+ subprocess.check_call(["git", "-C", filename, "checkout", "--quiet", rev])
return filename
@@ -935,17 +930,11 @@ class PackageIndex(Environment):
url, rev = self._vcs_split_rev_from_url(url, pop_prefix=True)
self.info("Doing hg clone from %s to %s", url, filename)
- os.system("hg clone --quiet %s %s" % (url, filename))
+ subprocess.check_call(["hg", "clone", "--quiet", url, filename])
if rev is not None:
self.info("Updating to %s", rev)
- os.system(
- "hg --cwd %s up -C -r %s -q"
- % (
- filename,
- rev,
- )
- )
+ subprocess.check_call(["hg", "--cwd", filename, "up", "-C", "-r", rev, "-q"])
return filename
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 7b0bf11..cf24def 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -190,53 +190,53 @@ class TestPackageIndex:
url = 'git+https://github.example/group/project@master#egg=foo'
index = setuptools.package_index.PackageIndex()
- with mock.patch("os.system") as os_system_mock:
+ with mock.patch("subprocess.check_call") as subprocess_check_call_mock:
result = index.download(url, str(tmpdir))
- os_system_mock.assert_called()
+ subprocess_check_call_mock.assert_called()
expected_dir = str(tmpdir / 'project@master')
expected = (
'git clone --quiet ' 'https://github.example/group/project {expected_dir}'
- ).format(**locals())
- first_call_args = os_system_mock.call_args_list[0][0]
+ ).format(**locals()).split()
+ first_call_args = subprocess_check_call_mock.call_args_list[0][0]
assert first_call_args == (expected,)
tmpl = 'git -C {expected_dir} checkout --quiet master'
- expected = tmpl.format(**locals())
- assert os_system_mock.call_args_list[1][0] == (expected,)
+ expected = tmpl.format(**locals()).split()
+ assert subprocess_check_call_mock.call_args_list[1][0] == (expected,)
assert result == expected_dir
def test_download_git_no_rev(self, tmpdir):
url = 'git+https://github.example/group/project#egg=foo'
index = setuptools.package_index.PackageIndex()
- with mock.patch("os.system") as os_system_mock:
+ with mock.patch("subprocess.check_call") as subprocess_check_call_mock:
result = index.download(url, str(tmpdir))
- os_system_mock.assert_called()
+ subprocess_check_call_mock.assert_called()
expected_dir = str(tmpdir / 'project')
expected = (
'git clone --quiet ' 'https://github.example/group/project {expected_dir}'
- ).format(**locals())
- os_system_mock.assert_called_once_with(expected)
+ ).format(**locals()).split()
+ subprocess_check_call_mock.assert_called_once_with(expected)
def test_download_svn(self, tmpdir):
url = 'svn+https://svn.example/project#egg=foo'
index = setuptools.package_index.PackageIndex()
with pytest.warns(UserWarning):
- with mock.patch("os.system") as os_system_mock:
+ with mock.patch("subprocess.check_call") as subprocess_check_call_mock:
result = index.download(url, str(tmpdir))
- os_system_mock.assert_called()
+ subprocess_check_call_mock.assert_called()
expected_dir = str(tmpdir / 'project')
expected = (
'svn checkout -q ' 'svn+https://svn.example/project {expected_dir}'
- ).format(**locals())
- os_system_mock.assert_called_once_with(expected)
+ ).format(**locals()).split()
+ subprocess_check_call_mock.assert_called_once_with(expected)
class TestContentCheckers:
--
2.45.2

73
SPECS/python3.11-setuptools.spec
View File

@ -21,7 +21,7 @@
Name: python%{python3_pkgversion}-setuptools Name: python%{python3_pkgversion}-setuptools
# When updating, update the bundled libraries versions bellow! # When updating, update the bundled libraries versions bellow!
Version: 65.5.1 Version: 65.5.1
Release: 2%{?dist} Release: 3%{?dist}
Summary: Easily build and distribute Python packages Summary: Easily build and distribute Python packages
# setuptools is MIT # setuptools is MIT
# appdirs is MIT # appdirs is MIT
@ -44,6 +44,13 @@ Source0: %{pypi_source %{srcname} %{version}}
# Some test deps are optional and either not desired or not available in Fedora, thus this patch removes them. # Some test deps are optional and either not desired or not available in Fedora, thus this patch removes them.
Patch0: Remove-optional-or-unpackaged-test-deps.patch Patch0: Remove-optional-or-unpackaged-test-deps.patch
# Security fix for CVE-2024-6345
# Remote code execution via download functions in the package_index module
# Tracking bug: https://bugzilla.redhat.com/show_bug.cgi?id=2297771
# Upstream solution: https://github.com/pypa/setuptools/pull/4332
# Patch simplified because upstream doesn't support SVN anymore.
Patch1: CVE-2024-6345.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-devel
@ -230,39 +237,43 @@ PYTHONPATH=$(pwd) %pytest \
%changelog %changelog
* Wed Jul 24 2024 Lumír Balhar <lbalhar@redhat.com> - 65.5.1-3
- Security fix for CVE-2024-6345
Resolves: RHEL-49992
* Mon Jan 30 2023 Charalampos Stratakis <cstratak@redhat.com> - 65.5.1-2 * Mon Jan 30 2023 Charalampos Stratakis <cstratak@redhat.com> - 65.5.1-2
- Disable bootstrap - Disable bootstrap
* Wed Oct 12 2022 Charalampos Stratakis <cstratak@redhat.com> - 65.5.1-1 * Wed Oct 12 2022 Charalampos Stratakis <cstratak@redhat.com> - 65.5.1-1
- Initial package - Initial package
- Fedora contributions by: - Fedora contributions by:
# Bill Nottingham <notting@fedoraproject.org> Bill Nottingham <notting@fedoraproject.org>
# Charalampos Stratakis <cstratak@redhat.com> Charalampos Stratakis <cstratak@redhat.com>
# David Malcolm <dmalcolm@redhat.com> David Malcolm <dmalcolm@redhat.com>
# Dennis Gilmore <dennis@ausil.us> Dennis Gilmore <dennis@ausil.us>
# dmalcolm <dmalcolm@fedoraproject.org> dmalcolm <dmalcolm@fedoraproject.org>
# Haikel Guemar <hguemar@fedoraproject.org> Haikel Guemar <hguemar@fedoraproject.org>
# Ignacio Vazquez-Abrams <ivazquez@fedoraproject.org> Ignacio Vazquez-Abrams <ivazquez@fedoraproject.org>
# Jesse Keating <jkeating@fedoraproject.org> Jesse Keating <jkeating@fedoraproject.org>
# Karolina Surma <ksurma@redhat.com> Karolina Surma <ksurma@redhat.com>
# Kevin Fenzi <kevin@scrye.com> Kevin Fenzi <kevin@scrye.com>
# Konstantin Ryabitsev <icon@fedoraproject.org> Konstantin Ryabitsev <icon@fedoraproject.org>
# Lumir Balhar <lbalhar@redhat.com> Lumir Balhar <lbalhar@redhat.com>
# Matej Stuchlik <mstuchli@redhat.com> Matej Stuchlik <mstuchli@redhat.com>
# Michal Cyprian <mcyprian@redhat.com> Michal Cyprian <mcyprian@redhat.com>
# Miro Hrončok <miro@hroncok.cz> Miro Hrončok <miro@hroncok.cz>
# Nils Philippsen <nils@redhat.com> Nils Philippsen <nils@redhat.com>
# Orion Poplawski <orion@cora.nwra.com> Orion Poplawski <orion@cora.nwra.com>
# Petr Viktorin <pviktori@redhat.com> Petr Viktorin <pviktori@redhat.com>
# Pierre-Yves Chibon <pingou@pingoured.fr> Pierre-Yves Chibon <pingou@pingoured.fr>
# Ralph Bean <rbean@redhat.com> Ralph Bean <rbean@redhat.com>
# Randy Barlow <randy@electronsweatshop.com> Randy Barlow <randy@electronsweatshop.com>
# Robert Kuska <rkuska@redhat.com> Robert Kuska <rkuska@redhat.com>
# Thomas Spura <thomas.spura@gmail.com> Thomas Spura <thomas.spura@gmail.com>
# Tomáš Hrnčiar <thrnciar@redhat.com> Tomáš Hrnčiar <thrnciar@redhat.com>
# Tomas Orsava <torsava@redhat.com> Tomas Orsava <torsava@redhat.com>
# Tomas Radej <tradej@redhat.com> Tomas Radej <tradej@redhat.com>
# tomspur <tomspur@fedoraproject.org> tomspur <tomspur@fedoraproject.org>
# Toshio Kuratomi <toshio@fedoraproject.org> Toshio Kuratomi <toshio@fedoraproject.org>
# Troy Dawson <tdawson@redhat.com> Troy Dawson <tdawson@redhat.com>
# Ville Skyttä <scop@fedoraproject.org> Ville Skyttä <scop@fedoraproject.org>