Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

security updates for setuptools, requests, urllib, zipp, twitcher #622

Merged
merged 5 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,16 @@ Changes
`Unreleased <https://github.com/Ouranosinc/Magpie/tree/master>`_ (latest)
------------------------------------------------------------------------------------

* Nothing new for the moment.
Features / Changes
~~~~~~~~~~~~~~~~~~~~~

* Update docker with latest ``python:3.11-alpine3.20`` base.
* Pin ``setuptools>=71.0.3`` for CVE-2024-6345.
* Pin ``requests>=2.32.3`` for CVE-2024-35195.
* Pin ``urllib3>=2.2.2`` for CVE-2024-37891.
* Pin ``zipp>=3.19.1`` for CVE-2024-5569.
* Pin ``pyramid-twitcher>=0.10.0`` and ``birdhouse/twitcher:v0.10.0`` for same security updates as above
(relates to `bird-house/twitcher#136 <https://github.com/bird-house/twitcher/pull/136>`_).

.. _changes_4.1.0:

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-alpine3.19
FROM python:3.11-alpine3.20
LABEL Description="Runs Magpie AuthN/AuthZ service for REST-API and UI interfaces."
LABEL Maintainer="Francis Charette-Migneault <francis.charette-migneault@crim.ca>"
LABEL Vendor="CRIM"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.adapter
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# docker run will need to override ini file with mounted volume
# using config 'twitcher.adapter = magpie.adapter.MagpieAdapter'
#
FROM birdhouse/twitcher:v0.9.0
FROM birdhouse/twitcher:v0.10.0
LABEL Description="Configures MagpieAdapter on top of Twitcher application."
LABEL Maintainer="Francis Charette-Migneault <francis.charette-migneault@crim.ca>"
LABEL Vendor="CRIM"
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mock>4
pylint>=2.11,!=2.12,!=2.15
pylint-quotes
# bird-house/twticher, must match version in Dockerfile.adapater
pyramid-twitcher>=0.9.0
pyramid-twitcher>=0.10.0
pytest
safety
tox>=3.0
Expand Down
1 change: 1 addition & 0 deletions requirements-doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# these are doc-only requirements
# we actually need to install all requirements during docs build because of OpenAPI generation
# (see 'docs/conf.py')
-r requirements.txt
astroid<2.12 # pin to resolve sphinx-autoapi (see https://github.com/readthedocs/sphinx-autoapi/issues/349)
pycodestyle>=2.6.0,<3
# sphinx-autoapi dropped 3.5 support at 1.3.0
Expand Down
3 changes: 2 additions & 1 deletion requirements-sys.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
pip
setuptools>=65.5.1
packaging>=22.0
setuptools>=71.0.3
4 changes: 3 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pyramid_retry==2.1.1
pyramid_tm>=2.2.1
python-dotenv
pyyaml>=5.1
requests
requests>=2.32.3
requests_file
simplejson
six>=1.12.0
Expand All @@ -36,8 +36,10 @@ sqlalchemy-utils==0.39.0 # pyup: ignore
threddsclient>=0.4.2
transaction
typing_extensions
urllib3>=2.2.2
wheel>=0.38
webob
ziggurat_foundations==0.9.1
zope.interface>=4.7.2,<5
zope.sqlalchemy==1.6
zipp>=3.19.1
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def _extra_requirements(base_requirements, other_requirements):
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
],
python_requires=">=3.5, <4",
python_requires=">=3.8, <4",

# -- Package structure -------------------------------------------------
packages=[__meta__.__package__],
Expand Down
Loading