Skip to content

Commit 5f998e0

Browse files
authored
fix: ensure Python 3.11.13 is used to address GHSA-4xh5-x5gv-qwph (#1197)
This PR ensures Python 3.11.13 is used to mitigate the vulnerability identified in GHSA-4xh5-x5gv-qwph, as this version is not affected by the CVE. Signed-off-by: behnazh-w <behnaz.hassanshahi@oracle.com>
1 parent 7894018 commit 5f998e0

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,12 +257,15 @@ requirements.txt: pyproject.toml
257257
# editable mode (like the one in development here) because they may not have
258258
# a PyPI entry; also print out CVE description and potential fixes if audit
259259
# found an issue.
260+
# Ignore GHSA-4xh5-x5gv-qwph since we are using Python >=3.11.13, which is not vulnerable to this
261+
# CVE. Remove this once a new version of pip that fixes the CVE is released.
262+
# See https://github.com/pypa/pip/issues/13607
260263
.PHONY: audit
261264
audit:
262265
if ! $$(python -c "import pip_audit" &> /dev/null); then \
263266
echo "No package pip_audit installed, upgrade your environment!" && exit 1; \
264267
fi;
265-
python -m pip_audit --skip-editable --desc on --fix --dry-run
268+
python -m pip_audit --skip-editable --desc on --fix --dry-run --ignore-vuln GHSA-4xh5-x5gv-qwph
266269

267270
# Run some or all checks over the package code base.
268271
.PHONY: check check-code check-bandit check-flake8 check-lint check-mypy check-go check-actionlint

docker/Dockerfile.base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ enabled=1\
6262
# Exceptions (not installed):
6363
# mcpp - The package mcpp is not available in Oracle Linux 9. However, we don't use Souffle's feature
6464
# that needs it.
65-
# python3 - We use the installed Python3.11.2 for this.
65+
# python3 - We use the installed Python3.11.13 for this.
6666
gcc-c++ \
6767
libffi \
6868
libffi-devel \

docs/source/pages/supported_technologies/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Automatic dependency resolution
115115

116116
Currently, we support the following type of project for automatic dependency resolution.
117117

118-
* Python (with a Python virtual environment created and packages installed using Python3.11, see :ref:`providing Python virtual environment <python-venv-deps>`.)
118+
* Python (with a Python virtual environment created and packages installed using Python3.11.13, see :ref:`providing Python virtual environment <python-venv-deps>`.)
119119

120120
--------
121121
See also

docs/source/pages/tutorials/detect_malicious_package.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Macaron supports analyzing a package's dependencies and performs the same set of
190190

191191
Let's assume ``/tmp/.django_venv`` is the virtual environment where ``django@5.0.6`` is installed.
192192

193-
.. note:: If you want Macaron to analyze the virtual environment directly to identify the dependencies, we require Python 3.11 to be used to install the package. Alternatively, you can generate the SBOM as instructed :ref:`here <python-sbom>` and pass it to Macaron as input.
193+
.. note:: If you want Macaron to analyze the virtual environment directly to identify the dependencies, we require Python 3.11.13 to be used to install the package. Alternatively, you can generate the SBOM as instructed :ref:`here <python-sbom>` and pass it to Macaron as input.
194194

195195
Run Macaron as follows to analyze ``django`` and its direct dependencies.
196196

docs/source/pages/using.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ Where ``--python-venv`` is the path to virtual environment.
374374

375375
Alternatively, you can create an SBOM for the python package and provide it to Macaron as input as explained :ref:`here <with-sbom>`.
376376

377-
.. note:: We only support Python 3.11 for this feature of Macaron. Please make sure to install the package using this version of Python.
377+
.. note:: We only support Python 3.11.13 for this feature of Macaron. Please make sure to install the package using this version of Python.
378378

379379

380380
-----------------------------------------------

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ build-backend = "flit_core.buildapi"
99

1010
[project]
1111
name = "macaron"
12-
requires-python = ">=3.11"
12+
requires-python = ">=3.11.13"
1313
authors = [
1414
{"name" = "Trong Nhan Mai", "email" = "trong.nhan.mai@oracle.com"},
1515
{"name" = "Behnaz Hassanshahi", "email" = "behnaz.hassanshahi@oracle.com"},

0 commit comments

Comments
 (0)