Integration test (awslabs#235)

-   elasticurl uses "h2;http/1.1" alpn string by default
-   --http2 and --http1_1 flags force "h2" or "http/1.1" and error if they don't get it
-   add h2 tests to integration-testing/http_client_test.py
-   add add_net_test_case(tls_download_medium_file_http2)

Co-authored-by: Dengke Tang <[email protected]>

Author: TingDaoK

bin/elasticurl/main.c

@@ -72,6 +72,7 @@ struct elasticurl_ctx {
     FILE *output;
     const char *trace_file;
     enum aws_log_level log_level;
+    enum aws_http_version required_http_version;
     bool exchange_completed;
     bool bootstrap_shutdown_completed;
 };
@@ -104,7 +105,8 @@ static void s_usage(int exit_code) {
     fprintf(stderr, "  -t, --trace FILE: dumps logs to FILE instead of stderr.\n");
     fprintf(stderr, "  -v, --verbose: ERROR|INFO|DEBUG|TRACE: log level to configure. Default is none.\n");
     fprintf(stderr, "      --version: print the version of elasticurl.\n");
-    fprintf(stderr, "      --http2: try to use HTTP/2");
+    fprintf(stderr, "      --http2: HTTP/2 connection required");
+    fprintf(stderr, "      --http1_1: HTTP/1.1 connection required");
     fprintf(stderr, "  -h, --help\n");
     fprintf(stderr, "            Display this message and quit.\n");
     exit(exit_code);
@@ -133,6 +135,7 @@ static struct aws_cli_option s_long_options[] = {
     {"verbose", AWS_CLI_OPTIONS_REQUIRED_ARGUMENT, NULL, 'v'},
     {"version", AWS_CLI_OPTIONS_NO_ARGUMENT, NULL, 'V'},
     {"http2", AWS_CLI_OPTIONS_NO_ARGUMENT, NULL, 'w'},
+    {"http1_1", AWS_CLI_OPTIONS_NO_ARGUMENT, NULL, 'W'},
     {"help", AWS_CLI_OPTIONS_NO_ARGUMENT, NULL, 'h'},
     /* Per getopt(3) the last element of the array has to be filled with all zeros */
     {NULL, AWS_CLI_OPTIONS_NO_ARGUMENT, NULL, 0},
@@ -169,7 +172,7 @@ static void s_parse_options(int argc, char **argv, struct elasticurl_ctx *ctx) {
     while (true) {
         int option_index = 0;
         int c =
-            aws_cli_getopt_long(argc, argv, "a:b:c:e:f:H:d:g:j:l:m:M:GPHiko:t:v:Vwh", s_long_options, &option_index);
+            aws_cli_getopt_long(argc, argv, "a:b:c:e:f:H:d:g:j:l:m:M:GPHiko:t:v:VwWh", s_long_options, &option_index);
         if (c == -1) {
             break;
         }
@@ -277,6 +280,11 @@ static void s_parse_options(int argc, char **argv, struct elasticurl_ctx *ctx) {
                 exit(0);
             case 'w':
                 ctx->alpn = "h2";
+                ctx->required_http_version = AWS_HTTP_VERSION_2;
+                break;
+            case 'W':
+                ctx->alpn = "http/1.1";
+                ctx->required_http_version = AWS_HTTP_VERSION_1_1;
                 break;
             case 'h':
                 s_usage(0);
@@ -453,6 +461,12 @@ static void s_on_signing_complete(struct aws_http_message *request, int error_co
 
 static void s_on_client_connection_setup(struct aws_http_connection *connection, int error_code, void *user_data) {
     struct elasticurl_ctx *app_ctx = user_data;
+    if (app_ctx->required_http_version) {
+        if (aws_http_connection_get_version(connection) != app_ctx->required_http_version) {
+            fprintf(stderr, "Error. The requested http version, %s, is not supported by the peer.", app_ctx->alpn);
+            exit(1);
+        }
+    }
 
     if (error_code) {
         fprintf(stderr, "Connection failed with error %s\n", aws_error_debug_str(error_code));
@@ -560,7 +574,7 @@ int main(int argc, char **argv) {
     app_ctx.connect_timeout = 3000;
     app_ctx.output = stdout;
     app_ctx.verb = "GET";
-    app_ctx.alpn = "http/1.1";
+    app_ctx.alpn = "h2;http/1.1";
     aws_mutex_init(&app_ctx.mutex);
     aws_hash_table_init(
         &app_ctx.signing_context,
@@ -675,6 +689,10 @@ int main(int argc, char **argv) {
             port = app_ctx.uri.port;
         }
     } else {
+        if (app_ctx.required_http_version == AWS_HTTP_VERSION_2) {
+            fprintf(stderr, "Error, we don't support h2c, please use TLS for HTTP2 connection");
+            exit(1);
+        }
         port = 80;
         if (app_ctx.uri.port) {
             port = app_ctx.uri.port;

integration-testing/http_client_test.py

@@ -63,24 +63,41 @@ def compare_files(filename_expected, filename_other):
         print("filecmp says these files differ, but they are identical. what the heck.")
 
 class SimpleTests(unittest.TestCase):
-#make a simple GET request and make sure it succeeds
-    def test_simple_get(self):
-        simple_get_args = elasticurl_cmd_prefix + ['-v', 'TRACE', 'http://example.com']
+    def test_simple_get_h1(self):
+        """make a simple GET request via HTTP/1.1 and make sure it succeeds"""
+        simple_get_args = elasticurl_cmd_prefix + ['-v', 'TRACE', '--http1_1', 'http://example.com']
         run_command(simple_get_args)
 
-#make a simple POST request to make sure sending data succeeds
-    def test_simple_post(self):
-        simple_post_args = elasticurl_cmd_prefix + ['-v', 'TRACE', '-P', '-H', 'content-type: application/json', '-i', '-d', '\"{\'test\':\'testval\'}\"', 'http://httpbin.org/post']
+    def test_simple_post_h1(self):
+        """make a simple POST request via HTTP/1.1 to make sure sending data succeeds"""
+        simple_post_args = elasticurl_cmd_prefix + ['-v', 'TRACE', '--http1_1', '-P', '-H', 'content-type: application/json', '-i', '-d', '\"{\'test\':\'testval\'}\"', 'http://httpbin.org/post']
         run_command(simple_post_args)
 
-#download a large file and compare the results with something we assume works (e.g. urllib)
-    def test_simple_download(self):
-        elasticurl_download_args = elasticurl_cmd_prefix + ['-v', 'TRACE', '-o', 'elastigirl.png', 'https://s3.amazonaws.com/code-sharing-aws-crt/elastigirl.png']
+    def test_simple_download_h1(self):
+        """download a large file via HTTP/1.1 and compare the results with something we assume works (e.g. urllib)"""
+        elasticurl_download_args = elasticurl_cmd_prefix + ['-v', 'TRACE', '--http1_1', '-o', 'elastigirl.png', 'https://s3.amazonaws.com/code-sharing-aws-crt/elastigirl.png']
         run_command(elasticurl_download_args)
-
         urllib.request.urlretrieve('https://s3.amazonaws.com/code-sharing-aws-crt/elastigirl.png', 'elastigirl_expected.png')
 
         compare_files('elastigirl_expected.png', 'elastigirl.png')
 
+    def test_simple_get_h2(self):
+        """make a simple GET request via HTTP2 and make sure it succeeds"""
+        simple_get_args = elasticurl_cmd_prefix + ['-v', 'TRACE', '--http2', 'https://example.com']
+        run_command(simple_get_args)
+
+    def test_simple_post_h2(self):
+        """make a simple POST request via HTTP2 to make sure sending data succeeds"""
+        simple_post_args = elasticurl_cmd_prefix + ['-v', 'TRACE', '--http2', '-P', '-H', 'content-type: application/json', '-i', '-d', '\"{\'test\':\'testval\'}\"', 'https://httpbin.org/post']
+        run_command(simple_post_args)
+
+    def test_simple_download_h2(self):
+        """download a large file via HTTP2 and compare the results with something we assume works (e.g. urllib)"""
+        elasticurl_download_args = elasticurl_cmd_prefix + ['-v', 'TRACE', '--http2', '-o', 'elastigirl_h2.png', 'https://d1cz66xoahf9cl.cloudfront.net/elastigirl.png']
+        run_command(elasticurl_download_args)
+        urllib.request.urlretrieve('https://d1cz66xoahf9cl.cloudfront.net/elastigirl.png', 'elastigirl_expected.png')
+
+        compare_files('elastigirl_expected.png', 'elastigirl_h2.png')
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)

tests/CMakeLists.txt

@@ -109,7 +109,8 @@ add_test_case(strutil_trim_http_whitespace)
 add_test_case(strutil_is_http_token)
 add_test_case(strutil_is_lowercase_http_token)
 
-add_net_test_case(tls_download_medium_file)
+add_net_test_case(tls_download_medium_file_h1)
+add_net_test_case(tls_download_medium_file_h2)
 
 add_test_case(websocket_decoder_sanity_check)
 add_test_case(websocket_decoder_simplest_frame)

tests/test_tls.c

@@ -103,20 +103,20 @@ static void s_on_stream_complete(struct aws_http_stream *stream, int error_code,
     struct test_ctx *test = user_data;
     test->wait_result = error_code;
     test->stream_complete = true;
+    aws_condition_variable_notify_one(&test->wait_cvar);
 }
 
 static bool s_stream_wait_pred(void *user_data) {
     struct test_ctx *test = user_data;
     return test->wait_result || test->stream_complete;
 }
 
-static int s_test_tls_download_medium_file(struct aws_allocator *allocator, void *ctx) {
-    (void)ctx;
+static int s_test_tls_download_medium_file_general(
+    struct aws_allocator *allocator,
+    struct aws_byte_cursor url,
+    bool h2_required) {
 
     aws_http_library_init(allocator);
-
-    struct aws_byte_cursor url =
-        aws_byte_cursor_from_c_str("https://aws-crt-test-stuff.s3.amazonaws.com/http_test_doc.txt");
     struct aws_uri uri;
     aws_uri_init_parse(&uri, allocator, &url);
 
@@ -148,6 +148,8 @@ static int s_test_tls_download_medium_file(struct aws_allocator *allocator, void
     ASSERT_NOT_NULL(test.client_bootstrap = aws_client_bootstrap_new(test.alloc, &bootstrap_options));
     struct aws_tls_ctx_options tls_ctx_options;
     aws_tls_ctx_options_init_default_client(&tls_ctx_options, allocator);
+    char *apln = h2_required ? "h2" : "http/1.1";
+    aws_tls_ctx_options_set_alpn_list(&tls_ctx_options, apln);
     ASSERT_NOT_NULL(test.tls_ctx = aws_tls_client_ctx_new(allocator, &tls_ctx_options));
     struct aws_tls_connection_options tls_connection_options;
     aws_tls_connection_options_init_from_ctx(&tls_connection_options, test.tls_ctx);
@@ -168,6 +170,11 @@ static int s_test_tls_download_medium_file(struct aws_allocator *allocator, void
     ASSERT_SUCCESS(s_test_wait(&test, s_test_connection_setup_pred));
     ASSERT_INT_EQUALS(0, test.wait_result);
     ASSERT_NOT_NULL(test.client_connection);
+    if (h2_required) {
+        ASSERT_INT_EQUALS(aws_http_connection_get_version(test.client_connection), AWS_HTTP_VERSION_2);
+    } else {
+        ASSERT_INT_EQUALS(aws_http_connection_get_version(test.client_connection), AWS_HTTP_VERSION_1_1);
+    }
 
     struct aws_http_message *request = aws_http_message_new_request(allocator);
     ASSERT_NOT_NULL(request);
@@ -217,9 +224,24 @@ static int s_test_tls_download_medium_file(struct aws_allocator *allocator, void
     aws_mutex_clean_up(&test.wait_lock);
     aws_condition_variable_clean_up(&test.wait_cvar);
     aws_uri_clean_up(&uri);
-
     aws_http_library_clean_up();
+    return AWS_OP_SUCCESS;
+}
 
-    return 0;
+static int s_test_tls_download_medium_file_h1(struct aws_allocator *allocator, void *ctx) {
+    (void)ctx;
+    struct aws_byte_cursor url =
+        aws_byte_cursor_from_c_str("https://aws-crt-test-stuff.s3.amazonaws.com/http_test_doc.txt");
+    ASSERT_SUCCESS(s_test_tls_download_medium_file_general(allocator, url, false /*h2_required*/));
+    return AWS_OP_SUCCESS;
+}
+AWS_TEST_CASE(tls_download_medium_file_h1, s_test_tls_download_medium_file_h1);
+
+static int s_tls_download_medium_file_h2(struct aws_allocator *allocator, void *ctx) {
+    (void)ctx;
+    /* The cloudfront domain for aws-crt-test-stuff */
+    struct aws_byte_cursor url = aws_byte_cursor_from_c_str("https://d1cz66xoahf9cl.cloudfront.net/http_test_doc.txt");
+    ASSERT_SUCCESS(s_test_tls_download_medium_file_general(allocator, url, true /*h2_required*/));
+    return AWS_OP_SUCCESS;
 }
-AWS_TEST_CASE(tls_download_medium_file, s_test_tls_download_medium_file);
+AWS_TEST_CASE(tls_download_medium_file_h2, s_tls_download_medium_file_h2);