Merge branch 'master' into dependabot/pip/requests-gte-2.32.5-and-lt-3.0

Updates the requirements on [requests](https://github.com/psf/requests) to permit the latest version.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.23.0...v2.32.5)

---
updated-dependencies:
- dependency-name: requests
  dependency-version: 2.32.5
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

bson/_cbsonmodule.c

@@ -2281,7 +2281,7 @@ static PyObject* get_value(PyObject* self, PyObject* name, const char* buffer,
             }
             memcpy(&length, buffer + *position, 4);
             length = BSON_UINT32_FROM_LE(length);
-            if (max - 5 < length) { // Account for 5-byte header. max >= 5 guaranteed above
+            if (max < length) {
                 goto invalid;
             }
 

pymongo/_azure_helpers.py

@@ -17,7 +17,6 @@ from __future__ import annotations
 
 import json
 from typing import Any, Optional
-from urllib.parse import quote
 
 
 def _get_azure_response(
@@ -30,7 +29,7 @@ def _get_azure_response(
     url += "?api-version=2018-02-01"
     url += f"&resource={resource}"
     if client_id:
-        url += f"&client_id={quote(client_id)}"
+        url += f"&client_id={client_id}"
     headers = {"Metadata": "true", "Accept": "application/json"}
     request = Request(url, headers=headers)  # noqa: S310
     try:

requirements/ocsp.txt

@@ -8,6 +8,6 @@
 # https://www.pyopenssl.org/en/stable/api/ssl.html#OpenSSL.SSL.Context.set_default_verify_paths
 certifi>=2023.7.22;os.name=='nt' or sys_platform=='darwin'
 pyopenssl>=23.2.0
-requests>=2.23.0,<3.0
+requests>=2.32.5,<3.0
 cryptography>=42.0.0
 service_identity>=23.1.0

test/asynchronous/test_client.py

@@ -2711,11 +2711,11 @@ class TestClientPool(AsyncMockClientTest):
 
         await async_wait_until(lambda: len(c.nodes) == 1, "connect")
         self.assertEqual(await c.address, ("c", 3))
-        # Wait for the pooled connection to be registered
+        # Assert that we create 1 pooled connection.
         await listener.async_wait_for_event(monitoring.ConnectionReadyEvent, 1)
         self.assertEqual(listener.event_count(monitoring.ConnectionCreatedEvent), 1)
         arbiter = c._topology.get_server_by_address(("c", 3))
-        await async_wait_until(lambda: len(arbiter.pool.conns) == 1, "create 1 pooled connection")
+        self.assertEqual(len(arbiter.pool.conns), 1)
         # Arbiter pool is marked ready.
         self.assertEqual(listener.event_count(monitoring.PoolReadyEvent), 1)
 

test/asynchronous/test_encryption.py

@@ -876,6 +876,8 @@ class TestViews(AsyncEncryptionIntegrationTest):
 
 
 class TestCorpus(AsyncEncryptionIntegrationTest):
+    # PYTHON-5708: Encryption tests sending large payloads fail on some mongocryptd versions.
+    @async_client_context.require_version_max(6, 99)
     @unittest.skipUnless(any(AWS_CREDS.values()), "AWS environment credentials are not set")
     async def asyncSetUp(self):
         await super().asyncSetUp()
@@ -1052,6 +1054,8 @@ class TestBsonSizeBatches(AsyncEncryptionIntegrationTest):
     client_encrypted: AsyncMongoClient
     listener: OvertCommandListener
 
+    # PYTHON-5708: Encryption tests sending large payloads fail on some mongocryptd versions.
+    @async_client_context.require_version_max(6, 99)
     async def asyncSetUp(self):
         await super().asyncSetUp()
         db = async_client_context.client.db

test/test_azure_helpers.py

@@ -150,20 +150,6 @@ class TestGetAzureResponse(unittest.TestCase):
         _, kwargs = mock_open.call_args
         self.assertEqual(kwargs["timeout"], 42)
 
-    def test_client_id_is_url_encoded(self):
-        """Ensure special characters in client_id are percent-encoded."""
-        body = json.dumps({"access_token": "tok", "expires_in": "3600"})
-        with _mock_urlopen(200, body) as mock_open:
-            self._call(client_id="id with spaces&special=chars")
-
-        url = mock_open.call_args[0][0].full_url
-        # '&' and '=' must be percent-encoded so they don't inject extra query params
-        self.assertIn("client_id=id%20with%20spaces%26special%3Dchars", url)
-        # The encoded client_id should not introduce a raw '&'
-        # Count params: api-version, resource, client_id — exactly 3
-        query_string = url.split("?", 1)[1]
-        self.assertEqual(query_string.count("&"), 2)
-
 
 if __name__ == "__main__":
     unittest.main()

test/test_bson.py

@@ -1269,22 +1269,6 @@ class TestBSON(unittest.TestCase):
             encode(doc)
         self.assertEqual(cm.exception.document, doc)
 
-    def test_binary_length_accounts_for_header(self):
-        size = 20
-        binary_length = 12  # 5 more than the actual 7 bytes
-
-        payload = b""
-        payload += struct.pack("<i", size)  # document size
-        payload += b"\x05"  # type = Binary
-        payload += b"a\x00"  # key "a"
-        payload += struct.pack("<I", binary_length)  # Binary length (inflated)
-        payload += b"\x00"  # subtype 0
-        payload += b"\x41" * 7  # value
-        payload += b"\x00"  # EOO
-
-        with self.assertRaises(InvalidBSON):
-            decode(payload)
-
 
 class TestCodecOptions(unittest.TestCase):
     def test_document_class(self):

test/test_client.py

@@ -2666,11 +2666,11 @@ class TestClientPool(MockClientTest):
 
         wait_until(lambda: len(c.nodes) == 1, "connect")
         self.assertEqual(c.address, ("c", 3))
-        # Wait for the pooled connection to be registered
+        # Assert that we create 1 pooled connection.
         listener.wait_for_event(monitoring.ConnectionReadyEvent, 1)
         self.assertEqual(listener.event_count(monitoring.ConnectionCreatedEvent), 1)
         arbiter = c._topology.get_server_by_address(("c", 3))
-        wait_until(lambda: len(arbiter.pool.conns) == 1, "create 1 pooled connection")
+        self.assertEqual(len(arbiter.pool.conns), 1)
         # Arbiter pool is marked ready.
         self.assertEqual(listener.event_count(monitoring.PoolReadyEvent), 1)
 

test/test_encryption.py

@@ -872,6 +872,8 @@ class TestViews(EncryptionIntegrationTest):
 
 
 class TestCorpus(EncryptionIntegrationTest):
+    # PYTHON-5708: Encryption tests sending large payloads fail on some mongocryptd versions.
+    @client_context.require_version_max(6, 99)
     @unittest.skipUnless(any(AWS_CREDS.values()), "AWS environment credentials are not set")
     def setUp(self):
         super().setUp()
@@ -1048,6 +1050,8 @@ class TestBsonSizeBatches(EncryptionIntegrationTest):
     client_encrypted: MongoClient
     listener: OvertCommandListener
 
+    # PYTHON-5708: Encryption tests sending large payloads fail on some mongocryptd versions.
+    @client_context.require_version_max(6, 99)
     def setUp(self):
         super().setUp()
         db = client_context.client.db

test/test_topology.py

@@ -23,7 +23,7 @@ sys.path[0:0] = [""]
 
 from test import client_knobs, unittest
 from test.pymongo_mocks import DummyMonitor
-from test.utils import MockPool
+from test.utils import MockPool, flaky
 from test.utils_shared import wait_until
 
 from bson.objectid import ObjectId
@@ -755,6 +755,7 @@ def wait_for_primary(topology):
 class TestTopologyErrors(TopologyTest):
     # Errors when calling hello.
 
+    @flaky(reason="PYTHON-5366")
     def test_pool_reset(self):
         # hello succeeds at first, then always raises socket error.
         hello_count = [0]
@@ -775,11 +776,7 @@ class TestTopologyErrors(TopologyTest):
 
         # Pool is reset by hello failure.
         t.request_check_all()
-        # Wait for the monitor's hello failure to trigger Pool.reset() and bump the generation.
-        wait_until(
-            lambda: server.pool.gen.get_overall() != generation,
-            "pool reset after failed monitor check",
-        )
+        self.assertNotEqual(generation, server.pool.gen.get_overall())
 
     def test_hello_retry(self):
         # hello succeeds at first, then raises socket error, then succeeds.