From 0dd8b946e4feff8248bd2d41e424957355851b3f Mon Sep 17 00:00:00 2001
From: Quentin Pradet <quentin.pradet@elastic.co>
Date: Tue, 28 May 2024 10:01:01 +0400
Subject: [PATCH] Adopt requests new get_connection API (#164)

* Fix requests 2.32 compatibility

* Test minimum dependencies in CI

(cherry picked from commit d89e9f0bc57b68b59080cf5466115f7a085119fb)
---
 .github/workflows/ci.yml                  | 11 +++++++++--
 elastic_transport/_node/_http_requests.py | 13 ++++++++++++-
 noxfile.py                                | 12 ++++++++++++
 requirements-min.txt                      |  4 ++++
 4 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 requirements-min.txt

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f34f2d3..9a75729 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,9 +43,15 @@ jobs:
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         os: ["ubuntu-latest"]
         experimental: [false]
+        nox-session: ['']
+        include:
+          - python-version: "3.8"
+            os: "ubuntu-latest"
+            experimental: false
+            nox-session: "test-min-deps"
 
     runs-on: ${{ matrix.os }}
-    name: test-${{ matrix.python-version }}
+    name: test-${{ matrix.python-version }} ${{ matrix.nox-session }}
     continue-on-error: ${{ matrix.experimental }}
     steps:
       - name: Checkout repository
@@ -65,9 +71,10 @@ jobs:
         run: python -m pip install --upgrade nox
 
       - name: Run tests
-        run: "nox -rs test-${PYTHON_VERSION%-dev}"
+        run: nox -s ${NOX_SESSION:-test-$PYTHON_VERSION}
         env:
           PYTHON_VERSION: ${{ matrix.python-version }}
+          NOX_SESSION: ${{ matrix.nox-session }}
           # Required for development versions of Python
           AIOHTTP_NO_EXTENSIONS: 1
           FROZENLIST_NO_EXTENSIONS: 1
diff --git a/elastic_transport/_node/_http_requests.py b/elastic_transport/_node/_http_requests.py
index 19cec37..941e3cc 100644
--- a/elastic_transport/_node/_http_requests.py
+++ b/elastic_transport/_node/_http_requests.py
@@ -169,7 +169,18 @@ def __init__(self, config: NodeConfig):
         )
         # Preload the HTTPConnectionPool so initialization issues
         # are raised here instead of in perform_request()
-        adapter.get_connection(self.base_url)  # type: ignore[no-untyped-call]
+        if hasattr(adapter, "get_connection_with_tls_context"):
+            request = requests.Request(method="GET", url=self.base_url)
+            prepared_request = self.session.prepare_request(request)
+            adapter.get_connection_with_tls_context(
+                prepared_request, verify=self.session.verify
+            )
+        else:
+            # elastic-transport is not vulnerable to CVE-2024-35195 because it uses
+            # requests.Session and an SSLContext without using the verify parameter.
+            # We should remove this branch when requiring requests 2.32 or later.
+            adapter.get_connection(self.base_url)
+
         self.session.mount(prefix=f"{self.scheme}://", adapter=adapter)
 
     def perform_request(
diff --git a/noxfile.py b/noxfile.py
index 18fe1a3..a2435cf 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -71,6 +71,18 @@ def test(session):
     session.run("coverage", "report", "-m")
 
 
+@nox.session(name="test-min-deps", python="3.8")
+def test_min_deps(session):
+    session.install("-r", "requirements-min.txt", ".[develop]", silent=False)
+    session.run(
+        "pytest",
+        "--cov=elastic_transport",
+        *(session.posargs or ("tests/",)),
+        env={"PYTHONWARNINGS": "always::DeprecationWarning"},
+    )
+    session.run("coverage", "report", "-m")
+
+
 @nox.session(python="3")
 def docs(session):
     session.install(".[develop]")
diff --git a/requirements-min.txt b/requirements-min.txt
new file mode 100644
index 0000000..b1da7ed
--- /dev/null
+++ b/requirements-min.txt
@@ -0,0 +1,4 @@
+requests==2.26.0
+urllib3==1.26.2
+aiohttp==3.8.0
+httpx==0.27.0