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

Update cryptography and pyOpenSSL (security) #6055

Merged
merged 13 commits into from
Nov 3, 2023
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ Fixed

* Fix codecov failures for stackstorm/st2 tests. #6035, #6046, #6048

* Update cryptography 3.4.7 -> 39.0.1, pyOpenSSL 21.0.0 -> 23.1.0, paramiko 2.10.5 -> 2.11.0 (security). #6055

Added
~~~~~

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

from __future__ import absolute_import

# Ignore CryptographyDeprecationWarning warnings which appear on older versions of Python 2.7
# Ignore CryptographyDeprecationWarning warnings which appear on Python 3.6
# TODO: Remove after dropping python3.6
import warnings
from cryptography.utils import CryptographyDeprecationWarning

warnings.filterwarnings("ignore", category=CryptographyDeprecationWarning)
warnings.filterwarnings("ignore", message="Python 3.6 is no longer supported")

import os
import sys
Expand Down
9 changes: 5 additions & 4 deletions fixed-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ chardet<3.1.0
cffi<1.15.0
# NOTE: 2.0 version breaks pymongo work with hosts
dnspython>=1.16.0,<2.0.0
cryptography==3.4.7
cryptography==39.0.1
# Note: 0.20.0 removed select.poll() on which some of our code and libraries we
# depend on rely
eventlet==0.30.2
Expand Down Expand Up @@ -36,15 +36,16 @@ decorator==4.4.2
# See https://github.com/StackStorm/st2/issues/4160#issuecomment-394386433 for details
oslo.config>=1.12.1,<1.13
oslo.utils<5.0,>=4.0.0
paramiko==2.10.5
# paramiko 2.11.0 is needed by cryptography > 37.0.0
paramiko==2.11.0
passlib==1.7.4
prompt-toolkit==1.0.15
pyinotify==0.9.6 ; platform_system=="Linux"
pymongo==3.11.3
pyparsing<3
zstandard==0.15.2
# pyOpenSSL 22.0.0 requires cryptography>=35.0
pyOpenSSL<=21.0.0
# pyOpenSSL 23.1.0 supports cryptography up to 40.0.x
pyOpenSSL==23.1.0
python-editor==1.0.4
python-keyczar==0.716
pytz==2021.1
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ bcrypt==3.2.0
cffi<1.15.0
chardet<3.1.0
ciso8601
cryptography==3.4.7
cryptography==39.0.1
decorator==4.4.2
dnspython>=1.16.0,<2.0.0
eventlet==0.30.2
Expand All @@ -40,12 +40,12 @@ orjson==3.5.2
orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.5.0
oslo.config>=1.12.1,<1.13
oslo.utils<5.0,>=4.0.0
paramiko==2.10.5
paramiko==2.11.0
passlib==1.7.4
prettytable==2.1.0
prompt-toolkit==1.0.15
psutil==5.8.0
pyOpenSSL<=21.0.0
pyOpenSSL==23.1.0
pyinotify==0.9.6 ; platform_system=="Linux"
pymongo==3.11.3
pyparsing<3
Expand Down
4 changes: 2 additions & 2 deletions st2client/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
argcomplete==1.12.2
cffi<1.15.0
chardet<3.1.0
cryptography==3.4.7
cryptography==39.0.1
importlib-metadata==3.10.1
jsonpath-rw==1.4.0
jsonschema==2.6.0
orjson==3.5.2
prettytable==2.1.0
prompt-toolkit==1.0.15
pyOpenSSL<=21.0.0
pyOpenSSL==23.1.0
pysocks
python-dateutil==2.8.1
python-editor==1.0.4
Expand Down
6 changes: 3 additions & 3 deletions st2client/st2client/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
from __future__ import print_function
from __future__ import absolute_import

# Ignore CryptographyDeprecationWarning warnings which appear on older versions of Python 2.7
# Ignore CryptographyDeprecationWarning warnings which appear on Python 3.6
# TODO: Remove after dropping python3.6
import warnings
from cryptography.utils import CryptographyDeprecationWarning

warnings.filterwarnings("ignore", category=CryptographyDeprecationWarning)
warnings.filterwarnings("ignore", message="Python 3.6 is no longer supported")

import os
import sys
Expand Down
6 changes: 3 additions & 3 deletions st2common/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ apscheduler==3.7.0
cffi<1.15.0
chardet<3.1.0
ciso8601
cryptography==3.4.7
cryptography==39.0.1
decorator==4.4.2
dnspython>=1.16.0,<2.0.0
eventlet==0.30.2
Expand All @@ -29,8 +29,8 @@ networkx>=2.5.1,<2.6
orjson==3.5.2
orquesta@ git+https://github.com/StackStorm/orquesta.git@v1.5.0
oslo.config>=1.12.1,<1.13
paramiko==2.10.5
pyOpenSSL<=21.0.0
paramiko==2.11.0
pyOpenSSL==23.1.0
pymongo==3.11.3
python-dateutil==2.8.1
python-statsd==2.1.0
Expand Down
6 changes: 6 additions & 0 deletions st2common/tests/integration/log_unicode_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@

from __future__ import absolute_import

# Ignore CryptographyDeprecationWarning warnings which appear on Python 3.6
# TODO: Remove after dropping python3.6
import warnings

warnings.filterwarnings("ignore", message="Python 3.6 is no longer supported")

import os
import sys

Expand Down
6 changes: 6 additions & 0 deletions st2common/tests/integration/test_logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@

from __future__ import absolute_import

# Ignore CryptographyDeprecationWarning warnings which appear on Python 3.6
# TODO: Remove after dropping python3.6
import warnings

warnings.filterwarnings("ignore", message="Python 3.6 is no longer supported")

import os
import sys
import signal
Expand Down
Loading