CDRIVER-630: default_stream_initiator can block forever in TLS handshake

Author: bjori

src/mongoc/mongoc-async-cmd-private.h

@@ -92,6 +92,7 @@ int
 mongoc_async_cmd_tls_setup (mongoc_stream_t *stream,
                             int             *events,
                             void            *ctx,
+                            int32_t         timeout_msec,
                             bson_error_t    *error);
 #endif
 

src/mongoc/mongoc-async-cmd.c

@@ -60,6 +60,7 @@ int
 mongoc_async_cmd_tls_setup (mongoc_stream_t *stream,
                             int             *events,
                             void            *ctx,
+                            int32_t         timeout_msec,
                             bson_error_t    *error)
 {
    mongoc_stream_t *tls_stream;
@@ -69,7 +70,7 @@ mongoc_async_cmd_tls_setup (mongoc_stream_t *stream,
         tls_stream = mongoc_stream_get_base_stream (tls_stream)) {
    }
 
-   if (mongoc_stream_tls_do_handshake (tls_stream, 0)) {
+   if (mongoc_stream_tls_do_handshake (tls_stream, timeout_msec)) {
       if (mongoc_stream_tls_check_cert (tls_stream, host)) {
          return 1;
       } else {
@@ -231,8 +232,14 @@ mongoc_async_cmd_destroy (mongoc_async_cmd_t *acmd)
 mongoc_async_cmd_result_t
 _mongoc_async_cmd_phase_setup (mongoc_async_cmd_t *acmd)
 {
+   int64_t now;
+   int32_t timeout_msec;
+
+   now = bson_get_monotonic_time ();
+   timeout_msec = (acmd->expire_at - now) / 1000;
+
    switch (acmd->setup (acmd->stream, &acmd->events, acmd->setup_ctx,
-                        &acmd->error)) {
+                        timeout_msec, &acmd->error)) {
       case -1:
          return MONGOC_ASYNC_CMD_ERROR;
          break;

src/mongoc/mongoc-async-private.h

@@ -53,6 +53,7 @@ typedef int
 (*mongoc_async_cmd_setup_t)(mongoc_stream_t *stream,
                             int             *events,
                             void            *ctx,
+                            int32_t         timeout_msec,
                             bson_error_t    *error);
 
 

tests/test-mongoc-stream-tls-error.c

@@ -222,7 +222,6 @@ test_mongoc_tls_hangup (void)
  *    5. confirms that it times out
  *    6. shuts down
  */
-#ifdef TODO_CDRIVER_630
 static void *
 handshake_stall_client (void *ptr)
 {
@@ -243,7 +242,7 @@ handshake_stall_client (void *ptr)
    mongoc_mutex_unlock (&data->cond_mutex);
 
    uri_str = bson_strdup_printf (
-      "mongodb://localhost:%u/?ssl=true&connecttimeoutms=%" PRId64,
+      "mongodb://localhost:%u/?ssl=true&serverselectiontimeoutms=200&connecttimeoutms=%" PRId64,
       data->server_port, connect_timeout_ms);
 
    client = mongoc_client_new (uri_str);
@@ -318,7 +317,6 @@ test_mongoc_tls_handshake_stall (void)
    ASSERT (cr.result == SSL_TEST_SUCCESS);
    ASSERT (sr.result == SSL_TEST_SUCCESS);
 }
-#endif
 
 void
 test_stream_tls_error_install (TestSuite *suite)
@@ -328,8 +326,6 @@ test_stream_tls_error_install (TestSuite *suite)
    TestSuite_Add (suite, "/TLS/hangup", test_mongoc_tls_hangup);
 #endif
 
-#ifdef TODO_CDRIVER_630
    TestSuite_Add (suite, "/TLS/handshake_stall",
                   test_mongoc_tls_handshake_stall);
-#endif
 }