PYTHON-2585 Remove legacy multi-auth code (mongodb#816)

Author: ShaneHarvey

pymongo/auth.py

@@ -195,7 +195,7 @@ def _authenticate_scram(credentials, sock_info, mechanism):
     # Make local
     _hmac = hmac.HMAC
 
-    ctx = sock_info.auth_ctx.get(credentials)
+    ctx = sock_info.auth_ctx
     if ctx and ctx.speculate_succeeded():
         nonce, first_bare = ctx.scram_data
         res = ctx.speculative_authenticate
@@ -424,7 +424,7 @@ def _authenticate_plain(credentials, sock_info):
 def _authenticate_x509(credentials, sock_info):
     """Authenticate using MONGODB-X509.
     """
-    ctx = sock_info.auth_ctx.get(credentials)
+    ctx = sock_info.auth_ctx
     if ctx and ctx.speculate_succeeded():
         # MONGODB-X509 is done after the speculative auth step.
         return
@@ -454,8 +454,8 @@ def _authenticate_mongo_cr(credentials, sock_info):
 
 def _authenticate_default(credentials, sock_info):
     if sock_info.max_wire_version >= 7:
-        if credentials in sock_info.negotiated_mechanisms:
-            mechs = sock_info.negotiated_mechanisms[credentials]
+        if sock_info.negotiated_mechs:
+            mechs = sock_info.negotiated_mechs
         else:
             source = credentials.source
             cmd = sock_info.hello_cmd()

pymongo/client_options.py

@@ -117,8 +117,9 @@ def _parse_ssl_options(options):
     return None, allow_invalid_hostnames
 
 
-def _parse_pool_options(options):
+def _parse_pool_options(username, password, database, options):
     """Parse connection pool options."""
+    credentials = _parse_credentials(username, password, database, options)
     max_pool_size = options.get('maxpoolsize', common.MAX_POOL_SIZE)
     min_pool_size = options.get('minpoolsize', common.MIN_POOL_SIZE)
     max_idle_time_seconds = options.get(
@@ -151,7 +152,8 @@ def _parse_pool_options(options):
                        compression_settings,
                        max_connecting=max_connecting,
                        server_api=server_api,
-                       load_balanced=load_balanced)
+                       load_balanced=load_balanced,
+                       credentials=credentials)
 
 
 class ClientOptions(object):
@@ -164,18 +166,16 @@ class ClientOptions(object):
 
     def __init__(self, username, password, database, options):
         self.__options = options
-
         self.__codec_options = _parse_codec_options(options)
-        self.__credentials = _parse_credentials(
-            username, password, database, options)
         self.__direct_connection = options.get('directconnection')
         self.__local_threshold_ms = options.get(
             'localthresholdms', common.LOCAL_THRESHOLD_MS)
         # self.__server_selection_timeout is in seconds. Must use full name for
         # common.SERVER_SELECTION_TIMEOUT because it is set directly by tests.
         self.__server_selection_timeout = options.get(
             'serverselectiontimeoutms', common.SERVER_SELECTION_TIMEOUT)
-        self.__pool_options = _parse_pool_options(options)
+        self.__pool_options = _parse_pool_options(
+            username, password, database, options)
         self.__read_preference = _parse_read_preference(options)
         self.__replica_set_name = options.get('replicaset')
         self.__write_concern = _parse_write_concern(options)
@@ -205,11 +205,6 @@ def codec_options(self):
         """A :class:`~bson.codec_options.CodecOptions` instance."""
         return self.__codec_options
 
-    @property
-    def _credentials(self):
-        """A :class:`~pymongo.auth.MongoCredentials` instance or None."""
-        return self.__credentials
-
     @property
     def direct_connection(self):
         """Whether to connect to the deployment in 'Single' topology."""

pymongo/mongo_client.py

@@ -729,11 +729,6 @@ def __init__(
                                           options.write_concern,
                                           options.read_concern)
 
-        self.__all_credentials = {}
-        creds = options._credentials
-        if creds:
-            self.__all_credentials[creds.source] = creds
-
         self._topology_settings = TopologySettings(
             seeds=seeds,
             replica_set_name=options.replica_set_name,
@@ -1090,8 +1085,7 @@ def _get_socket(self, server, session):
             if in_txn and session._pinned_connection:
                 yield session._pinned_connection
                 return
-            with server.get_socket(
-                    self.__all_credentials, handler=err_handler) as sock_info:
+            with server.get_socket(handler=err_handler) as sock_info:
                 # Pin this session to the selected server or connection.
                 if (in_txn and server.description.server_type in (
                         SERVER_TYPE.Mongos, SERVER_TYPE.LoadBalancer)):
@@ -1535,7 +1529,7 @@ def _process_periodic_tasks(self):
         maintain connection pool parameters."""
         try:
             self._process_kill_cursors()
-            self._topology.update_pool(self.__all_credentials)
+            self._topology.update_pool()
         except Exception as exc:
             if isinstance(exc, InvalidOperation) and self._topology._closed:
                 return

pymongo/monitor.py

@@ -246,7 +246,7 @@ def _check_once(self):
 
         if self._cancel_context and self._cancel_context.cancelled:
             self._reset_connection()
-        with self._pool.get_socket({}) as sock_info:
+        with self._pool.get_socket() as sock_info:
             self._cancel_context = sock_info.cancel_context
             response, round_trip_time = self._check_with_socket(sock_info)
             if not response.awaitable:
@@ -275,11 +275,10 @@ def _check_with_socket(self, conn):
             response = conn._hello(
                 cluster_time,
                 self._server_description.topology_version,
-                self._settings.heartbeat_frequency,
-                None)
+                self._settings.heartbeat_frequency)
         else:
             # New connection handshake or polling hello (MongoDB <4.4).
-            response = conn._hello(cluster_time, None, None, None)
+            response = conn._hello(cluster_time, None, None)
         return response, time.monotonic() - start
 
 
@@ -388,7 +387,7 @@ def _run(self):
 
     def _ping(self):
         """Run a "hello" command and return the RTT."""
-        with self._pool.get_socket({}) as sock_info:
+        with self._pool.get_socket() as sock_info:
             if self._executor._stopped:
                 raise Exception('_RttMonitor closed')
             start = time.monotonic()