From 35091d878fe41e55ecc85056afb5dded3b084e59 Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Mon, 3 Jun 2024 15:56:56 -0700 Subject: [PATCH] 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()