From c31f53a2253655f14812b94b35817189fb16dcdf Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 31 May 2024 10:10:46 -0700 Subject: [PATCH 1/3] run tools/pinning/current/repin.sh --- tools/requirements.txt | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tools/requirements.txt b/tools/requirements.txt index 805014e13..85b578a81 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -17,8 +17,8 @@ babel==2.15.0 ; python_version >= "3.8" and python_version < "4.0" backcall==0.2.0 ; python_version >= "3.8" and python_version < "4.0" bcrypt==4.1.3 ; python_version >= "3.8" and python_version < "4.0" beautifulsoup4==4.12.3 ; python_version >= "3.8" and python_version < "4.0" -boto3==1.34.103 ; python_version >= "3.8" and python_version < "4.0" -botocore==1.34.103 ; python_version >= "3.8" and python_version < "4.0" +boto3==1.34.116 ; python_version >= "3.8" and python_version < "4.0" +botocore==1.34.116 ; python_version >= "3.8" and python_version < "4.0" build==1.2.1 ; python_version >= "3.8" and python_version < "4.0" cachecontrol==0.14.0 ; python_version >= "3.8" and python_version < "4.0" cachetools==5.3.3 ; python_version >= "3.8" and python_version < "4.0" @@ -31,7 +31,7 @@ cloudflare==2.19.4 ; python_version >= "3.8" and python_version < "4.0" colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" configargparse==1.7 ; python_version >= "3.8" and python_version < "4.0" configobj==5.0.8 ; python_version >= "3.8" and python_version < "4.0" -coverage==7.5.1 ; python_version >= "3.8" and python_version < "4.0" +coverage==7.5.3 ; python_version >= "3.8" and python_version < "4.0" crashtest==0.4.1 ; python_version >= "3.8" and python_version < "4.0" cryptography==42.0.7 ; python_version >= "3.8" and python_version < "4.0" cython==0.29.37 ; python_version >= "3.8" and python_version < "4.0" @@ -51,7 +51,7 @@ fabric==3.2.2 ; python_version >= "3.8" and python_version < "4.0" fastjsonschema==2.19.1 ; python_version >= "3.8" and python_version < "4.0" filelock==3.14.0 ; python_version >= "3.8" and python_version < "4.0" google-api-core==2.19.0 ; python_version >= "3.8" and python_version < "4.0" -google-api-python-client==2.129.0 ; python_version >= "3.8" and python_version < "4.0" +google-api-python-client==2.131.0 ; python_version >= "3.8" and python_version < "4.0" google-auth-httplib2==0.2.0 ; python_version >= "3.8" and python_version < "4.0" google-auth==2.29.0 ; python_version >= "3.8" and python_version < "4.0" googleapis-common-protos==1.63.0 ; python_version >= "3.8" and python_version < "4.0" @@ -96,13 +96,13 @@ pexpect==4.9.0 ; python_version >= "3.8" and python_version < "4.0" pickleshare==0.7.5 ; python_version >= "3.8" and python_version < "4.0" pip==24.0 ; python_version >= "3.8" and python_version < "4.0" pkginfo==1.10.0 ; python_version >= "3.8" and python_version < "4.0" -platformdirs==4.2.1 ; python_version >= "3.8" and python_version < "4.0" +platformdirs==4.2.2 ; python_version >= "3.8" and python_version < "4.0" pluggy==1.5.0 ; python_version >= "3.8" and python_version < "4.0" ply==3.11 ; python_version >= "3.8" and python_version < "4.0" poetry-core==1.9.0 ; python_version >= "3.8" and python_version < "4.0" -poetry-plugin-export==1.7.1 ; python_version >= "3.8" and python_version < "4.0" +poetry-plugin-export==1.8.0 ; python_version >= "3.8" and python_version < "4.0" poetry==1.8.3 ; python_version >= "3.8" and python_version < "4.0" -prompt-toolkit==3.0.43 ; python_version >= "3.8" and python_version < "4.0" +prompt-toolkit==3.0.45 ; python_version >= "3.8" and python_version < "4.0" proto-plus==1.23.0 ; python_version >= "3.8" and python_version < "4.0" protobuf==4.25.3 ; python_version >= "3.8" and python_version < "4.0" ptyprocess==0.7.0 ; python_version >= "3.8" and python_version < "4.0" @@ -122,7 +122,7 @@ pyproject-hooks==1.1.0 ; python_version >= "3.8" and python_version < "4.0" pyrfc3339==1.1 ; python_version >= "3.8" and python_version < "4.0" pytest-cov==5.0.0 ; python_version >= "3.8" and python_version < "4.0" pytest-xdist==3.6.1 ; python_version >= "3.8" and python_version < "4.0" -pytest==8.2.0 ; python_version >= "3.8" and python_version < "4.0" +pytest==8.2.1 ; python_version >= "3.8" and python_version < "4.0" python-augeas==1.1.0 ; python_version >= "3.8" and python_version < "4.0" python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "4.0" python-digitalocean==1.17.0 ; python_version >= "3.8" and python_version < "4.0" @@ -130,13 +130,13 @@ pytz==2024.1 ; python_version >= "3.8" and python_version < "4.0" pywin32-ctypes==0.2.2 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32" pywin32==306 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32" pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "4.0" -rapidfuzz==3.9.0 ; python_version >= "3.8" and python_version < "4.0" +rapidfuzz==3.9.2 ; python_version >= "3.8" and python_version < "4.0" readme-renderer==43.0 ; python_version >= "3.8" and python_version < "4.0" requests-download==0.1.2 ; python_version >= "3.8" and python_version < "4.0" -requests-file==2.0.0 ; python_version >= "3.8" and python_version < "4.0" +requests-file==2.1.0 ; python_version >= "3.8" and python_version < "4.0" requests-oauthlib==2.0.0 ; python_version >= "3.8" and python_version < "4.0" requests-toolbelt==1.0.0 ; python_version >= "3.8" and python_version < "4.0" -requests==2.31.0 ; python_version >= "3.8" and python_version < "4.0" +requests==2.32.3 ; python_version >= "3.8" and python_version < "4.0" rfc3986==2.0.0 ; python_version >= "3.8" and python_version < "4.0" rich==13.7.1 ; python_version >= "3.8" and python_version < "4.0" rsa==4.9 ; python_version >= "3.8" and python_version < "4" @@ -144,7 +144,7 @@ s3transfer==0.10.1 ; python_version >= "3.8" and python_version < "4.0" secretstorage==3.3.3 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "linux" semantic-version==2.10.0 ; python_version >= "3.8" and python_version < "4.0" setuptools-rust==1.9.0 ; python_version >= "3.8" and python_version < "4.0" -setuptools==69.5.1 ; python_version >= "3.8" and python_version < "4.0" +setuptools==70.0.0 ; python_version >= "3.8" and python_version < "4.0" shellingham==1.5.4 ; python_version >= "3.8" and python_version < "4.0" six==1.16.0 ; python_version >= "3.8" and python_version < "4.0" snowballstemmer==2.2.0 ; python_version >= "3.8" and python_version < "4.0" @@ -164,8 +164,8 @@ tomli==2.0.1 ; python_version >= "3.8" and python_full_version <= "3.11.0a6" tomlkit==0.12.5 ; python_version >= "3.8" and python_version < "4.0" tox==4.15.0 ; python_version >= "3.8" and python_version < "4.0" traitlets==5.14.3 ; python_version >= "3.8" and python_version < "4.0" -trove-classifiers==2024.4.10 ; python_version >= "3.8" and python_version < "4.0" -twine==5.0.0 ; python_version >= "3.8" and python_version < "4.0" +trove-classifiers==2024.5.22 ; python_version >= "3.8" and python_version < "4.0" +twine==5.1.0 ; python_version >= "3.8" and python_version < "4.0" types-cffi==1.16.0.20240331 ; python_version >= "3.8" and python_version < "4.0" types-httplib2==0.22.0.20240310 ; python_version >= "3.8" and python_version < "4.0" types-pyopenssl==24.1.0.20240425 ; python_version >= "3.8" and python_version < "4.0" @@ -174,16 +174,16 @@ types-python-dateutil==2.9.0.20240316 ; python_version >= "3.8" and python_versi types-pytz==2024.1.0.20240417 ; python_version >= "3.8" and python_version < "4.0" types-pywin32==306.0.0.20240408 ; python_version >= "3.8" and python_version < "4.0" types-requests==2.31.0.6 ; python_version >= "3.8" and python_version < "4.0" -types-setuptools==69.5.0.20240423 ; python_version >= "3.8" and python_version < "4.0" -types-six==1.16.21.20240425 ; python_version >= "3.8" and python_version < "4.0" +types-setuptools==70.0.0.20240524 ; python_version >= "3.8" and python_version < "4.0" +types-six==1.16.21.20240513 ; python_version >= "3.8" and python_version < "4.0" types-urllib3==1.26.25.14 ; python_version >= "3.8" and python_version < "4.0" -typing-extensions==4.11.0 ; python_version >= "3.8" and python_version < "4.0" +typing-extensions==4.12.0 ; python_version >= "3.8" and python_version < "4.0" uritemplate==4.1.1 ; python_version >= "3.8" and python_version < "4.0" urllib3==1.26.18 ; python_version >= "3.8" and python_version < "4.0" -virtualenv==20.26.1 ; python_version >= "3.8" and python_version < "4.0" +virtualenv==20.26.2 ; python_version >= "3.8" and python_version < "4.0" wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "4.0" wheel==0.43.0 ; python_version >= "3.8" and python_version < "4.0" wrapt==1.16.0 ; python_version >= "3.8" and python_version < "4.0" xattr==1.1.0 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "darwin" yarg==0.1.9 ; python_version >= "3.8" and python_version < "4.0" -zipp==3.18.1 ; python_version >= "3.8" and python_version < "4.0" +zipp==3.19.1 ; python_version >= "3.8" and python_version < "4.0" From 35091d878fe41e55ecc85056afb5dded3b084e59 Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Mon, 3 Jun 2024 15:56:56 -0700 Subject: [PATCH 2/3] snap_config: switch to newer HttpAdapter interface --- certbot/certbot/_internal/snap_config.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/certbot/certbot/_internal/snap_config.py b/certbot/certbot/_internal/snap_config.py index dd3a6399c..f2ed701d7 100644 --- a/certbot/certbot/_internal/snap_config.py +++ b/certbot/certbot/_internal/snap_config.py @@ -5,7 +5,7 @@ from typing import Iterable from typing import List from typing import Optional -from requests import Session +from requests import PreparedRequest, Session from requests.adapters import HTTPAdapter from requests.exceptions import HTTPError from requests.exceptions import RequestException @@ -100,6 +100,11 @@ class _SnapdConnectionPool(HTTPConnectionPool): class _SnapdAdapter(HTTPAdapter): - def get_connection(self, url: str, - proxies: Optional[Iterable[str]] = None) -> _SnapdConnectionPool: + def get_connection_with_tls_context(self, _request: PreparedRequest, + _verify: bool, + _proxies: Optional[Iterable[str]] = None, + _cert: Optional[bytes] = None + ) -> _SnapdConnectionPool: + """Required method for creating a new connection pool. Simply return our + shim that forces a UNIX socket connection to snapd.""" return _SnapdConnectionPool() From 0c49ab462fe6c321220f5cb1a1e71b015a02141e Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Tue, 4 Jun 2024 10:37:28 -0700 Subject: [PATCH 3/3] snap_config: oops kwargs are important i guess --- certbot/certbot/_internal/snap_config.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/certbot/certbot/_internal/snap_config.py b/certbot/certbot/_internal/snap_config.py index f2ed701d7..a37748acd 100644 --- a/certbot/certbot/_internal/snap_config.py +++ b/certbot/certbot/_internal/snap_config.py @@ -100,10 +100,10 @@ class _SnapdConnectionPool(HTTPConnectionPool): class _SnapdAdapter(HTTPAdapter): - def get_connection_with_tls_context(self, _request: PreparedRequest, - _verify: bool, - _proxies: Optional[Iterable[str]] = None, - _cert: Optional[bytes] = None + def get_connection_with_tls_context(self, request: PreparedRequest, + verify: bool, + proxies: Optional[Iterable[str]] = None, + cert: Optional[bytes] = None ) -> _SnapdConnectionPool: """Required method for creating a new connection pool. Simply return our shim that forces a UNIX socket connection to snapd."""