prepare to test more kinds of TLS errors

Author: ajdavis

CMakeLists.txt

@@ -234,7 +234,7 @@ if (OPENSSL_FOUND)
       ${SOURCE_DIR}/tests/test-x509.c
       ${SOURCE_DIR}/tests/ssl-test.c
       ${SOURCE_DIR}/tests/test-mongoc-stream-tls.c
-      ${SOURCE_DIR}/tests/test-mongoc-stream-tls-hangup.c)
+      ${SOURCE_DIR}/tests/test-mongoc-stream-tls-error.c)
    mongoc_add_test(test-replica-set-ssl FALSE
       ${SOURCE_DIR}/tests/test-replica-set-ssl.c
       ${SOURCE_DIR}/tests/ha-test.c

tests/Makefile.am

@@ -101,7 +101,7 @@ if ENABLE_SSL
 test_libmongoc_SOURCES += \
 	tests/test-x509.c \
 	tests/test-mongoc-stream-tls.c \
-	tests/test-mongoc-stream-tls-hangup.c \
+	tests/test-mongoc-stream-tls-error.c \
 	tests/ssl-test.c \
 	tests/ssl-test.h
 endif

tests/ssl-test.h

@@ -2,6 +2,12 @@
 
 #include <mongoc-thread-private.h>
 
+typedef enum ssl_test_behavior {
+   SSL_TEST_BEHAVIOR_NORMAL,
+   SSL_TEST_BEHAVIOR_HANGUP_AFTER_HANDSHAKE,
+   SSL_TEST_BEHAVIOR_STALL_BEFORE_HANDSHAKE,
+} ssl_test_behavior_t;
+
 typedef enum ssl_test_state {
    SSL_TEST_CRASH,
    SSL_TEST_SUCCESS,
@@ -19,14 +25,15 @@ typedef struct ssl_test_result {
 
 typedef struct ssl_test_data
 {
-   mongoc_ssl_opt_t  *client;
-   mongoc_ssl_opt_t  *server;
-   const char        *host;
-   unsigned short     server_port;
-   mongoc_cond_t      cond;
-   mongoc_mutex_t     cond_mutex;
-   ssl_test_result_t *client_result;
-   ssl_test_result_t *server_result;
+   mongoc_ssl_opt_t    *client;
+   mongoc_ssl_opt_t    *server;
+   ssl_test_behavior_t  behavior;
+   const char          *host;
+   unsigned short       server_port;
+   mongoc_cond_t        cond;
+   mongoc_mutex_t       cond_mutex;
+   ssl_test_result_t   *client_result;
+   ssl_test_result_t   *server_result;
 } ssl_test_data_t;
 
 void

tests/test-libmongoc.c

@@ -48,7 +48,7 @@ extern void test_write_concern_install     (TestSuite *suite);
 #ifdef MONGOC_ENABLE_SSL
 extern void test_x509_install              (TestSuite *suite);
 extern void test_stream_tls_install        (TestSuite *suite);
-extern void test_stream_tls_hangup_install (TestSuite *suite);
+extern void test_stream_tls_error_install  (TestSuite *suite);
 #endif
 
 
@@ -427,7 +427,7 @@ main (int   argc,
 #ifdef MONGOC_ENABLE_SSL
    test_x509_install (&suite);
    test_stream_tls_install (&suite);
-   test_stream_tls_hangup_install (&suite);
+   test_stream_tls_error_install (&suite);
 #endif
 
    ret = TestSuite_Run (&suite);

tests/test-mongoc-stream-tls-hangup.c renamed to tests/test-mongoc-stream-tls-error.c

@@ -18,7 +18,7 @@
  *    7. hangs up
  */
 static void *
-ssl_hangup_server (void *ptr)
+ssl_error_server (void *ptr)
 {
    ssl_test_data_t *data = (ssl_test_data_t *)ptr;
 
@@ -69,15 +69,22 @@ ssl_hangup_server (void *ptr)
    ssl_stream = mongoc_stream_tls_new (sock_stream, data->server, 0);
    assert (ssl_stream);
 
-   r = mongoc_stream_tls_do_handshake (ssl_stream, TIMEOUT);
-   assert (r);
+   if (data->behavior != SSL_TEST_BEHAVIOR_STALL_BEFORE_HANDSHAKE) {
+      r = mongoc_stream_tls_do_handshake (ssl_stream, TIMEOUT);
+      assert (r);
 
-   r = mongoc_stream_readv (ssl_stream, &iov, 1, 1, TIMEOUT);
-   assert (r == 1);
+      r = mongoc_stream_readv (ssl_stream, &iov, 1, 1, TIMEOUT);
+      assert (r == 1);
 
-   mongoc_stream_close (ssl_stream);
-   mongoc_stream_destroy (ssl_stream);
-   mongoc_socket_destroy (listen_sock);
+      /* this test function only implements two behaviors so far */
+      ASSERT_CMPINT (data->behavior,
+                     ==,
+                     SSL_TEST_BEHAVIOR_HANGUP_AFTER_HANDSHAKE);
+
+      mongoc_stream_close (ssl_stream);
+      mongoc_stream_destroy (ssl_stream);
+      mongoc_socket_destroy (listen_sock);
+   }
 
    data->server_result->result = SSL_TEST_SUCCESS;
 
@@ -173,14 +180,15 @@ test_mongoc_tls_hangup (void)
 
    data.server = &sopt;
    data.client = &copt;
+   data.behavior = SSL_TEST_BEHAVIOR_HANGUP_AFTER_HANDSHAKE;
    data.server_result = &sr;
    data.client_result = &cr;
    data.host = "localhost";
 
    mongoc_mutex_init (&data.cond_mutex);
    mongoc_cond_init (&data.cond);
 
-   r = mongoc_thread_create (threads, &ssl_hangup_server, &data);
+   r = mongoc_thread_create (threads, &ssl_error_server, &data);
    assert (r == 0);
 
    r = mongoc_thread_create (threads + 1, &ssl_hangup_client, &data);
@@ -199,7 +207,7 @@ test_mongoc_tls_hangup (void)
 }
 
 void
-test_stream_tls_hangup_install (TestSuite *suite)
+test_stream_tls_error_install (TestSuite *suite)
 {
    TestSuite_Add (suite, "/TLS/hangup", test_mongoc_tls_hangup);
 }