adapters: fix for requests 2.32.2+ #72

simondeziel · 2024-05-22T16:05:03Z

Without this, all requests to http+unix:// URLs fail with: requests.exceptions.InvalidURL: Not supported URL scheme http+unix.

Fixes #73

crgwbr · 2024-05-22T21:32:52Z

Since this project seems to be abandoned, but its longevity is important to my team, we've forked the project as requests-unixsocket2. It should be a drop in replacement for this package.

PyPI: https://pypi.org/project/requests-unixsocket2/0.4.0/
Repository: https://gitlab.com/thelabnyc/requests-unixsocket2
Clone of this PR: https://gitlab.com/thelabnyc/requests-unixsocket2/-/merge_requests/2

We've migrated this PR there, merged it, and released to PyPI as part of v0.4.0.

…ocket psf/requests#6710 msabramo/requests-unixsocket#72 Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

requests 2.32 security fix recommends a fix: psf/requests#6710 This was proposed (but not yet merged) to requests-unixsocket in: msabramo/requests-unixsocket#72 Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

cartertinney · 2024-05-24T15:40:22Z

@msabramo Can we get this merged? This is a crucial fix

kloczek · 2024-05-27T15:17:30Z

I've tested this PR and pytest 8.2.1 fails in 4 units

Here is pytest output:

+ PYTHONPATH=/home/tkloczko/rpmbuild/BUILDROOT/python-requests-unixsocket-0.3.0-2.fc37.x86_64/usr/lib64/python3.10/site-packages:/home/tkloczko/rpmbuild/BUILDROOT/python-requests-unixsocket-0.3.0-2.fc37.x86_64/usr/lib/python3.10/site-packages
+ /usr/bin/pytest -ra -m 'not network'
==================================================================================== test session starts ====================================================================================
platform linux -- Python 3.10.14, pytest-8.2.1, pluggy-1.5.0
rootdir: /home/tkloczko/rpmbuild/BUILD/requests-unixsocket-0.3.0
configfile: pytest.ini
collected 5 items

requests_unixsocket/tests/test_requests_unixsocket.py FFF.F                                                                                                                           [100%]

========================================================================================= FAILURES ==========================================================================================
________________________________________________________________________________ test_unix_domain_adapter_ok ________________________________________________________________________________
requests_unixsocket/tests/test_requests_unixsocket.py:26: in test_unix_domain_adapter_ok
    r = getattr(session, method)(url)
/usr/lib/python3.10/site-packages/requests/sessions.py:602: in get
    return self.request("GET", url, **kwargs)
/usr/lib/python3.10/site-packages/requests/sessions.py:589: in request
    resp = self.send(prep, **send_kwargs)
/usr/lib/python3.10/site-packages/requests/sessions.py:703: in send
    r = adapter.send(request, **kwargs)
/usr/lib/python3.10/site-packages/requests/adapters.py:561: in send
    self.cert_verify(conn, request.url, verify, cert)
/usr/lib/python3.10/site-packages/requests/adapters.py:320: in cert_verify
    conn.cert_reqs = "CERT_NONE"
E   AttributeError: 'NoneType' object has no attribute 'cert_reqs'
______________________________________________________________________ test_unix_domain_adapter_url_with_query_params _______________________________________________________________________
requests_unixsocket/tests/test_requests_unixsocket.py:53: in test_unix_domain_adapter_url_with_query_params
    r = getattr(session, method)(url)
/usr/lib/python3.10/site-packages/requests/sessions.py:602: in get
    return self.request("GET", url, **kwargs)
/usr/lib/python3.10/site-packages/requests/sessions.py:589: in request
    resp = self.send(prep, **send_kwargs)
/usr/lib/python3.10/site-packages/requests/sessions.py:703: in send
    r = adapter.send(request, **kwargs)
/usr/lib/python3.10/site-packages/requests/adapters.py:561: in send
    self.cert_verify(conn, request.url, verify, cert)
/usr/lib/python3.10/site-packages/requests/adapters.py:320: in cert_verify
    conn.cert_reqs = "CERT_NONE"
E   AttributeError: 'NoneType' object has no attribute 'cert_reqs'
_________________________________________________________________________ test_unix_domain_adapter_connection_error _________________________________________________________________________
requests_unixsocket/tests/test_requests_unixsocket.py:76: in test_unix_domain_adapter_connection_error
    getattr(session, method)(
/usr/lib/python3.10/site-packages/requests/sessions.py:602: in get
    return self.request("GET", url, **kwargs)
/usr/lib/python3.10/site-packages/requests/sessions.py:589: in request
    resp = self.send(prep, **send_kwargs)
/usr/lib/python3.10/site-packages/requests/sessions.py:703: in send
    r = adapter.send(request, **kwargs)
/usr/lib/python3.10/site-packages/requests/adapters.py:561: in send
    self.cert_verify(conn, request.url, verify, cert)
/usr/lib/python3.10/site-packages/requests/adapters.py:320: in cert_verify
    conn.cert_reqs = "CERT_NONE"
E   AttributeError: 'NoneType' object has no attribute 'cert_reqs'
___________________________________________________________________________ test_unix_domain_adapter_monkeypatch ____________________________________________________________________________
requests_unixsocket/tests/test_requests_unixsocket.py:101: in test_unix_domain_adapter_monkeypatch
    r = getattr(requests, method)(url)
../../BUILDROOT/python-requests-unixsocket-0.3.0-2.fc37.x86_64/usr/lib/python3.10/site-packages/requests_unixsocket/__init__.py:51: in get
    return request('get', url, **kwargs)
../../BUILDROOT/python-requests-unixsocket-0.3.0-2.fc37.x86_64/usr/lib/python3.10/site-packages/requests_unixsocket/__init__.py:46: in request
    return session.request(method=method, url=url, **kwargs)
/usr/lib/python3.10/site-packages/requests/sessions.py:589: in request
    resp = self.send(prep, **send_kwargs)
/usr/lib/python3.10/site-packages/requests/sessions.py:703: in send
    r = adapter.send(request, **kwargs)
/usr/lib/python3.10/site-packages/requests/adapters.py:561: in send
    self.cert_verify(conn, request.url, verify, cert)
/usr/lib/python3.10/site-packages/requests/adapters.py:320: in cert_verify
    conn.cert_reqs = "CERT_NONE"
E   AttributeError: 'NoneType' object has no attribute 'cert_reqs'
================================================================================== short test summary info ==================================================================================
FAILED requests_unixsocket/tests/test_requests_unixsocket.py::test_unix_domain_adapter_ok - AttributeError: 'NoneType' object has no attribute 'cert_reqs'
FAILED requests_unixsocket/tests/test_requests_unixsocket.py::test_unix_domain_adapter_url_with_query_params - AttributeError: 'NoneType' object has no attribute 'cert_reqs'
FAILED requests_unixsocket/tests/test_requests_unixsocket.py::test_unix_domain_adapter_connection_error - AttributeError: 'NoneType' object has no attribute 'cert_reqs'
FAILED requests_unixsocket/tests/test_requests_unixsocket.py::test_unix_domain_adapter_monkeypatch - AttributeError: 'NoneType' object has no attribute 'cert_reqs'
================================================================================ 4 failed, 1 passed in 0.37s ================================================================================

layercak3 · 2024-06-01T04:51:59Z

Missing return, use return self.get_connection(request.url, proxies)

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

simondeziel · 2024-06-01T19:57:54Z

@layercak3 thanks I don't understand how I could fail to copy-n-paste in such a way, embarrassing :/

simondeziel · 2024-06-01T20:05:18Z

The original proposal was initially missing the return bit as well, it was edited to fix the issue psf/requests#6710

kloczek · 2024-06-02T05:57:27Z

Just retested 0.3.0 against requests 2.32.3 and all is fine now.

+ PYTHONPATH=/home/tkloczko/rpmbuild/BUILDROOT/python-requests-unixsocket-0.3.0-2.fc37.x86_64/usr/lib64/python3.10/site-packages:/home/tkloczko/rpmbuild/BUILDROOT/python-requests-unixsocket-0.3.0-2.fc37.x86_64/usr/lib/python3.10/site-packages
+ /usr/bin/pytest -ra -m 'not network'
==================================================================================== test session starts ====================================================================================
platform linux -- Python 3.10.14, pytest-8.2.1, pluggy-1.5.0
rootdir: /home/tkloczko/rpmbuild/BUILD/requests-unixsocket-0.3.0
configfile: pytest.ini
collected 5 items

requests_unixsocket/tests/test_requests_unixsocket.py .....                                                                                                                           [100%]

===================================================================================== 5 passed in 0.18s =====================================================================================

in order to get the following fix: msabramo/requests-unixsocket#72

… to ddev (#17702) * Upgrade `requests` to `2.32.3` * Add changelog entry * Bump the `requests-unixsocket` version to requests-unixsocket2==0.4.0 in order to get the following fix: msabramo/requests-unixsocket#72 * update license * changelog * Apply suggestions from code review Co-authored-by: Steven Yuen <steven.yuen@datadoghq.com> * Regenerate LICENSE-3rdparty.csv * conflicts * sync license * changelog --------- Co-authored-by: steveny91 <steven.yuen@datadoghq.com>

… to ddev (#17702) * Upgrade `requests` to `2.32.3` * Add changelog entry * Bump the `requests-unixsocket` version to requests-unixsocket2==0.4.0 in order to get the following fix: msabramo/requests-unixsocket#72 * update license * changelog * Apply suggestions from code review Co-authored-by: Steven Yuen <steven.yuen@datadoghq.com> * Regenerate LICENSE-3rdparty.csv * conflicts * sync license * changelog --------- Co-authored-by: steveny91 <steven.yuen@datadoghq.com> (cherry picked from commit e1e61e5)

… to ddev (#17702) * Upgrade `requests` to `2.32.3` * Add changelog entry * Bump the `requests-unixsocket` version to requests-unixsocket2==0.4.0 in order to get the following fix: msabramo/requests-unixsocket#72 * update license * changelog * Apply suggestions from code review Co-authored-by: Steven Yuen <steven.yuen@datadoghq.com> * Regenerate LICENSE-3rdparty.csv * conflicts * sync license * changelog --------- Co-authored-by: steveny91 <steven.yuen@datadoghq.com> e1e61e5

… to ddev (#17702) (#17776) * Upgrade `requests` to `2.32.3` * Add changelog entry * Bump the `requests-unixsocket` version to requests-unixsocket2==0.4.0 in order to get the following fix: msabramo/requests-unixsocket#72 * update license * changelog * Apply suggestions from code review Co-authored-by: Steven Yuen <steven.yuen@datadoghq.com> * Regenerate LICENSE-3rdparty.csv * conflicts * sync license * changelog --------- Co-authored-by: steveny91 <steven.yuen@datadoghq.com> (cherry picked from commit e1e61e5) Co-authored-by: Lénaïc Huard <L3n41c@users.noreply.github.com>

…ket#72

simondeziel marked this pull request as ready for review May 22, 2024 16:06

simondeziel mentioned this pull request May 22, 2024

pylxd broken by dependency requests 2.32.0 canonical/pylxd#579

Closed

This was referenced May 22, 2024

Bump requests from 2.31.0 to 2.32.0 HDFGroup/hsds#361

Closed

Use old requests version HDFGroup/hsds#363

Merged

simondeziel added a commit to simondeziel/pylxd that referenced this pull request May 23, 2024

setup.cfg: avoid requests 2.32.0+ due to incompat with requests-unixs…

b3c09ae

…ocket psf/requests#6710 msabramo/requests-unixsocket#72 Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

simondeziel mentioned this pull request May 23, 2024

setup.cfg: requests 2.32.0+ breaks requests-unixsocket canonical/pylxd#580

Merged

adapters: fix for requests 2.32.2+

8b02ed5

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>

simondeziel force-pushed the compat-requests-2.32.2 branch from 24811e2 to 8b02ed5 Compare June 1, 2024 19:56

L3n41c mentioned this pull request Jun 1, 2024

Upgrade requests to 2.32.3 and adds a license validation override to ddev DataDog/integrations-core#17702

Merged

4 tasks

L3n41c added a commit to DataDog/integrations-core that referenced this pull request Jun 3, 2024

Bump the requests-unixsocket version to requests-unixsocket2==0.4.0

a777683

in order to get the following fix: msabramo/requests-unixsocket#72

L3n41c added a commit to DataDog/integrations-core that referenced this pull request Jun 3, 2024

Bump the requests-unixsocket version to requests-unixsocket2==0.4.0

c854d42

in order to get the following fix: msabramo/requests-unixsocket#72

simondeziel mentioned this pull request Jun 7, 2024

Remove dependency on requests_unixsocket canonical/pylxd#583

Open

kba added a commit to OCR-D/core that referenced this pull request Jul 16, 2024

switch to active fork requests_unixsocket2, msabramo/requests-unixsoc…

2e60ecd

…ket#72

hamistao mentioned this pull request Aug 5, 2024

urllib3<2 is impacting library compatibility canonical/pylxd#600

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

adapters: fix for requests 2.32.2+ #72

adapters: fix for requests 2.32.2+ #72

simondeziel commented May 22, 2024 •

edited

Loading

crgwbr commented May 22, 2024

cartertinney commented May 24, 2024

kloczek commented May 27, 2024

layercak3 commented Jun 1, 2024

simondeziel commented Jun 1, 2024

simondeziel commented Jun 1, 2024

kloczek commented Jun 2, 2024

adapters: fix for requests 2.32.2+ #72

Are you sure you want to change the base?

adapters: fix for requests 2.32.2+ #72

Conversation

simondeziel commented May 22, 2024 • edited Loading

crgwbr commented May 22, 2024

cartertinney commented May 24, 2024

kloczek commented May 27, 2024

layercak3 commented Jun 1, 2024

simondeziel commented Jun 1, 2024

simondeziel commented Jun 1, 2024

kloczek commented Jun 2, 2024

simondeziel commented May 22, 2024 •

edited

Loading