CDRIVER-2425 authSource from TXT record is ignored

Author: ajdavis

src/mongoc/mongoc-client-pool.c

@@ -220,7 +220,7 @@ mongoc_client_pool_pop (mongoc_client_pool_t *pool)
 again:
    if (!(client = (mongoc_client_t *) _mongoc_queue_pop_head (&pool->queue))) {
       if (pool->size < pool->max_pool_size) {
-         client = _mongoc_client_new_from_uri (pool->uri, pool->topology);
+         client = _mongoc_client_new_from_uri (pool->topology);
 
          /* for tests */
          mongoc_client_set_stream_initiator (
@@ -263,7 +263,7 @@ mongoc_client_pool_try_pop (mongoc_client_pool_t *pool)
 
    if (!(client = (mongoc_client_t *) _mongoc_queue_pop_head (&pool->queue))) {
       if (pool->size < pool->max_pool_size) {
-         client = _mongoc_client_new_from_uri (pool->uri, pool->topology);
+         client = _mongoc_client_new_from_uri (pool->topology);
 #ifdef MONGOC_ENABLE_SSL
          if (pool->ssl_opts_set) {
             mongoc_client_set_ssl_opts (client, &pool->ssl_opts);

src/mongoc/mongoc-client-private.h

@@ -125,8 +125,7 @@ _mongoc_client_get_rr (const char *service,
                        bson_error_t *error);
 
 mongoc_client_t *
-_mongoc_client_new_from_uri (const mongoc_uri_t *uri,
-                             mongoc_topology_t *topology);
+_mongoc_client_new_from_uri (mongoc_topology_t *topology);
 
 bool
 _mongoc_client_set_apm_callbacks_private (mongoc_client_t *client,

src/mongoc/mongoc-client.c

@@ -895,7 +895,7 @@ mongoc_client_new (const char *uri_string)
 
    topology = mongoc_topology_new (uri, true);
 
-   client = _mongoc_client_new_from_uri (uri, topology);
+   client = _mongoc_client_new_from_uri (topology);
    if (!client) {
       mongoc_topology_destroy (topology);
    }
@@ -969,16 +969,15 @@ mongoc_client_new_from_uri (const mongoc_uri_t *uri)
     * then mongoc_topology_new has fetched SRV and TXT records and updated its
     * uri from them.
     */
-   return _mongoc_client_new_from_uri (topology->uri, topology);
+   return _mongoc_client_new_from_uri (topology);
 }
 
 /*
  *--------------------------------------------------------------------------
  *
  * _mongoc_client_new_from_uri --
  *
- *       Create a new mongoc_client_t for a mongoc_uri_t and a given
- *       topology object.
+ *       Create a new mongoc_client_t for a given topology object.
  *
  * Returns:
  *       A newly allocated mongoc_client_t.
@@ -990,26 +989,25 @@ mongoc_client_new_from_uri (const mongoc_uri_t *uri)
  */
 
 mongoc_client_t *
-_mongoc_client_new_from_uri (const mongoc_uri_t *uri,
-                             mongoc_topology_t *topology)
+_mongoc_client_new_from_uri (mongoc_topology_t *topology)
 {
    mongoc_client_t *client;
    const mongoc_read_prefs_t *read_prefs;
    const mongoc_read_concern_t *read_concern;
    const mongoc_write_concern_t *write_concern;
    const char *appname;
 
-   BSON_ASSERT (uri);
+   BSON_ASSERT (topology);
 
 #ifndef MONGOC_ENABLE_SSL
-   if (mongoc_uri_get_ssl (uri)) {
+   if (mongoc_uri_get_ssl (topology->uri)) {
       MONGOC_ERROR ("Can't create SSL client, SSL not enabled in this build.");
       return NULL;
    }
 #endif
 
    client = (mongoc_client_t *) bson_malloc0 (sizeof *client);
-   client->uri = mongoc_uri_copy (uri);
+   client->uri = mongoc_uri_copy (topology->uri);
    client->initiator = mongoc_client_default_stream_initiator;
    client->initiator_data = client;
    client->topology = topology;

tests/test-mongoc-dns.c

@@ -249,6 +249,18 @@ _test_dns_maybe_pooled (bson_t *test, bool pooled)
 
    _assert_options_match (test, client);
 
+   /* the client has a copy of the topology's URI, assert they're the same */
+   ASSERT (bson_equal (mongoc_uri_get_options (client->uri),
+                       mongoc_uri_get_options (client->topology->uri)));
+   ASSERT (bson_equal (mongoc_uri_get_credentials (client->uri),
+                       mongoc_uri_get_credentials (client->topology->uri)));
+   if (!mongoc_uri_get_hosts (client->uri)) {
+      ASSERT (!mongoc_uri_get_hosts (client->topology->uri));
+   } else {
+      _mongoc_host_list_equal (mongoc_uri_get_hosts (client->uri),
+                               mongoc_uri_get_hosts (client->topology->uri));
+   }
+
    if (pooled) {
       mongoc_client_pool_push (pool, client);
       mongoc_client_pool_destroy (pool);