fix: CVE fixes, update werkzeug #1967

mfmarche · 2024-08-23T21:02:23Z

Updates werkzeug for CVE-2024-34069

Fixes # .

Changes proposed in this pull request:

Updates werkzeug for CVE-2024-34069 Signed-off-by: Mike Marchetti <mfmarche@gmail.com>

chrisinmtown · 2024-08-29T18:28:45Z

I opened issue #1969 for exactly this problem before finding this PR. Thanks for this! I hope the maintainers review and comment soon.

chrisinmtown · 2024-08-29T18:29:30Z

tox.ini

@@ -8,17 +8,20 @@ envlist =
    {py37}-{min,pypi,dev}
    {py38}-{min,pypi,dev}
    {py39}-{min,pypi,dev}
+    {py310}-{min,pypi,dev}
    isort-check


Probably should add py311 also, please. I tried that, and that brings new problems. In Py3.11 the collections module had some breaking (?) changes

ImportError while loading conftest '/Users/me/git/github/connexion_mfmarche/tests/conftest.py'. /Users/me/git/github/connexion-mfmarche/tests/conftest.py:7: in <module> ??? connexion/__init__.py:14: in <module> from .apis import AbstractAPI # NOQA connexion/apis/__init__.py:16: in <module> from .abstract import AbstractAPI # NOQA connexion/apis/abstract.py:14: in <module> from ..exceptions import ResolverError connexion/exceptions.py:7: in <module> from jsonschema.exceptions import ValidationError .tox/py311-min/lib/python3.11/site-packages/jsonschema/__init__.py:18: in <module> from jsonschema.validators import ( .tox/py311-min/lib/python3.11/site-packages/jsonschema/validators.py:8: in <module> import requests .tox/py311-min/lib/python3.11/site-packages/requests/__init__.py:58: in <module> from . import utils .tox/py311-min/lib/python3.11/site-packages/requests/utils.py:30: in <module> from .cookies import RequestsCookieJar, cookiejar_from_dict .tox/py311-min/lib/python3.11/site-packages/requests/cookies.py:164: in <module> class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping): E AttributeError: module 'collections' has no attribute 'MutableMapping'

https://stackoverflow.com/questions/70943244/attributeerror-module-collections-has-no-attribute-mutablemapping

chrisinmtown · 2024-08-30T11:57:00Z

tox.ini

@@ -31,7 +34,10 @@ commands=
    pypi: pip install --upgrade -r {toxworkdir}/requirements-pypi.txt
    dev: requirements-builder --level=dev --extras aiohttp --req=requirements-devel.txt -o {toxworkdir}/requirements-dev.txt setup.py
    dev: pip install --upgrade -r {toxworkdir}/requirements-dev.txt
-    python setup.py test
+    python setup.py pytest {posargs}


There's a /lot/ going on in the tox setup/run commands that I don't understand, like dynamically creating requirements files such as requirements-min.txt. The tests get quite far but still fail with the old line (just test). The change from test to pytest changes the behavior significantly, and the tests still fail. From asking the cloud, I believe the invocation python setup.py is deprecated and has to be changed at this point bcos of this warning:

/Users/me/git/github/connexion_mfmarche/.tox/py311-min/lib/python3.11/site-packages/setuptools/__init__.py:81: _DeprecatedInstaller: setuptools.installer and fetch_build_eggs are deprecated. !! ******************************************************************************** Requirements should be satisfied by a PEP 517 installer. If you are using pip, you can try `pip install --use-pep517`. ******************************************************************************** !! dist.fetch_build_eggs(dist.setup_requires)

chrisinmtown · 2024-08-30T12:10:31Z

connexion/apps/flask_app.py

@@ -10,7 +10,8 @@

 import flask
 import werkzeug.exceptions
-from flask import json, signals
+from flask import signals
+import json


I think adding this import on this line causes the check for properly sorted imports to fail ("isort"). Still trying to figure it out tho.

ok will move that around.

Cool, this is the position that isort accepted for me:

diff --git a/connexion/apps/flask_app.py b/connexion/apps/flask_app.py index 6a7e61d..ada9c57 100644 --- a/connexion/apps/flask_app.py +++ b/connexion/apps/flask_app.py @@ -3,6 +3,7 @@ This module defines a FlaskApp, a Connexion application to wrap a Flask applicat """ import datetime +import json import logging import pathlib from decimal import Decimal @@ -11,7 +12,6 @@ from types import FunctionType # NOQA import flask import werkzeug.exceptions from flask import signals -import json from ..apis.flask_api import FlaskApi from ..exceptions import ProblemException

chrisinmtown · 2024-08-30T12:19:47Z

I cannot comment on the line or file because you didn't touch it in this PR, I recommend bumping the version in connexion/__init__.py, maybe:

__version__ = '2024.0.dev1'

chrisinmtown · 2024-08-30T16:37:55Z

Finally realized I had used a hyphen in the cloned directory name and that caused problems, sorry for my confusion. I installed python3.9, now tox runs without strange messages and shows these failures for Python3.9 tests. I think this is caused by using the wrong version of Werkzeug . I'm a little wrapped around an axle here, apparently version 3.0 removed the server_name argument, so I don't understand the failure, your change seems appropriate.

https://werkzeug.palletsprojects.com/en/3.0.x/test/#werkzeug.test.Client.set_cookie

========================================================= FAILURES ==========================================================
______________________________________________ test_cookie_param[swagger.yaml] ______________________________________________

simple_app = <connexion.apps.flask_app.FlaskApp object at 0x113f65d30>

    def test_cookie_param(simple_app):
        app_client = simple_app.app.test_client()
>       app_client.set_cookie(domain="localhost", key="test_cookie", value="hello")
E       TypeError: set_cookie() missing 1 required positional argument: 'server_name'

tests/api/test_parameters.py:526: TypeError
______________________________________________ test_cookie_param[openapi.yaml] ______________________________________________

simple_app = <connexion.apps.flask_app.FlaskApp object at 0x113680a60>

    def test_cookie_param(simple_app):
        app_client = simple_app.app.test_client()
>       app_client.set_cookie(domain="localhost", key="test_cookie", value="hello")
E       TypeError: set_cookie() missing 1 required positional argument: 'server_name'

tests/api/test_parameters.py:526: TypeError

chrisinmtown · 2024-08-30T16:52:52Z

I solved the mypy complaint about a syntax error with this change

diff --git a/tests/api/test_responses.py b/tests/api/test_responses.py
index da76bbf..68b9322 100644
--- a/tests/api/test_responses.py
+++ b/tests/api/test_responses.py
@@ -393,29 +393,29 @@ def test_streaming_response(simple_app):
 def test_oneof(simple_openapi_app):
     app_client = simple_openapi_app.app.test_client()
 
-    post_greeting = app_client.post(  # type: flask.Response
+    post_greeting = app_client.post(
         '/v1.0/oneof_greeting',
         data=json.dumps({"name": 3}),
         content_type="application/json"
-    )
+    )  # type: flask.Response
     assert post_greeting.status_code == 200
     assert post_greeting.content_type == 'application/json'
     greeting_reponse = json.loads(post_greeting.data.decode('utf-8', 'replace'))
     assert greeting_reponse['greeting'] == 'Hello 3'
 
-    post_greeting = app_client.post(  # type: flask.Response
+    post_greeting = app_client.post(
         '/v1.0/oneof_greeting',
         data=json.dumps({"name": True}),
         content_type="application/json"
-    )
+    )  # type: flask.Response
     assert post_greeting.status_code == 200
     assert post_greeting.content_type == 'application/json'
     greeting_reponse = json.loads(post_greeting.data.decode('utf-8', 'replace'))
     assert greeting_reponse['greeting'] == 'Hello True'
 
-    post_greeting = app_client.post(  # type: flask.Response
+    post_greeting = app_client.post(
         '/v1.0/oneof_greeting',
         data=json.dumps({"name": "jsantos"}),
         content_type="application/json"
-    )
+    )  # type: flask.Response
     assert post_greeting.status_code == 400

chrisinmtown · 2024-08-31T12:57:44Z

setup.py

@@ -25,7 +25,7 @@ def read_version(package):
    'PyYAML>=5.1,<7',
    'requests>=2.9.1,<3',
    'inflection>=0.3.1,<0.6',
-    'werkzeug>=1.0,<2.3',
+    'werkzeug>=1.0,<4.0',


since werkzeug versions below 3.x have security vulnerabilities, I suggest:

'werkzeug>=3.0,<4.0',

That change brings the next challenge:

ERROR: Cannot install -r /Users/me/git/github/connexion_mfmarche/.tox/requirements-min.txt (line 12) and MarkupSafe==0.23 because these package versions have conflicting dependencies. The conflict is caused by: The user requested MarkupSafe==0.23 werkzeug 3.0.0 depends on MarkupSafe>=2.1.1

chrisinmtown · 2024-09-17T13:35:37Z

@mfmarche I think this PR is exactly on point and will benefit many people including me, do you still have time to push this along?

mfmarche · 2024-09-17T13:45:17Z

@mfmarche I think this PR is exactly on point and will benefit many people including me, do you still have time to push this along?

Hi @chrisinmtown, yes have every intention to push along. I will take your comments, thank you for providing those. However, i'm not sure if this will ever get pushed by upstream into the v2 branch? Do you have suggestions how to proceed?

chrisinmtown · 2024-09-17T14:28:25Z

Do you have suggestions how to proceed?

Unfortunately for all of us connexion users, I have no suggestions. You might comment on this issue that I wrote, trying to get a reply from the new maintainers: #1973

juhoinkinen · 2024-09-28T10:01:08Z

setup.py

    'pytest-cov>=2,<3',
    'testfixtures>=6,<7',
+    'pytest',


Three lines above the pytest dependency is set to pytest>=6,<9, is this unpinned duplicate setting a typo?

fix: CVE fixes, update werkzeug

4df05d8

Updates werkzeug for CVE-2024-34069 Signed-off-by: Mike Marchetti <mfmarche@gmail.com>

chrisinmtown reviewed Aug 29, 2024

View reviewed changes

This comment was marked as outdated.

Sign in to view

chrisinmtown reviewed Aug 30, 2024

View reviewed changes

chrisinmtown reviewed Aug 31, 2024

View reviewed changes

mfmarche mentioned this pull request Sep 17, 2024

It feels like this project is still on Summer holiday #1973

Closed

juhoinkinen reviewed Sep 28, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: CVE fixes, update werkzeug #1967

fix: CVE fixes, update werkzeug #1967

mfmarche commented Aug 23, 2024

chrisinmtown commented Aug 29, 2024

chrisinmtown Aug 29, 2024 •

edited

Loading

This comment was marked as outdated.

This comment was marked as outdated.

chrisinmtown Aug 30, 2024 •

edited

Loading

chrisinmtown Aug 30, 2024

mfmarche Aug 30, 2024

chrisinmtown Aug 30, 2024

chrisinmtown commented Aug 30, 2024

chrisinmtown commented Aug 30, 2024 •

edited

Loading

chrisinmtown commented Aug 30, 2024

chrisinmtown Aug 31, 2024 •

edited

Loading

chrisinmtown commented Sep 17, 2024

mfmarche commented Sep 17, 2024

chrisinmtown commented Sep 17, 2024

juhoinkinen Sep 28, 2024

fix: CVE fixes, update werkzeug #1967

Are you sure you want to change the base?

fix: CVE fixes, update werkzeug #1967

Conversation

mfmarche commented Aug 23, 2024

chrisinmtown commented Aug 29, 2024

chrisinmtown Aug 29, 2024 • edited Loading

Choose a reason for hiding this comment

This comment was marked as outdated.

This comment was marked as outdated.

chrisinmtown Aug 30, 2024 • edited Loading

Choose a reason for hiding this comment

chrisinmtown Aug 30, 2024

Choose a reason for hiding this comment

mfmarche Aug 30, 2024

Choose a reason for hiding this comment

chrisinmtown Aug 30, 2024

Choose a reason for hiding this comment

chrisinmtown commented Aug 30, 2024

chrisinmtown commented Aug 30, 2024 • edited Loading

chrisinmtown commented Aug 30, 2024

chrisinmtown Aug 31, 2024 • edited Loading

Choose a reason for hiding this comment

chrisinmtown commented Sep 17, 2024

mfmarche commented Sep 17, 2024

chrisinmtown commented Sep 17, 2024

juhoinkinen Sep 28, 2024

Choose a reason for hiding this comment

chrisinmtown Aug 29, 2024 •

edited

Loading

chrisinmtown Aug 30, 2024 •

edited

Loading

chrisinmtown commented Aug 30, 2024 •

edited

Loading

chrisinmtown Aug 31, 2024 •

edited

Loading